[Libreoffice-commits] core.git: sd/source

[Samuel Mehrbrodt]

 sd/source/ui/view/drviews2.cxx |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit f1df1056399759e05bed9e9f94208671ca333d39
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Fri Dec 11 12:40:00 2015 +0100

    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

diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 41a32c4..cebb95b 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,