[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sd/source

[Stephan Bergmann]

 sd/source/ui/framework/tools/FrameworkHelper.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a405a164357d86630d8fbd0386e07f53c5b6c9a1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jul 11 14:04:18 2016 +0200

    loplugin:staticcall
    
    Change-Id: I800eef0517f063ff7e08a95de9da268fb0e9d621
    Signed-off-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/27160

diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index ed74b7e..7a959a5 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -521,12 +521,12 @@ OUString FrameworkHelper::GetViewURL (ViewShell::ShellType eType)
 namespace
 {
 
-void updateEditMode(const Reference<XView> &xView, FrameworkHelper* const pHelper, const EditMode eEMode, bool updateFrameView)
+void updateEditMode(const Reference<XView> &xView, const EditMode eEMode, bool updateFrameView)
 {
     // Ensure we have the expected edit mode
     // The check is only for DrawViewShell as OutlineViewShell
     // and SlideSorterViewShell have no master mode
-    const ::std::shared_ptr<ViewShell> pCenterViewShell (pHelper->GetViewShell(xView));
+    const ::std::shared_ptr<ViewShell> pCenterViewShell (FrameworkHelper::GetViewShell(xView));
     DrawViewShell* pDrawViewShell
         = dynamic_cast<DrawViewShell*>(pCenterViewShell.get());
     if (pDrawViewShell != nullptr)
@@ -548,7 +548,7 @@ void asyncUpdateEditMode(FrameworkHelper* const pHelper, const EditMode eEMode)
     Reference<XResourceId> xPaneId (
         FrameworkHelper::CreateResourceId(framework::FrameworkHelper::msCenterPaneURL));
     Reference<XView> xView (pHelper->GetView(xPaneId));
-    updateEditMode(xView, pHelper, eEMode, true);
+    updateEditMode(xView, eEMode, true);
 }
 
 }
@@ -637,7 +637,7 @@ void FrameworkHelper::HandleModeChangeSlot (
         }
         else
         {
-            updateEditMode(xView, this, eEMode, false);
+            updateEditMode(xView, eEMode, false);
         }
     }
     catch (RuntimeException&)