|
 |
f325b2 |
From ea203d6dcaad5ea5e1aea716041072f9030e6467 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Fri, 18 Sep 2015 14:32:53 +0200
|
|
|
f325b2 |
Subject: [PATCH 155/398] sw: implement per-view LOK_CALLBACK_CURSOR_VISIBLE
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I4e00679547997cfb3dafe603b908f055011a3b30
|
|
|
f325b2 |
(cherry picked from commit 32f419fee5f9df4facb7a9b3ec910471d2a20247)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
sw/source/core/crsr/crsrsh.cxx | 20 ++++++++++++++++----
|
|
|
f325b2 |
1 file changed, 16 insertions(+), 4 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
|
|
|
f325b2 |
index 3a0c6667b2e2..cbb89aca8868 100644
|
|
|
f325b2 |
--- a/sw/source/core/crsr/crsrsh.cxx
|
|
|
f325b2 |
+++ b/sw/source/core/crsr/crsrsh.cxx
|
|
|
f325b2 |
@@ -23,6 +23,7 @@
|
|
|
f325b2 |
#include <hintids.hxx>
|
|
|
f325b2 |
#include <svx/svdmodel.hxx>
|
|
|
f325b2 |
#include <editeng/frmdiritem.hxx>
|
|
|
f325b2 |
+#include <sfx2/viewsh.hxx>
|
|
|
f325b2 |
#include <SwSmartTagMgr.hxx>
|
|
|
f325b2 |
#include <doc.hxx>
|
|
|
f325b2 |
#include <rootfrm.hxx>
|
|
|
f325b2 |
@@ -63,6 +64,7 @@
|
|
|
f325b2 |
#include <comcore.hrc>
|
|
|
f325b2 |
#include <IDocumentLayoutAccess.hxx>
|
|
|
f325b2 |
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
|
|
|
f325b2 |
+#include <comphelper/lok.hxx>
|
|
|
f325b2 |
|
|
|
f325b2 |
using namespace com::sun::star;
|
|
|
f325b2 |
using namespace util;
|
|
|
f325b2 |
@@ -2118,8 +2120,13 @@ void SwCrsrShell::ShowCrsr()
|
|
|
f325b2 |
m_bSVCrsrVis = true;
|
|
|
f325b2 |
m_pCurCrsr->SetShowTextInputFieldOverlay( true );
|
|
|
f325b2 |
|
|
|
f325b2 |
- if (isTiledRendering())
|
|
|
f325b2 |
- libreOfficeKitCallback(LOK_CALLBACK_CURSOR_VISIBLE, OString::boolean(true).getStr());
|
|
|
f325b2 |
+ if (comphelper::LibreOfficeKit::isActive())
|
|
|
f325b2 |
+ {
|
|
|
f325b2 |
+ if (comphelper::LibreOfficeKit::isViewCallback())
|
|
|
f325b2 |
+ GetSfxViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_CURSOR_VISIBLE, OString::boolean(true).getStr());
|
|
|
f325b2 |
+ else
|
|
|
f325b2 |
+ libreOfficeKitCallback(LOK_CALLBACK_CURSOR_VISIBLE, OString::boolean(true).getStr());
|
|
|
f325b2 |
+ }
|
|
|
f325b2 |
|
|
|
f325b2 |
UpdateCrsr();
|
|
|
f325b2 |
}
|
|
|
f325b2 |
@@ -2135,8 +2142,13 @@ void SwCrsrShell::HideCrsr()
|
|
|
f325b2 |
m_pCurCrsr->SetShowTextInputFieldOverlay( false );
|
|
|
f325b2 |
m_pVisCrsr->Hide();
|
|
|
f325b2 |
|
|
|
f325b2 |
- if (isTiledRendering())
|
|
|
f325b2 |
- libreOfficeKitCallback(LOK_CALLBACK_CURSOR_VISIBLE, OString::boolean(false).getStr());
|
|
|
f325b2 |
+ if (comphelper::LibreOfficeKit::isActive())
|
|
|
f325b2 |
+ {
|
|
|
f325b2 |
+ if (comphelper::LibreOfficeKit::isViewCallback())
|
|
|
f325b2 |
+ GetSfxViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_CURSOR_VISIBLE, OString::boolean(false).getStr());
|
|
|
f325b2 |
+ else
|
|
|
f325b2 |
+ libreOfficeKitCallback(LOK_CALLBACK_CURSOR_VISIBLE, OString::boolean(false).getStr());
|
|
|
f325b2 |
+ }
|
|
|
f325b2 |
}
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|