sd/source/ui/framework/tools/FrameworkHelper.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 748b60a2c7e164a0ffe66270ad4b913f1c2f2924
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jul 11 14:04:18 2016 +0200
WaE: C4100: 'pHelper' : unreferenced formal parameter
(loplugin:staticcall)
(cherry picked from commit 3849758adc0592327568ff465ccf255786632b4b)
Change-Id: I800eef0517f063ff7e08a95de9da268fb0e9d621
Reviewed-on: https://gerrit.libreoffice.org/27618
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tor Lillqvist <tml at collabora.com>
Tested-by: Tor Lillqvist <tml at collabora.com>
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 15740f0..ed1308f 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&)