summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-07-11 14:04:18 +0200
committerTor Lillqvist <tml@collabora.com>2016-08-02 16:45:11 +0300
commit8f85eeed08a0d8bb6b34a150cc1cad80e26cf1c5 (patch)
tree32986f418294147770911dffdfe98ec2d17794ea
parent242a67e438d4d344f72c70bfbf252f02d4ad68a0 (diff)
loplugin:staticcall
Change-Id: I800eef0517f063ff7e08a95de9da268fb0e9d621 Signed-off-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/27160 (cherry picked from commit a405a164357d86630d8fbd0386e07f53c5b6c9a1)
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index ed74b7ee3123..7a959a5d451f 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&)