[Libreoffice-commits] online.git: loolwsd/TileCache.cpp

Ashod Nakashian ashod.nakashian at collabora.co.uk
Thu Oct 20 15:14:53 UTC 2016


 loolwsd/TileCache.cpp |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 693d6ccdbfec663af8d60960cbb7b65a4701dfbb
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Thu Oct 20 10:58:58 2016 -0400

    bccu#2104 - writer: undo/redo doesn't invalidate properly
    
    Change-Id: I9b3ee76cfde2c15ae59bb393070224c9f14ab586
    Reviewed-on: https://gerrit.libreoffice.org/30109
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/TileCache.cpp b/loolwsd/TileCache.cpp
index 9b7293f..f3cb817 100644
--- a/loolwsd/TileCache.cpp
+++ b/loolwsd/TileCache.cpp
@@ -330,6 +330,16 @@ void TileCache::invalidateTiles(const std::string& tiles)
     if (tokens.count() == 2 && tokens[1] == "EMPTY")
     {
         invalidateTiles(-1, 0, 0, INT_MAX, INT_MAX);
+        return;
+    }
+    else if (tokens.count() == 3 && tokens[1] == "EMPTY,")
+    {
+        int part = 0;
+        if (stringToInteger(tokens[2], part))
+        {
+            invalidateTiles(part, 0, 0, INT_MAX, INT_MAX);
+            return;
+        }
     }
     else
     {
@@ -342,12 +352,11 @@ void TileCache::invalidateTiles(const std::string& tiles)
             getTokenInteger(tokens[5], "height", height))
         {
             invalidateTiles(part, x, y, width, height);
-        }
-        else
-        {
-            Log::error("Unexpected invalidatetiles request: " + tiles);
+            return;
         }
     }
+
+    Log::error("Unexpected invalidatetiles request: " + tiles);
 }
 
 void TileCache::removeFile(const std::string& fileName)


More information about the Libreoffice-commits mailing list