[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sfx2/source

Aron Budea aron.budea at collabora.com
Thu Dec 21 11:04:19 UTC 2017


 sfx2/source/sidebar/SidebarController.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8bc50d17eb5aaeaaa81255eb5cee6fb60f99c7bc
Author: Aron Budea <aron.budea at collabora.com>
Date:   Wed Dec 20 12:06:39 2017 +0100

    tdf#104229: properly switch to def sidebar deck on status change
    
    regression since a64999511ae654131d997eec9a3d78478cfc1c75
    
    Change-Id: Id1d0a76f89c41e88511f670f1aac4b866e4c15c6
    Reviewed-on: https://gerrit.libreoffice.org/46840
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit f2f5ebcee462472b27b610f53abc7f9a6378462b)
    Reviewed-on: https://gerrit.libreoffice.org/46881

diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index b0610ae203d9..5752120038a4 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -307,7 +307,7 @@ void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEv
 
         // Force the current deck to update its panel list.
         if ( ! mbIsDocumentReadOnly)
-            msCurrentDeckId = gsDefaultDeckId;
+            SwitchToDefaultDeck();
 
         mnRequestedForceFlags |= SwitchFlag_ForceSwitch;
         maAsynchronousDeckSwitch.CancelRequest();


More information about the Libreoffice-commits mailing list