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

Jan Holesovsky (via logerrit) logerrit at kemper.freedesktop.org
Thu Apr 25 12:27:26 UTC 2019


 sd/source/ui/unoidl/unomodel.cxx |   11 -----------
 1 file changed, 11 deletions(-)

New commits:
commit 7e291eedbad335bf8bbc8a17cc3d633bf66d0e90
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Thu Apr 25 05:54:15 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Apr 25 14:26:36 2019 +0200

    sd lok: Remove the .uno:LeftPaneImpress call from sd lok initialization.
    
    According to my testing, this makes no difference and the moving of
    slides and multiple selection behaves the same way with or without this.
    
    So let's return to not activating the SlideSorterBar, because otherwise
    we are doing a lot of pixel bashing behind the scenes unnecessarily.
    
    Having said that, if we want to activate it at some stage, it is better
    to do something like the following (+ remove the explicit LOK-only if's
    from svtools/source/config/slidesorterbaropt.cxx):
    
      SvtSlideSorterBarOptions().SetVisibleImpressView(true);
    
    instead (and potentially we can also make it floating not to occupy the
    space in the main view by
    
      GetWindow()->SetFloatingMode(true);
    
    in the LOK case in sd/source/ui/dlg/PaneChildWindows.cxxi).
    
    Change-Id: I86b23b484674ad4c6a75246ee6186ad9b828931f
    Reviewed-on: https://gerrit.libreoffice.org/71271
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 96ba362c3c7b..fe0c82d9309a 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -32,7 +32,6 @@
 
 #include <com/sun/star/embed/Aspects.hpp>
 
-#include <comphelper/dispatchcommand.hxx>
 #include <comphelper/lok.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/servicehelper.hxx>
@@ -2512,16 +2511,6 @@ 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)


More information about the Libreoffice-commits mailing list