Kaydet (Commit) 7b8d0dd5 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky Kaydeden (comit) Andras Timar

sd: Don't crash when the sidebar is hidden

Change-Id: I09a5019a98b529ba11f07392906a3e0fb7bc1bac
(cherry picked from commit c511b279)
Reviewed-on: https://gerrit.libreoffice.org/18243Reviewed-by: 's avatarJan Holesovsky <kendy@collabora.com>
Tested-by: 's avatarJan Holesovsky <kendy@collabora.com>
üst b4d372d6
...@@ -179,7 +179,8 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) ...@@ -179,7 +179,8 @@ void SlotManager::FuTemporary (SfxRequest& rRequest)
case SID_SLIDE_TRANSITIONS_PANEL: 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( ::sfx2::sidebar::Sidebar::ShowPanel(
OUString("SlideTransitionPanel"), OUString("SlideTransitionPanel"),
pShell->GetViewFrame()->GetFrame().GetFrameInterface()); pShell->GetViewFrame()->GetFrame().GetFrameInterface());
......
...@@ -207,8 +207,8 @@ void DrawViewShell::FuTable(SfxRequest& rReq) ...@@ -207,8 +207,8 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
} }
else else
{ {
// Make the table design panel visible (expand it) in the // First make sure that the sidebar is visible
// sidebar. GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
::sfx2::sidebar::Sidebar::ShowPanel( ::sfx2::sidebar::Sidebar::ShowPanel(
OUString("ImpressTableDesignPanel"), OUString("ImpressTableDesignPanel"),
GetViewFrame()->GetFrame().GetFrameInterface()); GetViewFrame()->GetFrame().GetFrameInterface());
......
...@@ -119,8 +119,8 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( ...@@ -119,8 +119,8 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
if (!pArgs || pArgs->Count() == 1 || pArgs->Count() == 2 ) if (!pArgs || pArgs->Count() == 1 || pArgs->Count() == 2 )
{ {
// First make sure that the sidebar is visible
// Make the layout menu visible in the tool pane. mrViewShell.GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
sfx2::sidebar::Sidebar::ShowPanel( sfx2::sidebar::Sidebar::ShowPanel(
OUString("ImpressLayoutsPanel"), OUString("ImpressLayoutsPanel"),
mrViewShell.GetViewFrame()->GetFrame().GetFrameInterface()); mrViewShell.GetViewFrame()->GetFrame().GetFrameInterface());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment