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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/sidebar/ContextChangeEventMultiplexer.cxx | 8 | ||||
| -rw-r--r-- | svx/source/sidebar/PanelFactory.cxx | 11 | ||||
| -rw-r--r-- | svx/source/sidebar/SelectionChangeHandler.cxx | 2 |
3 files changed, 10 insertions, 11 deletions
diff --git a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx index 58a5dc5fefbb..58eb5e49049a 100644 --- a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx +++ b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx @@ -28,11 +28,11 @@ #include <tools/diagnose_ex.h> using namespace css; -using namespace cssu; +using namespace css::uno; void ContextChangeEventMultiplexer::NotifyContextChange ( - const cssu::Reference<css::frame::XController>& rxController, + const css::uno::Reference<css::frame::XController>& rxController, const ::sfx2::sidebar::EnumContext::Context eContext) { if (rxController.is() && rxController->getFrame().is()) @@ -42,7 +42,7 @@ void ContextChangeEventMultiplexer::NotifyContextChange ( GetModuleName(rxController->getFrame()), ::sfx2::sidebar::EnumContext::GetContextName(eContext)); - cssu::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer ( + css::uno::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer ( css::ui::ContextChangeEventMultiplexer::get( ::comphelper::getProcessComponentContext())); if (xMultiplexer.is()) @@ -65,7 +65,7 @@ void ContextChangeEventMultiplexer::NotifyContextChange ( ::rtl::OUString ContextChangeEventMultiplexer::GetModuleName ( - const cssu::Reference<css::frame::XFrame>& rxFrame) + const css::uno::Reference<css::frame::XFrame>& rxFrame) { try { diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index 3f6cb355b319..cf45ff59f777 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -45,9 +45,8 @@ #include <boost/bind.hpp> #include <boost/noncopyable.hpp> -namespace cssu = ::com::sun::star::uno; using namespace css; -using namespace cssu; +using namespace css::uno; using namespace svx::sidebar; @@ -71,13 +70,13 @@ public: virtual ~PanelFactory (void); // XUIElementFactory - cssu::Reference<css::ui::XUIElement> SAL_CALL createUIElement ( + css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement ( const ::rtl::OUString& rsResourceURL, - const ::cssu::Sequence<css::beans::PropertyValue>& rArguments) + const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) throw( css::container::NoSuchElementException, css::lang::IllegalArgumentException, - cssu::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; PanelFactory::PanelFactory (void) @@ -97,7 +96,7 @@ PanelFactory::~PanelFactory (void) Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( const ::rtl::OUString& rsResourceURL, - const ::cssu::Sequence<css::beans::PropertyValue>& rArguments) + const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) throw( container::NoSuchElementException, lang::IllegalArgumentException, diff --git a/svx/source/sidebar/SelectionChangeHandler.cxx b/svx/source/sidebar/SelectionChangeHandler.cxx index c6ee295afe51..bf62a1dc2314 100644 --- a/svx/source/sidebar/SelectionChangeHandler.cxx +++ b/svx/source/sidebar/SelectionChangeHandler.cxx @@ -26,7 +26,7 @@ using namespace css; -using namespace cssu; +using namespace css::uno; using namespace sfx2::sidebar; |