diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-08-31 00:30:16 +0300 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-09-01 15:22:14 +0000 |
| commit | 2575e441d860abd0b49e4593135736e20febb48e (patch) | |
| tree | b6cd4d6805dd4f8cdde26e3358d3b4391e4c8836 /sd | |
| parent | 7abc8172faa888ce8da22ddd0e4b33a60f23de75 (diff) | |
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@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/table/tablefunction.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/ViewShellImplementation.cxx | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index c2be4751a2f8..1a7e4bc41eea 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 291cff7798f5..d78cfffaa559 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 73ea44f8e388..44c3f269ae00 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()); |