diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-07-07 18:46:43 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-07-12 18:56:47 +0200 |
| commit | 4e6a1615d1a4c81c490cfb479d5e30f4e98adc47 (patch) | |
| tree | b9777a74c83f7b8591ee93aa593624c70fdd6bf7 /include/sfx2/sidebar | |
| parent | 04716cb9acfde7e247c01d79afde694f8e4f9f7f (diff) | |
use XController instead of XFrame where it makes sense
Change-Id: I22990c861c0dd9d9dab3fbdbc35fdb2b51e82005
Diffstat (limited to 'include/sfx2/sidebar')
| -rw-r--r-- | include/sfx2/sidebar/ResourceManager.hxx | 10 | ||||
| -rw-r--r-- | include/sfx2/sidebar/SidebarController.hxx | 2 | ||||
| -rw-r--r-- | include/sfx2/sidebar/Tools.hxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/sfx2/sidebar/ResourceManager.hxx b/include/sfx2/sidebar/ResourceManager.hxx index 5768db0445b3..568b7f87e593 100644 --- a/include/sfx2/sidebar/ResourceManager.hxx +++ b/include/sfx2/sidebar/ResourceManager.hxx @@ -23,7 +23,7 @@ #include "PanelDescriptor.hxx" #include <sfx2/sidebar/Context.hxx> #include <unotools/confignode.hxx> -#include <com/sun/star/frame/XFrame.hpp> +#include <com/sun/star/frame/XController.hpp> #include <set> #include <boost/shared_ptr.hpp> #include <svtools/miscopt.hxx> @@ -89,13 +89,13 @@ public: DeckContextDescriptorContainer& rDeckDescriptors, const Context& rContext, const bool bIsDocumentReadOnly, - const css::uno::Reference<css::frame::XFrame>& rxFrame); + const css::uno::Reference<css::frame::XController>& rxController); const PanelContextDescriptorContainer& GetMatchingPanels( PanelContextDescriptorContainer& rPanelDescriptors, const Context& rContext, const OUString& rsDeckId, - const css::uno::Reference<css::frame::XFrame>& rxFrame); + const css::uno::Reference<css::frame::XController>& rxController); /** Remember the expansions state per panel and context. This is not persistent past application end. @@ -121,13 +121,13 @@ private: static void ReadContextList(const utl::OConfigurationNode& rNode, ContextList& rContextList, const OUString& rsDefaultMenuCommand); - void ReadLegacyAddons(const css::uno::Reference<css::frame::XFrame>& rxFrame); + void ReadLegacyAddons(const css::uno::Reference<css::frame::XController>& rxController); static utl::OConfigurationTreeRoot GetLegacyAddonRootNode(const OUString& rsModuleName); static void GetToolPanelNodeNames(std::vector<OUString>& rMatchingNames, const utl::OConfigurationTreeRoot& aRoot); static bool IsDeckEnabled(const OUString& rsDeckId, const Context& rContext, - const css::uno::Reference<css::frame::XFrame>& rxFrame); + const css::uno::Reference<css::frame::XController>& rxController); }; } } // end of namespace sfx2::sidebar diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx index 29c7d4379edf..78a047865a97 100644 --- a/include/sfx2/sidebar/SidebarController.hxx +++ b/include/sfx2/sidebar/SidebarController.hxx @@ -158,7 +158,7 @@ public: private: typedef ::std::map< - const css::uno::Reference<css::frame::XFrame>, + const css::uno::Reference<css::frame::XController>, css::uno::WeakReference<SidebarController> > SidebarControllerContainer; static SidebarControllerContainer maSidebarControllerContainer; diff --git a/include/sfx2/sidebar/Tools.hxx b/include/sfx2/sidebar/Tools.hxx index 3aff9ea7a022..c6b790975ad8 100644 --- a/include/sfx2/sidebar/Tools.hxx +++ b/include/sfx2/sidebar/Tools.hxx @@ -54,7 +54,7 @@ public: const css::util::URL& rURL); static ::rtl::OUString GetModuleName ( - const css::uno::Reference<css::frame::XFrame>& rxFrame); + const css::uno::Reference<css::frame::XController>& rxFrame); }; |