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 /sd | |
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 'sd')
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/animations/SlideTransitionPane.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/animations/SlideTransitionPane.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/createcustomanimationpanel.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/createslidetransitionpanel.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/sidebar/MasterPagesSelector.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/sidebar/PanelFactory.cxx | 4 |
9 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 31589bc9e49c..4e4fc858ce5b 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -147,7 +147,7 @@ void fillRepeatComboBox( ListBox* pBox ) } CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBase, - const cssu::Reference<css::frame::XFrame>& rxFrame, + const css::uno::Reference<css::frame::XFrame>& rxFrame, const Size& rMinSize ) : PanelLayout( pParent, "CustomAnimationsPanel", "modules/simpress/ui/customanimationspanel.ui", rxFrame ), mrBase( rBase ), @@ -2256,7 +2256,7 @@ void CustomAnimationPane::updatePathFromMotionPathTag( const rtl::Reference< Mot } } -::Window * createCustomAnimationPanel( ::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame ) +::Window * createCustomAnimationPanel( ::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) { ::Window* pWindow = 0; diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index e9fbbc10cfa2..c8917a9e9838 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -62,7 +62,7 @@ class CustomAnimationPane : public PanelLayout, public ICustomAnimationListContr { friend class MotionPathTag; public: - CustomAnimationPane( ::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame, const Size& rMinSize ); + CustomAnimationPane( ::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame, const Size& rMinSize ); virtual ~CustomAnimationPane(); // callbacks diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 4a9312461a29..36622c71ed48 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -414,7 +414,7 @@ SlideTransitionPane::SlideTransitionPane( ViewShellBase & rBase, const Size& rMinSize, SdDrawDocument* pDoc, - const cssu::Reference<css::frame::XFrame>& rxFrame ) : + const css::uno::Reference<css::frame::XFrame>& rxFrame ) : PanelLayout( pParent, "SlideTransitionsPanel", "modules/simpress/ui/slidetransitionspanel.ui", rxFrame ), mrBase( rBase ), @@ -1069,7 +1069,7 @@ IMPL_LINK_NOARG(SlideTransitionPane, LateInitCallback) return 0; } -::Window * createSlideTransitionPanel( ::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame ) +::Window * createSlideTransitionPanel( ::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) { ::Window* pWindow = 0; diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx index 545f4e527063..13ca6cd2aa15 100644 --- a/sd/source/ui/animations/SlideTransitionPane.hxx +++ b/sd/source/ui/animations/SlideTransitionPane.hxx @@ -56,7 +56,7 @@ public: ViewShellBase & rBase, const Size& rMinSize, SdDrawDocument* pDoc, - const cssu::Reference<css::frame::XFrame>& rxFrame ); + const css::uno::Reference<css::frame::XFrame>& rxFrame ); virtual ~SlideTransitionPane(); // Window diff --git a/sd/source/ui/inc/createcustomanimationpanel.hxx b/sd/source/ui/inc/createcustomanimationpanel.hxx index 6cf1e6a9fd0a..a9f1a63dddd3 100644 --- a/sd/source/ui/inc/createcustomanimationpanel.hxx +++ b/sd/source/ui/inc/createcustomanimationpanel.hxx @@ -24,7 +24,7 @@ namespace sd { -::Window * createCustomAnimationPanel (::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame); +::Window * createCustomAnimationPanel (::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); } diff --git a/sd/source/ui/inc/createslidetransitionpanel.hxx b/sd/source/ui/inc/createslidetransitionpanel.hxx index db9c60715f5f..b74a3fadd98e 100644 --- a/sd/source/ui/inc/createslidetransitionpanel.hxx +++ b/sd/source/ui/inc/createslidetransitionpanel.hxx @@ -24,7 +24,7 @@ namespace sd { -::Window* createSlideTransitionPanel (::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame); +::Window* createSlideTransitionPanel (::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); } diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index a6fa641cbd0f..832e31592f47 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -123,7 +123,7 @@ static const snewfoil_value_info standard[] = LayoutMenu::LayoutMenu ( ::Window* pParent, ViewShellBase& rViewShellBase, - const cssu::Reference<css::ui::XSidebar>& rxSidebar) + const css::uno::Reference<css::ui::XSidebar>& rxSidebar) : ValueSet (pParent, WB_ITEMBORDER), DragSourceHelper(this), DropTargetHelper(this), diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index dbff168eca62..a9602906c702 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -65,7 +65,7 @@ MasterPagesSelector::MasterPagesSelector ( SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, - const cssu::Reference<css::ui::XSidebar>& rxSidebar) + const css::uno::Reference<css::ui::XSidebar>& rxSidebar) : PreviewValueSet(pParent), maMutex(), mpContainer(rpContainer), diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx index 678efe441e11..8d38c4c7b455 100644 --- a/sd/source/ui/sidebar/PanelFactory.cxx +++ b/sd/source/ui/sidebar/PanelFactory.cxx @@ -38,7 +38,7 @@ #include <toolkit/helper/vclunohelper.hxx> using namespace css; -using namespace cssu; +using namespace css::uno; using namespace ::sd::framework; using ::rtl::OUString; @@ -105,7 +105,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( throw( css::container::NoSuchElementException, css::lang::IllegalArgumentException, - cssu::RuntimeException, std::exception) + css::uno::RuntimeException, std::exception) { // Process arguments. const ::comphelper::NamedValueCollection aArguments (rArguments); |