diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-12-11 12:40:00 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-12-11 12:56:47 +0100 |
| commit | f1df1056399759e05bed9e9f94208671ca333d39 (patch) | |
| tree | f21b508986ffd4145a03ccc802da33e23824e94a /sd | |
| parent | 7bc1f1285e82982b5d900f54f3c6f877517598b8 (diff) | |
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 6f493f9e379af1e005b85606c6aab515726be993.
Change-Id: Ia796de5a8ef0be61f36517bc0aa896c66a95c1e8
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 41a32c4bb76c..cebb95bc1d91 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -2689,6 +2689,20 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) break; 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_CUSTOM_ANIMATION_PANEL: case SID_GALLERY: @@ -2703,8 +2717,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) panelId = "GalleryPanel"; else if (nSId == SID_SLIDE_TRANSITIONS_PANEL) panelId = "SdSlideTransitionPanel"; - else if (nSId == SID_NAVIGATOR) - panelId = "SdNavigatorPanel"; ::sfx2::sidebar::Sidebar::ShowPanel( panelId, |