diff options
author | Stefan Weiberg <stefan.weiberg@germandev.org> | 2014-09-02 17:38:00 +0000 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2014-09-03 02:03:34 -0500 |
commit | 9fba10b5a5f1e56dde0cdc4859622fb40db1c13a (patch) | |
tree | ab5ec25b9ac4dd28b931af9677f6a3c7f72bc6d8 /sw/source/uibase/sidebar | |
parent | 81300228a4af0ad3988f5bfe670fd8c38ea07bf4 (diff) |
Related fdo#82088: removing another bunch of alias
Change-Id: I6e2ab6d20723803aedb530b4d25aa79ec0edbb8f
Reviewed-on: https://gerrit.libreoffice.org/11260
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sw/source/uibase/sidebar')
-rw-r--r-- | sw/source/uibase/sidebar/PagePropertyPanel.cxx | 12 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PagePropertyPanel.hxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/SwPanelFactory.cxx | 8 |
3 files changed, 11 insertions, 12 deletions
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx index 4ccf76517c6a..f065af29f433 100644 --- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx +++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx @@ -60,24 +60,24 @@ const char UNO_SIZE[] = ".uno:Size"; const char UNO_COLUMN[] = ".uno:Column"; namespace { - const cssu::Reference< css::document::XUndoManager > getUndoManager( const cssu::Reference< css::frame::XFrame >& rxFrame ) + const css::uno::Reference< css::document::XUndoManager > getUndoManager( const css::uno::Reference< css::frame::XFrame >& rxFrame ) { - const cssu::Reference< css::frame::XController >& xController = rxFrame->getController(); + const css::uno::Reference< css::frame::XController >& xController = rxFrame->getController(); if ( xController.is() ) { - const cssu::Reference< css::frame::XModel >& xModel = xController->getModel(); + const css::uno::Reference< css::frame::XModel >& xModel = xController->getModel(); if ( xModel.is() ) { - const cssu::Reference< css::document::XUndoManagerSupplier > xSuppUndo( xModel, cssu::UNO_QUERY_THROW ); + const css::uno::Reference< css::document::XUndoManagerSupplier > xSuppUndo( xModel, css::uno::UNO_QUERY_THROW ); if ( xSuppUndo.is() ) { - const cssu::Reference< css::document::XUndoManager > xUndoManager( xSuppUndo->getUndoManager(), cssu::UNO_QUERY_THROW ); + const css::uno::Reference< css::document::XUndoManager > xUndoManager( xSuppUndo->getUndoManager(), css::uno::UNO_QUERY_THROW ); return xUndoManager; } } } - return cssu::Reference< css::document::XUndoManager > (); + return css::uno::Reference< css::document::XUndoManager > (); } } diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx index 4dc697b3f62a..876f13e344e3 100644 --- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx +++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx @@ -47,7 +47,6 @@ namespace svx { namespace sidebar { #include <boost/scoped_ptr.hpp> -namespace cssu = ::com::sun::star::uno; namespace sw { namespace sidebar { @@ -195,7 +194,7 @@ namespace sw { namespace sidebar { ::svx::sidebar::Popup maSizePopup; ::svx::sidebar::Popup maColumnPopup; - const cssu::Reference< css::document::XUndoManager > mxUndoManager; + const css::uno::Reference< css::document::XUndoManager > mxUndoManager; bool mbInvalidateSIDAttrPageOnSIDAttrPageSizeNotify; diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx index 94a6eba06d32..ea2491fff572 100644 --- a/sw/source/uibase/sidebar/SwPanelFactory.cxx +++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx @@ -54,13 +54,13 @@ public: virtual ~SwPanelFactory(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; }; SwPanelFactory::SwPanelFactory (void) @@ -74,7 +74,7 @@ SwPanelFactory::~SwPanelFactory (void) Reference<ui::XUIElement> SAL_CALL SwPanelFactory::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, |