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

[Samuel Mehrbrodt]

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

New commits:
commit 6f493f9e379af1e005b85606c6aab515726be993
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Thu Nov 19 11:33:36 2015 +0100

    Impress/Draw: Open Navigator in the Sidebar
    
    Change-Id: I9a4ba3fd9c3909ccc5dfc459478a7b9b59fdc70e
    Reviewed-on: https://gerrit.libreoffice.org/20050
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index cebb95b..41a32c4 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -2689,20 +2689,6 @@ 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:
@@ -2717,6 +2703,8 @@ 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,