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>

20 files changed, 77 insertions, 85 deletions

diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx
index d90332759ea8..af9a47f03ce1 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.hxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.hxx
@@ -59,17 +59,17 @@ public:
     //----- XPane -------------------------------------------------------------
 
     virtual sal_Bool SAL_CALL isVisible (void)
-        throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL setVisible (sal_Bool bIsVisible)
-        throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual cssu::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible (void)
-        throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible (void)
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL setAccessible (
-        const cssu::Reference<css::accessibility::XAccessible>& rxAccessible)
-        throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+        const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible)
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     DECL_LINK(WindowEventHandler, VclWindowEvent*);
 
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 1340814d0ae9..539f07f99ca5 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -161,19 +161,19 @@ namespace {
     class FrameworkHelperAllPassFilter
     {
     public:
-        bool operator() (const cssdf::ConfigurationChangeEvent&) { return true; }
+        bool operator() (const css::drawing::framework::ConfigurationChangeEvent&) { return true; }
     };
 
     class FrameworkHelperResourceIdFilter
     {
     public:
         FrameworkHelperResourceIdFilter (
-            const cssu::Reference<cssdf::XResourceId>& rxResourceId);
-        bool operator() (const cssdf::ConfigurationChangeEvent& rEvent)
+            const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId);
+        bool operator() (const css::drawing::framework::ConfigurationChangeEvent& rEvent)
         { return mxResourceId.is() && rEvent.ResourceId.is()
                 && mxResourceId->compareTo(rEvent.ResourceId) == 0; }
     private:
-        cssu::Reference<cssdf::XResourceId> mxResourceId;
+        css::uno::Reference<css::drawing::framework::XResourceId> mxResourceId;
     };
 
 } // end of anonymous namespace
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index 18495a90212c..a5d29a28b939 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -39,8 +39,6 @@ class ViewShell;
 class ViewShellBase;
 }
 
-namespace cssu = ::com::sun::star::uno;
-namespace cssdf = ::com::sun::star::drawing::framework;
 
 namespace sd { namespace framework {
 
@@ -112,7 +110,7 @@ public:
     static ::boost::shared_ptr<FrameworkHelper> Instance (ViewShellBase& rBase);
 
     static ::boost::shared_ptr<FrameworkHelper> Instance (
-        const cssu::Reference<css::frame::XController>& rxController);
+        const css::uno::Reference<css::frame::XController>& rxController);
 
     /** Mark the FrameworkHelper object for the given ViewShellBase as
         disposed.  A following ReleaseInstance() call will destroy the
@@ -149,15 +147,15 @@ public:
             reference then an empty pointer is returned.
     */
     static ::boost::shared_ptr<ViewShell> GetViewShell (
-        const cssu::Reference<cssdf::XView>& rxView);
+        const css::uno::Reference<css::drawing::framework::XView>& rxView);
 
-    typedef ::boost::function<bool(const cssdf::ConfigurationChangeEvent&)>
+    typedef ::boost::function<bool(const css::drawing::framework::ConfigurationChangeEvent&)>
         ConfigurationChangeEventFilter;
     typedef ::boost::function<void(bool bEventSeen)> Callback;
     typedef ::boost::function<
         void(
-            const cssu::Reference<
-                cssdf::XResourceId>&)
+            const css::uno::Reference<
+                css::drawing::framework::XResourceId>&)
         > ResourceFunctor;
 
     /** Test whether the called FrameworkHelper object is valid.
@@ -190,8 +188,8 @@ public:
             of the involved objects does not support XTunnel (where
             necessary).
     */
-    cssu::Reference<cssdf::XView> GetView (
-        const cssu::Reference<cssdf::XResourceId>& rxPaneOrViewId);
+    css::uno::Reference<css::drawing::framework::XView> GetView (
+        const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneOrViewId);
 
     /** Request the specified view to be displayed in the specified pane.
         When the pane is not visible its creation is also requested.  The
@@ -205,7 +203,7 @@ public:
             the caller can, for example, call RunOnResourceActivation() to
             do some initialization after the requested view becomes active.
     */
-    cssu::Reference<cssdf::XResourceId> RequestView (
+    css::uno::Reference<css::drawing::framework::XResourceId> RequestView (
         const OUString& rsResourceURL,
         const OUString& rsAnchorURL);
 
@@ -237,7 +235,7 @@ public:
 
     */
     void RunOnResourceActivation(
-        const cssu::Reference<cssdf::XResourceId>& rxResourceId,
+        const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId,
         const Callback& rCallback);
 
     /** Normally the requested changes of the configuration are executed
@@ -273,35 +271,35 @@ public:
     /** Return a string representation of the given XResourceId object.
     */
     static OUString ResourceIdToString (
-        const cssu::Reference<
-            cssdf::XResourceId>& rxResourceId);
+        const css::uno::Reference<
+            css::drawing::framework::XResourceId>& rxResourceId);
 
     /** Create a new XResourceId object for the given resource URL.
     */
-    static cssu::Reference<
-        cssdf::XResourceId>
+    static css::uno::Reference<
+        css::drawing::framework::XResourceId>
             CreateResourceId (
                 const OUString& rsResourceURL);
 
     /** Create a new XResourceId object for the given resource URL and a
         single anchor URL.
     */
-    static cssu::Reference<
-        cssdf::XResourceId>
+    static css::uno::Reference<
+        css::drawing::framework::XResourceId>
             CreateResourceId (
                 const OUString& rsResourceURL,
                 const OUString& rsAnchorURL);
 
     /** Create a new XResourceId object for the given resource URL.
     */
-    static cssu::Reference<
-        cssdf::XResourceId>
+    static css::uno::Reference<
+        css::drawing::framework::XResourceId>
             CreateResourceId (
                 const OUString& rsResourceURL,
-                const cssu::Reference<
-                    cssdf::XResourceId>& rxAnchor);
+                const css::uno::Reference<
+                    css::drawing::framework::XResourceId>& rxAnchor);
 
-    cssu::Reference<cssdf::XConfigurationController>
+    css::uno::Reference<css::drawing::framework::XConfigurationController>
         GetConfigurationController (void) const { return mxConfigurationController;}
 
 private:
@@ -316,12 +314,12 @@ private:
     static ::boost::scoped_ptr<ViewURLMap> mpViewURLMap;
 
     ViewShellBase& mrBase;
-    cssu::Reference<cssdf::XConfigurationController>
+    css::uno::Reference<css::drawing::framework::XConfigurationController>
         mxConfigurationController;
 
     class DisposeListener;
     friend class DisposeListener;
-    cssu::Reference<css::lang::XComponent>
+    css::uno::Reference<css::lang::XComponent>
         mxDisposeListener;
 
     FrameworkHelper (ViewShellBase& rBase);
diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx
index 2d7a061483ec..7f0f3393fb69 100644
--- a/sd/source/ui/inc/framework/Pane.hxx
+++ b/sd/source/ui/inc/framework/Pane.hxx
@@ -32,7 +32,6 @@
 
 class Window;
 
-namespace cssu = ::com::sun::star::uno;
 
 namespace {
 
@@ -94,28 +93,28 @@ public:
         important method of this class because the view is only interested
         in the window of the pane.
     */
-    virtual cssu::Reference<css::awt::XWindow>
+    virtual css::uno::Reference<css::awt::XWindow>
         SAL_CALL getWindow (void)
-        throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual cssu::Reference<css::rendering::XCanvas>
+    virtual css::uno::Reference<css::rendering::XCanvas>
         SAL_CALL getCanvas (void)
-        throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     //----- XPane2 -------------------------------------------------------------
 
     virtual sal_Bool SAL_CALL isVisible (void)
-        throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL setVisible (sal_Bool bIsVisible)
-        throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual cssu::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible (void)
-        throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible (void)
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL setAccessible (
-        const cssu::Reference<css::accessibility::XAccessible>& rxAccessible)
-        throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+        const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible)
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     //----- XResource ---------------------------------------------------------
 
diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
index 19f825822e3e..9d1d71e3b1b6 100644
--- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
@@ -80,7 +80,7 @@ public:
 MasterPagesSelector* AllMasterPagesSelector::Create (
     ::Window* pParent,
     ViewShellBase& rViewShellBase,
-    const cssu::Reference<css::ui::XSidebar>& rxSidebar)
+    const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
 {
     SdDrawDocument* pDocument = rViewShellBase.GetDocument();
     if (pDocument == NULL)
@@ -106,7 +106,7 @@ AllMasterPagesSelector::AllMasterPagesSelector (
     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)
     : MasterPagesSelector(pParent, rDocument, rBase, rpContainer, rxSidebar),
       mpSortedMasterPages(new SortedMasterPageDescriptorList())
 {
diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
index 56cef88ffdd3..eebc8691fa8a 100644
--- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
@@ -40,7 +40,7 @@ public:
     static MasterPagesSelector* Create (
         ::Window* pParent,
         ViewShellBase& rViewShellBase,
-        const cssu::Reference<css::ui::XSidebar>& rxSidebar);
+        const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
 
     /** Scan the set of templates for the ones whose first master pages are
         shown by this control and store them in the MasterPageContainer.
@@ -63,7 +63,7 @@ private:
         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);
     virtual ~AllMasterPagesSelector (void);
 
     void AddTemplate (const TemplateEntry& rEntry);
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index 1b5807150e41..4525bc8c16cb 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -45,7 +45,7 @@ namespace sd { namespace sidebar {
 MasterPagesSelector* CurrentMasterPagesSelector::Create (
     ::Window* pParent,
     ViewShellBase& rViewShellBase,
-    const cssu::Reference<css::ui::XSidebar>& rxSidebar)
+    const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
 {
     SdDrawDocument* pDocument = rViewShellBase.GetDocument();
     if (pDocument == NULL)
@@ -71,7 +71,7 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector (
     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)
     : MasterPagesSelector (pParent, rDocument, rBase, rpContainer, rxSidebar)
 {
     // For this master page selector only we change the default action for
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
index d233980ab0a6..2a11328a88e6 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
@@ -23,7 +23,6 @@
 #include "MasterPagesSelector.hxx"
 #include <com/sun/star/lang/XComponent.hpp>
 
-namespace cssu = ::com::sun::star::uno;
 
 namespace sd { namespace tools { class EventMultiplexerEvent; } }
 
@@ -39,7 +38,7 @@ public:
     static MasterPagesSelector* Create (
         ::Window* pParent,
         ViewShellBase& rViewShellBase,
-        const cssu::Reference<css::ui::XSidebar>& rxSidebar);
+        const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
 
     /** Set the selection so that the master page is selected that is
         used by the currently selected page of the document in the
@@ -60,14 +59,14 @@ protected:
     virtual void ExecuteCommand (const sal_Int32 nCommandId) SAL_OVERRIDE;
 
 private:
-    cssu::Reference<css::lang::XComponent> mxListener;
+    css::uno::Reference<css::lang::XComponent> mxListener;
 
     CurrentMasterPagesSelector (
         ::Window* pParent,
         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);
     virtual ~CurrentMasterPagesSelector (void);
 
     virtual void LateInit (void) SAL_OVERRIDE;
diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.cxx b/sd/source/ui/sidebar/CustomAnimationPanel.cxx
index c0ed23cc4bcf..d0bd23a5fcbe 100644
--- a/sd/source/ui/sidebar/CustomAnimationPanel.cxx
+++ b/sd/source/ui/sidebar/CustomAnimationPanel.cxx
@@ -27,7 +27,7 @@ namespace sd { namespace sidebar {
 CustomAnimationPanel::CustomAnimationPanel (
     ::Window* pParentWindow,
     ViewShellBase& rViewShellBase,
-    const cssu::Reference<css::frame::XFrame>& rxFrame
+    const css::uno::Reference<css::frame::XFrame>& rxFrame
     )
     : PanelBase(
         pParentWindow,
diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.hxx b/sd/source/ui/sidebar/CustomAnimationPanel.hxx
index be03b8da401d..cb391919564c 100644
--- a/sd/source/ui/sidebar/CustomAnimationPanel.hxx
+++ b/sd/source/ui/sidebar/CustomAnimationPanel.hxx
@@ -31,7 +31,7 @@ public:
     CustomAnimationPanel (
         ::Window* pParentWindow,
         ViewShellBase& rViewShellBase,
-        const cssu::Reference<css::frame::XFrame>& rxFrame);
+        const css::uno::Reference<css::frame::XFrame>& rxFrame);
     virtual ~CustomAnimationPanel (void);
 
     // ILayoutableWindow
@@ -43,7 +43,7 @@ protected:
         ViewShellBase& rViewShellBase) SAL_OVERRIDE;
 
 private:
-    cssu::Reference<css::frame::XFrame>     mxFrame;
+    css::uno::Reference<css::frame::XFrame>     mxFrame;
 };
 
 } } // end of namespace sd::sidebar
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx
index d6b61a26b098..2e65d19f938e 100644
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@ -38,7 +38,6 @@
 
 class SfxModule;
 
-namespace cssu = ::com::sun::star::uno;
 
 namespace sd {
 class DrawDocShell;
@@ -72,7 +71,7 @@ public:
     LayoutMenu (
         ::Window* pParent,
         ViewShellBase& rViewShellBase,
-        const cssu::Reference<css::ui::XSidebar>& rxSidebar);
+        const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
     virtual ~LayoutMenu (void);
 
     virtual void Dispose (void);
@@ -130,10 +129,10 @@ private:
         many columns for the calculation.
     */
     const int mnPreferredColumnCount;
-    cssu::Reference<css::frame::XStatusListener> mxListener;
+    css::uno::Reference<css::frame::XStatusListener> mxListener;
     bool mbSelectionUpdatePending;
     bool mbIsMainViewChangePending;
-    cssu::Reference<css::ui::XSidebar> mxSidebar;
+    css::uno::Reference<css::ui::XSidebar> mxSidebar;
     bool mbIsDisposed;
 
     /** Calculate the number of displayed rows.  This depends on the given
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index 04380bc070e5..e299b12eae8c 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -35,7 +35,6 @@
 
 #include <queue>
 
-namespace cssu = ::com::sun::star::uno;
 
 class MouseEvent;
 class SdDrawDocument;
@@ -62,7 +61,7 @@ public:
         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);
     virtual ~MasterPagesSelector (void);
 
     virtual void LateInit (void);
@@ -205,7 +204,7 @@ protected:
     virtual void ExecuteCommand (const sal_Int32 nCommandId);
 
 private:
-    cssu::Reference<css::ui::XSidebar> mxSidebar;
+    css::uno::Reference<css::ui::XSidebar> mxSidebar;
 
     /** The offset between ValueSet index and MasterPageContainer::Token
         last seen.  This value is used heuristically to speed up the lookup
diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx
index e1e368e31470..270705054c93 100644
--- a/sd/source/ui/sidebar/PanelBase.cxx
+++ b/sd/source/ui/sidebar/PanelBase.cxx
@@ -77,7 +77,7 @@ void PanelBase::Resize (void)
         return NULL;
 }
 
-void PanelBase::SetSidebar (const cssu::Reference<css::ui::XSidebar>& rxSidebar)
+void PanelBase::SetSidebar (const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
 {
     mxSidebar = rxSidebar;
     if (mxSidebar.is() && mpWrappedControl!=0)
diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx
index b41f58110eab..f2e54b0f1aae 100644
--- a/sd/source/ui/sidebar/PanelBase.hxx
+++ b/sd/source/ui/sidebar/PanelBase.hxx
@@ -27,7 +27,6 @@
 
 #include <boost/scoped_ptr.hpp>
 
-namespace cssu = ::com::sun::star::uno;
 
 namespace sd {
     class ViewShellBase;
@@ -56,7 +55,7 @@ public:
     virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE;
 
     // ISidebarReceiver
-    virtual void SetSidebar (const cssu::Reference<css::ui::XSidebar>& rxSidebar) SAL_OVERRIDE;
+    virtual void SetSidebar (const css::uno::Reference<css::ui::XSidebar>& rxSidebar) SAL_OVERRIDE;
 
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible > CreateAccessibleObject (
@@ -70,7 +69,7 @@ protected:
         ViewShellBase& rViewShellBase) = 0;
 
 private:
-    cssu::Reference<css::ui::XSidebar> mxSidebar;
+    css::uno::Reference<css::ui::XSidebar> mxSidebar;
     ViewShellBase& mrViewShellBase;
 
     bool ProvideWrappedControl (void);
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx
index 8d38c4c7b455..a64b986ffbba 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -101,7 +101,7 @@ void SAL_CALL PanelFactory::disposing (void)
 
 Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
     const ::rtl::OUString& rsUIElementResourceURL,
-    const ::cssu::Sequence<css::beans::PropertyValue>& rArguments)
+    const css::uno::Sequence<css::beans::PropertyValue>& rArguments)
     throw(
         css::container::NoSuchElementException,
         css::lang::IllegalArgumentException,
diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx
index ae4f307b81b4..8365a49764f9 100644
--- a/sd/source/ui/sidebar/PanelFactory.hxx
+++ b/sd/source/ui/sidebar/PanelFactory.hxx
@@ -32,7 +32,6 @@
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 
-namespace cssu = ::com::sun::star::uno;
 
 namespace sd {
     class ViewShellBase;
@@ -54,24 +53,24 @@ class PanelFactory
 {
 public:
     static ::rtl::OUString SAL_CALL getImplementationName (void);
-    static cssu::Reference<cssu::XInterface> SAL_CALL createInstance (
-        const cssu::Reference<css::lang::XMultiServiceFactory>& rxFactory);
-    static cssu::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames (void);
+    static css::uno::Reference<css::uno::XInterface> SAL_CALL createInstance (
+        const css::uno::Reference<css::lang::XMultiServiceFactory>& rxFactory);
+    static css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames (void);
 
-    PanelFactory (const cssu::Reference<cssu::XComponentContext>& rxContext);
+    PanelFactory (const css::uno::Reference<css::uno::XComponentContext>& rxContext);
     virtual ~PanelFactory (void);
 
     virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
 
     // 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;
 };
 
 } } // end of namespace sd::sidebar
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
index 0ebcff4c640e..2705e2b31392 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
@@ -35,7 +35,7 @@ namespace sd { namespace sidebar {
 MasterPagesSelector* RecentMasterPagesSelector::Create (
     ::Window* pParent,
     ViewShellBase& rViewShellBase,
-    const cssu::Reference<css::ui::XSidebar>& rxSidebar)
+    const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
 {
     SdDrawDocument* pDocument = rViewShellBase.GetDocument();
     if (pDocument == NULL)
@@ -61,7 +61,7 @@ RecentMasterPagesSelector::RecentMasterPagesSelector (
     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)
     : MasterPagesSelector (pParent, rDocument, rBase, rpContainer, rxSidebar)
 {
 }
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
index 931663966f1d..f5bacc780c53 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
@@ -33,7 +33,7 @@ public:
     static MasterPagesSelector* Create (
         ::Window* pParent,
         ViewShellBase& rViewShellBase,
-        const cssu::Reference<css::ui::XSidebar>& rxSidebar);
+        const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
 
 protected:
     DECL_LINK(MasterPageListListener, void*);
@@ -63,7 +63,7 @@ private:
         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);
     virtual ~RecentMasterPagesSelector (void);
 
     virtual void LateInit (void) SAL_OVERRIDE;
diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.cxx b/sd/source/ui/sidebar/SlideTransitionPanel.cxx
index 04d47524f862..cc9a5776cafc 100644
--- a/sd/source/ui/sidebar/SlideTransitionPanel.cxx
+++ b/sd/source/ui/sidebar/SlideTransitionPanel.cxx
@@ -27,7 +27,7 @@ namespace sd { namespace sidebar {
 SlideTransitionPanel::SlideTransitionPanel (
     ::Window* pParentWindow,
     ViewShellBase& rViewShellBase,
-    const cssu::Reference<css::frame::XFrame>& rxFrame
+    const css::uno::Reference<css::frame::XFrame>& rxFrame
     )
     : PanelBase(pParentWindow, rViewShellBase),
       mxFrame( rxFrame )
diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.hxx b/sd/source/ui/sidebar/SlideTransitionPanel.hxx
index 251976ba7c63..74ef56a4d9a9 100644
--- a/sd/source/ui/sidebar/SlideTransitionPanel.hxx
+++ b/sd/source/ui/sidebar/SlideTransitionPanel.hxx
@@ -31,7 +31,7 @@ public:
     SlideTransitionPanel (
         ::Window* pParentWindow,
         ViewShellBase& rViewShellBase,
-        const cssu::Reference<css::frame::XFrame>& rxFrame );
+        const css::uno::Reference<css::frame::XFrame>& rxFrame );
     virtual ~SlideTransitionPanel (void);
 
     // ILayoutableWindow
@@ -43,7 +43,7 @@ protected:
         ViewShellBase& rViewShellBase) SAL_OVERRIDE;
 
 private:
-    cssu::Reference<css::frame::XFrame> mxFrame;
+    css::uno::Reference<css::frame::XFrame> mxFrame;
 };
 
 } } // end of namespace sd::sidebar