Kaydet (Commit) f1df1056 authored tarafından Samuel Mehrbrodt's avatar Samuel Mehrbrodt

Revert "Impress/Draw: Open Navigator in the Sidebar"

This breaks starting a slideshow with Navigator visible.
Also leads to problems like tdf#96286
Needs more thought & design.

This reverts commit 6f493f9e.

Change-Id: Ia796de5a8ef0be61f36517bc0aa896c66a95c1e8
üst 7bc1f128
...@@ -2689,6 +2689,20 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) ...@@ -2689,6 +2689,20 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
break; break;
case SID_NAVIGATOR: case SID_NAVIGATOR:
{
if ( rReq.GetArgs() )
GetViewFrame()->SetChildWindow(SID_NAVIGATOR,
static_cast<const SfxBoolItem&>(rReq.GetArgs()->
Get(SID_NAVIGATOR)).GetValue());
else
GetViewFrame()->ToggleChildWindow( SID_NAVIGATOR );
GetViewFrame()->GetBindings().Invalidate(SID_NAVIGATOR);
Cancel();
rReq.Ignore ();
}
break;
case SID_SLIDE_TRANSITIONS_PANEL: case SID_SLIDE_TRANSITIONS_PANEL:
case SID_CUSTOM_ANIMATION_PANEL: case SID_CUSTOM_ANIMATION_PANEL:
case SID_GALLERY: case SID_GALLERY:
...@@ -2703,8 +2717,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) ...@@ -2703,8 +2717,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
panelId = "GalleryPanel"; panelId = "GalleryPanel";
else if (nSId == SID_SLIDE_TRANSITIONS_PANEL) else if (nSId == SID_SLIDE_TRANSITIONS_PANEL)
panelId = "SdSlideTransitionPanel"; panelId = "SdSlideTransitionPanel";
else if (nSId == SID_NAVIGATOR)
panelId = "SdNavigatorPanel";
::sfx2::sidebar::Sidebar::ShowPanel( ::sfx2::sidebar::Sidebar::ShowPanel(
panelId, panelId,
......
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