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

Ashod Nakashian (via logerrit) logerrit at kemper.freedesktop.org
Thu Oct 31 10:56:49 UTC 2019


 sfx2/source/sidebar/Deck.cxx |   16 ----------------
 1 file changed, 16 deletions(-)

New commits:
commit 4719c2635b933c0b3a9e68478e21ada022dea057
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Tue Oct 29 20:06:02 2019 -0400
Commit:     Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Thu Oct 31 11:56:11 2019 +0100

    Revert "jsdialogs: send JSON to the client"
    
    Tunnelling Deck causes major problems, SidebarDockingWindow
    is tunnelled instead.
    
    This reverts commit 11730bf818c2df6b471efbcc6254cca5ad6a6054.
    
    Change-Id: I3c2fe2d940a714ddd60ba32689371ffe2b70668e
    Reviewed-on: https://gerrit.libreoffice.org/81753
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 99b3728d0838..cca6df0f7286 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -38,8 +38,6 @@
 #include <vcl/IDialogRenderable.hxx>
 #include <tools/svborder.hxx>
 #include <sal/log.hxx>
-#include <boost/property_tree/json_parser.hpp>
-#include <LibreOfficeKit/LibreOfficeKitEnums.h>
 
 using namespace css;
 using namespace css::uno;
@@ -181,20 +179,6 @@ bool Deck::EventNotify(NotifyEvent& rEvent)
 void Deck::Resize()
 {
     Window::Resize();
-
-    if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
-    {
-        try
-        {
-            std::stringstream aStream;
-            boost::property_tree::write_json(aStream, DumpAsPropertyTree());
-            pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, aStream.str().c_str());
-        }
-        catch(boost::property_tree::json_parser::json_parser_error& rError)
-        {
-            SAL_WARN("sfx.sidebar", rError.message());
-        }
-    }
 }
 
 bool Deck::ProcessWheelEvent(CommandEvent const * pCommandEvent)


More information about the Libreoffice-commits mailing list