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

Jan Holesovsky kendy at collabora.com
Tue Jan 17 18:19:19 UTC 2017


 kit/ChildSession.cpp |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 1cf4334ec61b5dd6d85ec865fa3513a33ca9b598
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Jan 17 19:15:56 2017 +0100

    partpagerectangles is useless, and causes trouble for many documents.
    
    When invoked too early after the document load, on slower servers it is
    executed before the layout of the document is performed, leading to crashes.
    
    It is useless for loleaflet, so let's disable it here, and remove it in
    master for good.
    
    Change-Id: Icf08d9df5efc8b0488c94048803e703b40f67e24

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 0f984ab..a216456 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -531,16 +531,9 @@ bool ChildSession::getCommandValues(const char* /*buffer*/, int /*length*/, Stri
 
 bool ChildSession::getPartPageRectangles(const char* /*buffer*/, int /*length*/)
 {
-    char* partPage = nullptr;
-    {
-        std::unique_lock<std::mutex> lock(_docManager.getDocumentMutex());
-
-        getLOKitDocument()->setView(_viewId);
-        partPage = getLOKitDocument()->getPartPageRectangles();
-    }
-
-    sendTextFrame("partpagerectangles: " + std::string(partPage));
-    std::free(partPage);
+    // We don't support partpagerectangles any more, will be removed in the
+    // next version
+    sendTextFrame("partpagerectangles: ");
     return true;
 }
 


More information about the Libreoffice-commits mailing list