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

Ashod Nakashian ashod.nakashian at collabora.co.uk
Mon May 23 01:43:13 UTC 2016


 loolwsd/LOOLKit.cpp |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 1134b17e96b365cdd3638d7ef3942c90c37f7712
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun May 22 11:25:43 2016 -0400

    loolwsd: logging
    
    Change-Id: Ic08b32104db1154573b9e0774cda23167a5cddf3
    Reviewed-on: https://gerrit.libreoffice.org/25334
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 8cd6329..f2ba282 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -573,10 +573,6 @@ public:
             return;
         }
 
-        //TODO: Support multiviews.
-        //if (_multiView)
-            //_loKitDocument->setView(_viewId);
-
         // Send back the request with all optional parameters given in the request.
         const auto tileMsg = tile.serialize("tile:");
 #if ENABLE_DEBUG
@@ -599,13 +595,14 @@ public:
                                       tile.getTilePosX(), tile.getTilePosY(),
                                       tile.getTileWidth(), tile.getTileHeight());
         Log::trace() << "paintTile at (" << tile.getPart() << ',' << tile.getTilePosX() << ',' << tile.getTilePosY()
-                     << " rendered in " << (timestamp.elapsed()/1000.) << " ms" << Log::end;
+                     << ") rendered in " << (timestamp.elapsed()/1000.) << " ms" << Log::end;
 
         const auto mode = static_cast<LibreOfficeKitTileMode>(_loKitDocument->getTileMode());
         if (!png::encodeBufferToPNG(pixmap.data(), tile.getWidth(), tile.getHeight(), output, mode))
         {
             //FIXME: Return error.
             //sendTextFrame("error: cmd=tile kind=failure");
+            Log::error("Failed to encode tile into PNG.");
             return;
         }
 


More information about the Libreoffice-commits mailing list