summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorAshod Nakashian <ashod.nakashian@collabora.co.uk>2018-08-04 23:38:44 -0400
committerJan Holesovsky <kendy@collabora.com>2019-06-06 09:55:27 +0200
commit7665246ac8addc002f74e3a9b22d1baeda448af3 (patch)
tree3ff2efdfb6d05aadc0c1eee2a0306ecad60bc05e /sd
parentd8b0774eb1cd665c4e93595d37b2b33025fb0840 (diff)
ViewShellBase const correctness
Change-Id: I00bffe23f2f850f5e0cbf63a60aa1600f848edac (cherry picked from commit 4e6e33870a60a796c17c1e2d67ac6482b853ad28) Reviewed-on: https://gerrit.libreoffice.org/73479 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx8
-rw-r--r--sd/source/ui/inc/framework/FrameworkHelper.hxx6
2 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 5878aab82ffe..1ab5f4552500 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -84,7 +84,7 @@ public:
callback is destroyed.
*/
CallbackCaller (
- ::sd::ViewShellBase& rBase,
+ const ::sd::ViewShellBase& rBase,
const OUString& rsEventType,
const ::sd::framework::FrameworkHelper::ConfigurationChangeEventFilter& rFilter,
const ::sd::framework::FrameworkHelper::Callback& rCallback);
@@ -343,7 +343,7 @@ FrameworkHelper::InstanceMap FrameworkHelper::maInstanceMap;
return pHelper;
}
-void FrameworkHelper::DisposeInstance (ViewShellBase& rBase)
+void FrameworkHelper::DisposeInstance (const ViewShellBase& rBase)
{
InstanceMap::iterator iHelper (maInstanceMap.find(&rBase));
if (iHelper != maInstanceMap.end())
@@ -352,7 +352,7 @@ void FrameworkHelper::DisposeInstance (ViewShellBase& rBase)
}
}
-void FrameworkHelper::ReleaseInstance (ViewShellBase& rBase)
+void FrameworkHelper::ReleaseInstance (const ViewShellBase& rBase)
{
InstanceMap::iterator iHelper (maInstanceMap.find(&rBase));
if (iHelper != maInstanceMap.end())
@@ -830,7 +830,7 @@ namespace {
//===== CallbackCaller ========================================================
CallbackCaller::CallbackCaller (
- ::sd::ViewShellBase& rBase,
+ const ::sd::ViewShellBase& rBase,
const OUString& rsEventType,
const ::sd::framework::FrameworkHelper::ConfigurationChangeEventFilter& rFilter,
const ::sd::framework::FrameworkHelper::Callback& rCallback)
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index f4e44fab22db..20d7d0c9149a 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -114,14 +114,14 @@ public:
Do not call this method. It is an internally used method that can
not be made private.
*/
- static void DisposeInstance (ViewShellBase& rBase);
+ static void DisposeInstance (const ViewShellBase& rBase);
/** Destroy the FrameworkHelper object for the given ViewShellBase.
Do not call this method. It is an internally used method that can
not be made private.
*/
- static void ReleaseInstance (ViewShellBase& rBase);
+ static void ReleaseInstance (const ViewShellBase& rBase);
/** Return an identifier for the given view URL. This identifier can be
used in a switch statement. See GetViewURL() for a mapping in the
@@ -299,7 +299,7 @@ public:
private:
typedef ::std::map<
- ViewShellBase*,
+ const ViewShellBase*,
::std::shared_ptr<FrameworkHelper> > InstanceMap;
/** The instance map holds (at least) one FrameworkHelper instance for
every ViewShellBase object.