[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source

[Miklos Vajna]

 sw/source/core/crsr/viscrs.cxx |    2 +-
 sw/source/core/view/viewsh.cxx |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 162627299f4450619390f95783fe0bc3013f6af4
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Jan 27 10:59:54 2015 +0100

    SwVisCrsr::Show: ignore VisArea() in case of tiled rendering
    
    Which means that then we get the cursor update instantly and can again
    ignore all events generated by the client's paintTile() call.
    
    Change-Id: Ie22e20737c30bdd65d25bc6a84f59df4159b7dec

diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index d8d0631..247efcb 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -88,7 +88,7 @@ void SwVisCrsr::Show()
         m_bIsVisible = true;
 
         // display at all?
-        if( m_pCrsrShell->VisArea().IsOver( m_pCrsrShell->m_aCharRect ) )
+        if( m_pCrsrShell->VisArea().IsOver( m_pCrsrShell->m_aCharRect ) || m_pCrsrShell->isTiledRendering() )
             _SetPosAndShow();
     }
 }
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 14741cd..a893424 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -125,9 +125,7 @@ void SwViewShell::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallbac
 
 void SwViewShell::libreOfficeKitCallback(int nType, const char* pPayload) const
 {
-    if (mbInLibreOfficeKitCallback && nType == LOK_CALLBACK_INVALIDATE_TILES)
-        // Make sure no more invalidation events are issued when we're in the
-        // callback already.
+    if (mbInLibreOfficeKitCallback)
         return;
 
     if (mpLibreOfficeKitCallback)