[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sd/source

[Maxim Monastirsky]

 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |    3 ++-
 sd/source/ui/table/tablefunction.cxx                   |    4 ++--
 sd/source/ui/view/ViewShellImplementation.cxx          |    4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 2575e441d860abd0b49e4593135736e20febb48e
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Mon Aug 31 00:30:16 2015 +0300

    sd: Don't crash when the sidebar is hidden
    
    Change-Id: I09a5019a98b529ba11f07392906a3e0fb7bc1bac
    (cherry picked from commit c511b2795dbf47186c0f7d83fe7a4cd737d4d765)
    Reviewed-on: https://gerrit.libreoffice.org/18243
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index c2be475..1a7e4bc 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -179,7 +179,8 @@ void SlotManager::FuTemporary (SfxRequest& rRequest)
 
         case SID_SLIDE_TRANSITIONS_PANEL:
         {
-            // Make the slide transition panel visible in the sidebar.
+            // First make sure that the sidebar is visible
+            pShell->GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
             ::sfx2::sidebar::Sidebar::ShowPanel(
                 OUString("SlideTransitionPanel"),
                 pShell->GetViewFrame()->GetFrame().GetFrameInterface());
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index 291cff7..d78cfff 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -207,8 +207,8 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
         }
         else
         {
-            // Make the table design panel visible (expand it) in the
-            // sidebar.
+            // First make sure that the sidebar is visible
+            GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
             ::sfx2::sidebar::Sidebar::ShowPanel(
                 OUString("ImpressTableDesignPanel"),
                 GetViewFrame()->GetFrame().GetFrameInterface());
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 73ea44f..44c3f26 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -119,8 +119,8 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
 
         if (!pArgs || pArgs->Count() == 1 || pArgs->Count() == 2 )
         {
-
-            // Make the layout menu visible in the tool pane.
+            // First make sure that the sidebar is visible
+            mrViewShell.GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
             sfx2::sidebar::Sidebar::ShowPanel(
                 OUString("ImpressLayoutsPanel"),
                 mrViewShell.GetViewFrame()->GetFrame().GetFrameInterface());