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

[Caolán McNamara]

 sd/source/ui/dlg/NavigatorChildWindow.cxx |    4 +---
 sd/source/ui/dlg/navigatr.cxx             |    3 +--
 sd/source/ui/inc/navigatr.hxx             |    5 +----
 sd/source/ui/sidebar/NavigatorWrapper.cxx |    4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)

New commits:
commit d698e6f73a887f77f47d6e811ec3c8b32df59bb6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 11 16:36:58 2016 +0100

    merge a small piece of code
    
    Change-Id: I3be07e6c54fedc4b4f7ca8fc53cb941e294055bf

diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx
index 2be5175..8a30766 100644
--- a/sd/source/ui/dlg/NavigatorChildWindow.cxx
+++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx
@@ -51,9 +51,7 @@ NavigatorChildWindow::NavigatorChildWindow (
     : SfxChildWindowContext( nId )
 {
     VclPtr<SdNavigatorWin> pNavWin = VclPtr<SdNavigatorWin>::Create(
-        pParent,
-        SdResId( FLT_NAVIGATOR ),
-        pBindings);
+        pParent, pBindings);
 
     pNavWin->SetUpdateRequestFunctor(
         [pBindings] () { return RequestNavigatorUpdate(pBindings); });
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 7aaf951..225e5c7 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -65,9 +65,8 @@ static const sal_uInt16 nShowAllShapesFilter=2;
  */
 SdNavigatorWin::SdNavigatorWin(
     vcl::Window* pParent,
-    const SdResId& rSdResId,
     SfxBindings* pInBindings)
-    : vcl::Window( pParent, rSdResId )
+    : vcl::Window( pParent, SdResId(FLT_NAVIGATOR) )
     , maToolbox ( VclPtr<ToolBox>::Create( this, SdResId( 1 ) ) )
     , maTlbObjects( VclPtr<SdPageObjsTLB>::Create( this, SdResId( TLB_OBJECTS ) ) )
     , maLbDocs ( VclPtr<ListBox>::Create( this, SdResId( LB_DOCS ) ) )
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index c3df836..830c3cd 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -88,10 +88,7 @@ public:
             update is necessary.  When <FALSE/> the navigator will
             rely on others to trigger updates.
     */
-    SdNavigatorWin(
-        vcl::Window* pParent,
-        const SdResId& rSdResId,
-        SfxBindings* pBindings);
+    SdNavigatorWin(vcl::Window* pParent, SfxBindings* pBindings);
     void SetUpdateRequestFunctor(const UpdateRequestFunctor& rUpdateRequest);
     virtual ~SdNavigatorWin() override;
     virtual void                dispose() override;
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx b/sd/source/ui/sidebar/NavigatorWrapper.cxx
index eb6fe20..deedf7a 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.cxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx
@@ -33,9 +33,7 @@ NavigatorWrapper::NavigatorWrapper (
     : Control(pParent, 0),
       mrViewShellBase(rViewShellBase),
       maNavigator(VclPtr<SdNavigatorWin>::Create(
-        this,
-        SdResId(FLT_NAVIGATOR),
-        pBindings))
+        this, pBindings))
 {
     maNavigator->SetUpdateRequestFunctor(
             [this] () { return this->UpdateNavigator(); });