[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - desktop/source

[Ashod Nakashian (via logerrit)]

 desktop/source/lib/init.cxx |   17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

New commits:
commit 8e9c36dfc346387abfbbaefbc15a518cbe3e257c
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun May 5 12:36:09 2019 -0400
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon May 6 15:25:36 2019 +0200

    LOK: remove duplicate cursor invalidations for same view only
    
    This limits duplicate cursor invalidation removal to same
    view only, which seems to have been left in error.
    
    We should now remove any old cursor invalidations (for
    the same view) and only keep the latest (current) one.
    
    Change-Id: Ie2323d0c5fcf3977576a1bdc098c95351a5753e0
    Reviewed-on: https://gerrit.libreoffice.org/71846
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c5bf038e14a3..626e37b87a1f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -929,8 +929,8 @@ CallbackFlushHandler::CallbackFlushHandler(LibreOfficeKitDocument* pDocument, Li
 {
     SetPriority(TaskPriority::POST_PAINT);
 
-    // Add the states that are safe to skip duplicates on,
-    // even when not consequent.
+    // Add the states that are safe to skip duplicates on, even when
+    // not consequent (i.e. do no emmit them if unchanged from last).
     m_states.emplace(LOK_CALLBACK_TEXT_SELECTION, "NIL");
     m_states.emplace(LOK_CALLBACK_GRAPHIC_SELECTION, "NIL");
     m_states.emplace(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, "NIL");
@@ -1022,7 +1022,7 @@ void CallbackFlushHandler::queue(const int type, const char* data)
         case LOK_CALLBACK_GRAPHIC_SELECTION:
         case LOK_CALLBACK_GRAPHIC_VIEW_SELECTION:
         case LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR:
-        case LOK_CALLBACK_INVALIDATE_VIEW_CURSOR :
+        case LOK_CALLBACK_INVALIDATE_VIEW_CURSOR:
         case LOK_CALLBACK_STATE_CHANGED:
         case LOK_CALLBACK_MOUSE_POINTER:
         case LOK_CALLBACK_CELL_CURSOR:
@@ -1106,6 +1106,7 @@ void CallbackFlushHandler::queue(const int type, const char* data)
             case LOK_CALLBACK_CELL_VIEW_CURSOR:
             case LOK_CALLBACK_GRAPHIC_VIEW_SELECTION:
             case LOK_CALLBACK_INVALIDATE_VIEW_CURSOR:
+            case LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR:
             case LOK_CALLBACK_TEXT_VIEW_SELECTION:
             case LOK_CALLBACK_VIEW_CURSOR_VISIBLE:
             {
@@ -1118,16 +1119,6 @@ void CallbackFlushHandler::queue(const int type, const char* data)
             }
             break;
 
-            case LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR:
-            {
-                removeAll(
-                    [type, &payload] (const queue_type::value_type& elem) {
-                        return (elem.Type == type && elem.PayloadString == payload);
-                    }
-                );
-            }
-            break;
-
             case LOK_CALLBACK_INVALIDATE_TILES:
             {
                 RectangleAndPart& rcNew = aCallbackData.setRectangleAndPart(payload);