[Libreoffice-commits] online.git: kit/ChildSession.cpp wsd/TileCache.cpp

[Ashod Nakashian]

 kit/ChildSession.cpp |    5 +++++
 wsd/TileCache.cpp    |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 283cf812dedac64a63ed24e032ad3fc315bdda03
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Tue Nov 29 22:59:47 2016 -0500

    loolwsd: Writer doesn't have parts
    
    Fixup the part for EMPTY invalidation as well.
    
    N.B. Should replace 'EMPTY' with '0,0,INT_MAX,INT_MAX'
    to be consistent. Since both are expected, no compat
    issues should be expected.
    
    Change-Id: I066981622b1de71e9e849530df0583291b74b804
    Reviewed-on: https://gerrit.libreoffice.org/31393
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index b729b48..038a649 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -1061,6 +1061,11 @@ void ChildSession::loKitCallback(const int nType, const std::string& rPayload)
                               " width=" + std::to_string(width) +
                               " height=" + std::to_string(height));
             }
+            else if (tokens.count() == 2 && tokens[0] == "EMPTY")
+            {
+                const std::string part = (_docType != "text" ? tokens[1].c_str() : "0"); // Writer renders everything as part 0.
+                sendTextFrame("invalidatetiles: EMPTY, " + part);
+            }
             else
             {
                 sendTextFrame("invalidatetiles: " + rPayload);
diff --git a/wsd/TileCache.cpp b/wsd/TileCache.cpp
index 0ce257f..a6f0b7f 100644
--- a/wsd/TileCache.cpp
+++ b/wsd/TileCache.cpp
@@ -376,7 +376,7 @@ void TileCache::invalidateTiles(const std::string& tiles)
         }
     }
 
-    Log::error("Unexpected invalidatetiles request: " + tiles);
+    LOG_ERR("Unexpected invalidatetiles request [" << tiles << "].");
 }
 
 void TileCache::removeFile(const std::string& fileName)