|
 |
135360 |
From eaa1e3dcd0d84b8c60f5175b8e3ab5582e4658e7 Mon Sep 17 00:00:00 2001
|
|
|
135360 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
135360 |
Date: Thu, 17 Sep 2015 17:19:49 +0200
|
|
|
135360 |
Subject: [PATCH 151/398] sw: implement per-view
|
|
|
135360 |
LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR
|
|
|
135360 |
|
|
|
135360 |
Change-Id: Ib4c1caede94d3eac372a3605c430bbbd353755f3
|
|
|
135360 |
(cherry picked from commit 5c2811d682c6e623f3b2613df3119987c0c79c12)
|
|
|
135360 |
---
|
|
|
135360 |
sw/inc/viewsh.hxx | 2 +-
|
|
|
135360 |
sw/source/core/crsr/viscrs.cxx | 8 ++++++--
|
|
|
135360 |
2 files changed, 7 insertions(+), 3 deletions(-)
|
|
|
135360 |
|
|
|
135360 |
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
|
|
|
135360 |
index 1ba064f0c16c..fcccb91654fb 100644
|
|
|
135360 |
--- a/sw/inc/viewsh.hxx
|
|
|
135360 |
+++ b/sw/inc/viewsh.hxx
|
|
|
135360 |
@@ -449,7 +449,7 @@ public:
|
|
|
135360 |
{ return mpCareWindow ? mpCareWindow.get() : CareChildWin(rVSh); }
|
|
|
135360 |
static vcl::Window* CareChildWin(SwViewShell& rVSh);
|
|
|
135360 |
|
|
|
135360 |
- inline SfxViewShell *GetSfxViewShell() { return mpSfxViewShell; }
|
|
|
135360 |
+ inline SfxViewShell *GetSfxViewShell() const { return mpSfxViewShell; }
|
|
|
135360 |
inline void SetSfxViewShell(SfxViewShell *pNew) { mpSfxViewShell = pNew; }
|
|
|
135360 |
|
|
|
135360 |
// Selection of Draw Engine has been changed.
|
|
|
135360 |
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
|
|
|
135360 |
index e0d32cc86e11..13cfcd89b22b 100644
|
|
|
135360 |
--- a/sw/source/core/crsr/viscrs.cxx
|
|
|
135360 |
+++ b/sw/source/core/crsr/viscrs.cxx
|
|
|
135360 |
@@ -54,6 +54,7 @@
|
|
|
135360 |
#include <boost/scoped_ptr.hpp>
|
|
|
135360 |
|
|
|
135360 |
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
|
|
|
135360 |
+#include <comphelper/lok.hxx>
|
|
|
135360 |
#include <paintfrm.hxx>
|
|
|
135360 |
|
|
|
135360 |
// Here static members are defined. They will get changed on alteration of the
|
|
|
135360 |
@@ -178,7 +179,7 @@ void SwVisCrsr::_SetPosAndShow()
|
|
|
135360 |
|
|
|
135360 |
m_aTextCrsr.SetPos( aRect.Pos() );
|
|
|
135360 |
|
|
|
135360 |
- if (m_pCrsrShell->isTiledRendering())
|
|
|
135360 |
+ if (comphelper::LibreOfficeKit::isActive())
|
|
|
135360 |
{
|
|
|
135360 |
// notify about page number change (if that happened)
|
|
|
135360 |
sal_uInt16 nPage, nVirtPage;
|
|
|
135360 |
@@ -193,7 +194,10 @@ void SwVisCrsr::_SetPosAndShow()
|
|
|
135360 |
// notify about the cursor position & size
|
|
|
135360 |
Rectangle aSVRect(aRect.Pos().getX(), aRect.Pos().getY(), aRect.Pos().getX() + aRect.SSize().Width(), aRect.Pos().getY() + aRect.SSize().Height());
|
|
|
135360 |
OString sRect = aSVRect.toString();
|
|
|
135360 |
- m_pCrsrShell->libreOfficeKitCallback(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, sRect.getStr());
|
|
|
135360 |
+ if (comphelper::LibreOfficeKit::isViewCallback())
|
|
|
135360 |
+ m_pCrsrShell->GetSfxViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, sRect.getStr());
|
|
|
135360 |
+ else
|
|
|
135360 |
+ m_pCrsrShell->libreOfficeKitCallback(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, sRect.getStr());
|
|
|
135360 |
}
|
|
|
135360 |
|
|
|
135360 |
if ( !m_pCrsrShell->IsCrsrReadonly() || m_pCrsrShell->GetViewOptions()->IsSelectionInReadonly() )
|
|
|
135360 |
--
|
|
|
135360 |
2.12.0
|
|
|
135360 |
|