[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 3 commits - desktop/README.vars include/sfx2 sw/inc sw/source

[Miklos Vajna]

 desktop/README.vars            |   16 ++++++++++++++++
 include/sfx2/viewsh.hxx        |    2 +-
 sw/inc/viewsh.hxx              |    2 +-
 sw/source/core/crsr/viscrs.cxx |    8 ++++++--
 4 files changed, 24 insertions(+), 4 deletions(-)

New commits:
commit 983fbff0ac37e081a5b059de0ae3bd4631ccd438
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Sep 18 08:31:36 2015 +0200

    desktop: document a number of environment variables
    
    Change-Id: Ie33f8b2f8d2a65fbdb7f4f3caaeee8f0f046cba5

diff --git a/desktop/README.vars b/desktop/README.vars
new file mode 100644
index 0000000..b84a270
--- /dev/null
+++ b/desktop/README.vars
@@ -0,0 +1,16 @@
+Environment variables in desktop:
+
+General
+-------
+
+DISPLAY - X11 display to use.
+OOO_DISABLE_RECOVERY - Disables the recovery dialog.
+OOO_EXIT_POST_STARTUP - Exit right after startup, for profiling purposes.
+SAL_DISABLE_USERMIGRATION - Disable automatic conversion of old user configurations.
+SAL_USE_VCLPLUGIN - Which VCL plugin to use instead of the auto-detected one.
+
+LibreOfficeKit
+--------------
+
+LOK_DEBUG - Draw a small red rectangle in the top left corner so that it's easy to see where a new tile begins.
+LOK_VIEW_CALLBACK - Use incomplete per-view callbacks instead of a single one.
commit 1f9ca9dee399a38403a81ee299696d24277ae4bb
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Sep 17 17:19:49 2015 +0200

    sw: implement per-view LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR
    
    Change-Id: Ib4c1caede94d3eac372a3605c430bbbd353755f3

diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index d0e3d12..3b04e66 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -442,7 +442,7 @@ public:
                           { return mpCareWindow ? mpCareWindow.get() : CareChildWin(rVSh); }
     static vcl::Window*   CareChildWin(SwViewShell& rVSh);
 
-    inline SfxViewShell   *GetSfxViewShell() { return mpSfxViewShell; }
+    inline SfxViewShell   *GetSfxViewShell() const { return mpSfxViewShell; }
     inline void           SetSfxViewShell(SfxViewShell *pNew) { mpSfxViewShell = pNew; }
 
     // Selection of  Draw Engine has been changed.
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index a6a8957..cd47acc 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -54,6 +54,7 @@
 #include <memory>
 
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
+#include <comphelper/lok.hxx>
 #include <paintfrm.hxx>
 
 // Here static members are defined. They will get changed on alteration of the
@@ -178,7 +179,7 @@ void SwVisCrsr::_SetPosAndShow()
 
     m_aTextCrsr.SetPos( aRect.Pos() );
 
-    if (m_pCrsrShell->isTiledRendering())
+    if (comphelper::LibreOfficeKit::isActive())
     {
         // notify about page number change (if that happened)
         sal_uInt16 nPage, nVirtPage;
@@ -193,7 +194,10 @@ void SwVisCrsr::_SetPosAndShow()
         // notify about the cursor position & size
         Rectangle aSVRect(aRect.Pos().getX(), aRect.Pos().getY(), aRect.Pos().getX() + aRect.SSize().Width(), aRect.Pos().getY() + aRect.SSize().Height());
         OString sRect = aSVRect.toString();
-        m_pCrsrShell->libreOfficeKitCallback(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, sRect.getStr());
+        if (comphelper::LibreOfficeKit::isViewCallback())
+            m_pCrsrShell->GetSfxViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, sRect.getStr());
+        else
+            m_pCrsrShell->libreOfficeKitCallback(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, sRect.getStr());
     }
 
     if ( !m_pCrsrShell->IsCrsrReadonly()  || m_pCrsrShell->GetViewOptions()->IsSelectionInReadonly() )
commit d898f2de252519941ae465649d9e17938a687ad3
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Sep 17 15:42:16 2015 +0200

    sfx2: adapt comment to reality
    
    Change-Id: I9dd2934eaa7b479460c3a2dc7d2d51ce5c767a9f

diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 70f3931..ca5090f 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -318,7 +318,7 @@ public:
     SAL_DLLPRIVATE void TakeFrameOwnership_Impl();
     SAL_DLLPRIVATE bool ExecKey_Impl(const KeyEvent& aKey);
 
-    /// The actual implementation of the lok::Document::registerViewCallback() API.
+    /// The actual per-view implementation of lok::Document::registerCallback().
     void registerLibreOfficeKitViewCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData);
     /// Invokes the registered callback, if there are any.
     void libreOfficeKitViewCallback(int nType, const char* pPayload) const;