diff options
| author | Stefan Weiberg <stefan.weiberg@germandev.org> | 2014-09-05 11:12:25 +0000 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-09-06 15:55:08 -0500 |
| commit | 9c6e517a77d4453d6c653df98e82c0db8da33d81 (patch) | |
| tree | 4b802f3114fa7f197263921c62111152972771b5 /include | |
| parent | 35354e6ceffc580ef2d9d817e5bbbe1417b63250 (diff) | |
Related fdo#82088: dropping aliases again :)
Change-Id: I41f6472423b60e3699ed6158cc5eccb10de1538d
Reviewed-on: https://gerrit.libreoffice.org/11295
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/sidebar/ContextChangeEventMultiplexer.hxx | 5 | ||||
| -rw-r--r-- | include/svx/sidebar/SelectionChangeHandler.hxx | 12 |
2 files changed, 7 insertions, 10 deletions
diff --git a/include/svx/sidebar/ContextChangeEventMultiplexer.hxx b/include/svx/sidebar/ContextChangeEventMultiplexer.hxx index a9a4adee25a2..13294c723ef6 100644 --- a/include/svx/sidebar/ContextChangeEventMultiplexer.hxx +++ b/include/svx/sidebar/ContextChangeEventMultiplexer.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XFrame.hpp> -namespace cssu = ::com::sun::star::uno; class SfxViewShell; @@ -41,7 +40,7 @@ public: The activated context. */ static void NotifyContextChange ( - const cssu::Reference<css::frame::XController>& rxController, + const css::uno::Reference<css::frame::XController>& rxController, const ::sfx2::sidebar::EnumContext::Context eContext); /** Notify the activation of a context. @@ -58,7 +57,7 @@ public: private: static ::rtl::OUString GetModuleName ( - const cssu::Reference<css::frame::XFrame>& rxFrame); + const css::uno::Reference<css::frame::XFrame>& rxFrame); }; #endif diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx index 7b81b5b5c45d..0b9ed762b933 100644 --- a/include/svx/sidebar/SelectionChangeHandler.hxx +++ b/include/svx/sidebar/SelectionChangeHandler.hxx @@ -31,8 +31,6 @@ #include <boost/noncopyable.hpp> #include <boost/function.hpp> -namespace cssu = ::com::sun::star::uno; - class SdrMarkView; @@ -54,25 +52,25 @@ class SVX_DLLPUBLIC SelectionChangeHandler public: SelectionChangeHandler ( const boost::function<rtl::OUString(void)>& rSelectionChangeCallback, - const cssu::Reference<css::frame::XController>& rxController, + const css::uno::Reference<css::frame::XController>& rxController, const sfx2::sidebar::EnumContext::Context eDefaultContext); virtual ~SelectionChangeHandler (void); virtual void SAL_CALL selectionChanged (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing (void) - throw (cssu::RuntimeException) SAL_OVERRIDE; + throw (css::uno::RuntimeException) SAL_OVERRIDE; void Connect (void); void Disconnect (void); private: const boost::function<rtl::OUString(void)> maSelectionChangeCallback; - cssu::Reference<css::frame::XController> mxController; + css::uno::Reference<css::frame::XController> mxController; const sfx2::sidebar::EnumContext::Context meDefaultContext; bool mbIsConnected; }; |