[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - desktop/source sd/source

[Ashod Nakashian (via logerrit)]

 desktop/source/lib/init.cxx      |    2 --
 sd/source/ui/unoidl/unomodel.cxx |   11 +++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 0446a69570ae8dc15b9f7a8f8325790953640140
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun Nov 11 23:37:24 2018 -0500
Commit:     Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Mon Apr 15 02:33:36 2019 +0200

    LOK: sd: initialize slide-sorter in sd
    
    Change-Id: I4cb6ce6d961b4ba4d542c14cb37370788cf75e45
    Reviewed-on: https://gerrit.libreoffice.org/69613
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 26f3f585ade9..5010fe406c1e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2640,8 +2640,6 @@ static void doc_initializeForRendering(LibreOfficeKitDocument* pThis,
     if (pDoc)
     {
         doc_iniUnoCommands();
-        // Create the SlideSorter which is used for multiselection and reordering.
-        doc_postUnoCommand(pThis, ".uno:LeftPaneImpress", nullptr, false);
         pDoc->initializeForTiledRendering(
                 comphelper::containerToSequence(jsonToPropertyValuesVector(pArguments)));
     }
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index fe0c82d9309a..96ba362c3c7b 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -32,6 +32,7 @@
 
 #include <com/sun/star/embed/Aspects.hpp>
 
+#include <comphelper/dispatchcommand.hxx>
 #include <comphelper/lok.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/servicehelper.hxx>
@@ -2511,6 +2512,16 @@ void SdXImpressDocument::initializeForTiledRendering(const css::uno::Sequence<cs
     // causing 'Save' being disabled; so let's always save to the original
     // format
     SvtSaveOptions().SetWarnAlienFormat(false);
+
+    // Set up the .uno command parameters.
+    beans::PropertyValue aSynchronMode;
+    aSynchronMode.Name = "SynchronMode";
+    aSynchronMode.Value <<= true;
+    const std::vector<beans::PropertyValue> aPropertyValuesVector({aSynchronMode});
+
+    // Create the SlideSorter which is used for multiselection and reordering.
+    static const OUString aLeftPaneCommand(".uno:LeftPaneImpress");
+    comphelper::dispatchCommand(aLeftPaneCommand, comphelper::containerToSequence(aPropertyValuesVector));
 }
 
 void SdXImpressDocument::postKeyEvent(int nType, int nCharCode, int nKeyCode)