diff options
| -rw-r--r-- | include/sfx2/viewsh.hxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/framework/tools/FrameworkHelper.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/inc/framework/FrameworkHelper.hxx | 6 | ||||
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 2 |
4 files changed, 9 insertions, 10 deletions
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index e7a0f6d7fec1..09b185c1b5f3 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -280,8 +280,7 @@ public: void SetNewWindowAllowed( bool bSet ) { bNoNewWindow = !bSet; } void SetController( SfxBaseController* pController ); - css::uno::Reference< css::frame::XController > - GetController(); + css::uno::Reference<css::frame::XController> GetController() const; bool TryContextMenuInterception( Menu& rIn, const OUString& rMenuIdentifier, VclPtr<Menu>& rpOut, css::ui::ContextMenuExecuteEvent aEvent ); bool TryContextMenuInterception( Menu& rMenu, const OUString& rMenuIdentifier, css::ui::ContextMenuExecuteEvent aEvent ); diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 7c905edd4550..c9ab07963cca 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -88,7 +88,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); @@ -347,7 +347,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()) @@ -356,7 +356,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()) @@ -834,7 +834,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 d56514065f96..e3597302bc8f 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. diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index c9b91d8ca9e0..c5cd05f5e3cd 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -1766,7 +1766,7 @@ void SfxViewShell::SetController( SfxBaseController* pController ) pImpl->xClipboardListener = new SfxClipboardChangeListener( this, GetClipboardNotifier() ); } -Reference < XController > SfxViewShell::GetController() +Reference < XController > SfxViewShell::GetController() const { return pImpl->m_pController.get(); } |