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>

7 files changed, 69 insertions, 79 deletions

diff --git a/include/sfx2/sidebar/CommandInfoProvider.hxx b/include/sfx2/sidebar/CommandInfoProvider.hxx
index bd95ce165aa1..6eb1ba6c3638 100644
--- a/include/sfx2/sidebar/CommandInfoProvider.hxx
+++ b/include/sfx2/sidebar/CommandInfoProvider.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
 
-namespace cssu = ::com::sun::star::uno;
 
 namespace sfx2 { namespace sidebar {
 
@@ -57,34 +56,34 @@ public:
     */
     ::rtl::OUString GetLabelForCommand (
         const ::rtl::OUString& rsCommandName,
-        const cssu::Reference<css::frame::XFrame>& rxFrame);
+        const css::uno::Reference<css::frame::XFrame>& rxFrame);
 
     /** Do not call.  Should be part of a local and hidden interface.
     */
-    void SetFrame (const cssu::Reference<css::frame::XFrame>& rxFrame);
+    void SetFrame (const css::uno::Reference<css::frame::XFrame>& rxFrame);
 
   private:
-    cssu::Reference<css::uno::XComponentContext> mxContext;
-    cssu::Reference<css::frame::XFrame> mxCachedDataFrame;
-    cssu::Reference<css::ui::XAcceleratorConfiguration> mxCachedDocumentAcceleratorConfiguration;
-    cssu::Reference<css::ui::XAcceleratorConfiguration> mxCachedModuleAcceleratorConfiguration;
-    cssu::Reference<css::ui::XAcceleratorConfiguration> mxCachedGlobalAcceleratorConfiguration;
+    css::uno::Reference<css::uno::XComponentContext> mxContext;
+    css::uno::Reference<css::frame::XFrame> mxCachedDataFrame;
+    css::uno::Reference<css::ui::XAcceleratorConfiguration> mxCachedDocumentAcceleratorConfiguration;
+    css::uno::Reference<css::ui::XAcceleratorConfiguration> mxCachedModuleAcceleratorConfiguration;
+    css::uno::Reference<css::ui::XAcceleratorConfiguration> mxCachedGlobalAcceleratorConfiguration;
     ::rtl::OUString msCachedModuleIdentifier;
-    cssu::Reference<css::lang::XComponent> mxFrameListener;
+    css::uno::Reference<css::lang::XComponent> mxFrameListener;
 
     CommandInfoProvider (void);
     ~CommandInfoProvider (void);
 
-    cssu::Reference<css::ui::XAcceleratorConfiguration> GetDocumentAcceleratorConfiguration (void);
-    cssu::Reference<css::ui::XAcceleratorConfiguration> GetModuleAcceleratorConfiguration (void);
-    cssu::Reference<css::ui::XAcceleratorConfiguration> GetGlobalAcceleratorConfiguration(void);
+    css::uno::Reference<css::ui::XAcceleratorConfiguration> GetDocumentAcceleratorConfiguration (void);
+    css::uno::Reference<css::ui::XAcceleratorConfiguration> GetModuleAcceleratorConfiguration (void);
+    css::uno::Reference<css::ui::XAcceleratorConfiguration> GetGlobalAcceleratorConfiguration(void);
     ::rtl::OUString GetModuleIdentifier (void);
     ::rtl::OUString GetCommandShortcut (const ::rtl::OUString& rCommandName);
-    cssu::Sequence<css::beans::PropertyValue> GetCommandProperties (
+    css::uno::Sequence<css::beans::PropertyValue> GetCommandProperties (
         const ::rtl::OUString& rsCommandName);
     ::rtl::OUString GetCommandLabel (const ::rtl::OUString& rsCommandName);
     rtl::OUString RetrieveShortcutsFromConfiguration(
-        const cssu::Reference<css::ui::XAcceleratorConfiguration>& rxConfiguration,
+        const css::uno::Reference<css::ui::XAcceleratorConfiguration>& rxConfiguration,
         const rtl::OUString& rsCommandName);
 };
 
diff --git a/include/sfx2/sidebar/ControllerFactory.hxx b/include/sfx2/sidebar/ControllerFactory.hxx
index 16ba115cad04..985ee9b5756d 100644
--- a/include/sfx2/sidebar/ControllerFactory.hxx
+++ b/include/sfx2/sidebar/ControllerFactory.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XToolbarController.hpp>
 
-namespace cssu = ::com::sun::star::uno;
 
 class ToolBox;
 
@@ -35,19 +34,19 @@ namespace sfx2 { namespace sidebar {
 class SFX2_DLLPUBLIC ControllerFactory
 {
 public:
-    static cssu::Reference<css::frame::XToolbarController> CreateToolBoxController(
+    static css::uno::Reference<css::frame::XToolbarController> CreateToolBoxController(
         ToolBox* pToolBox,
         const sal_uInt16 nItemId,
         const ::rtl::OUString& rsCommandName,
-        const cssu::Reference<css::frame::XFrame>& rxFrame,
-        const cssu::Reference<css::awt::XWindow>& rxParentWindow,
+        const css::uno::Reference<css::frame::XFrame>& rxFrame,
+        const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
         const sal_Int32 nItemWidth);
 
 private:
-    static cssu::Reference<css::frame::XToolbarController> CreateToolBarController(
+    static css::uno::Reference<css::frame::XToolbarController> CreateToolBarController(
         ToolBox* pToolBox,
         const ::rtl::OUString& rsCommandName,
-        const cssu::Reference<css::frame::XFrame>& rxFrame,
+        const css::uno::Reference<css::frame::XFrame>& rxFrame,
         const sal_Int32 nWidth);
 };
 
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
index 40ea6da108b2..4f58acf5452c 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -30,7 +30,6 @@
 
 #include <boost/function.hpp>
 
-namespace cssu = ::com::sun::star::uno;
 
 class SfxViewFrame;
 class ToolBox;
@@ -70,7 +69,7 @@ public:
         SfxBindings &rBindings,
         ItemUpdateReceiverInterface& rItemUpdateReceiver,
         const ::rtl::OUString& rsCommandName,
-        const cssu::Reference<css::frame::XFrame>& rxFrame);
+        const css::uno::Reference<css::frame::XFrame>& rxFrame);
 
     /** This is the simpler constructor variant that still exists for
         compatibility resons.  Note that GetLabel() and GetIcon() will
@@ -129,8 +128,8 @@ protected:
 
 private:
     ItemUpdateReceiverInterface& mrItemUpdateReceiver;
-    cssu::Reference<css::frame::XFrame> mxFrame;
-    cssu::Reference<css::lang::XComponent> mxFrameActionListener;
+    css::uno::Reference<css::frame::XFrame> mxFrame;
+    css::uno::Reference<css::lang::XComponent> mxFrameActionListener;
     const ::rtl::OUString msCommandName;
 
     void SetupCommandURL (const sal_Char* sCommandName);
diff --git a/include/sfx2/sidebar/Sidebar.hxx b/include/sfx2/sidebar/Sidebar.hxx
index 45c47d0b9a38..aea1fcbec4e0 100644
--- a/include/sfx2/sidebar/Sidebar.hxx
+++ b/include/sfx2/sidebar/Sidebar.hxx
@@ -23,8 +23,6 @@
 #include <sfx2/dllapi.h>
 #include <com/sun/star/frame/XFrame.hpp>
 
-namespace cssu = ::com::sun::star::uno;
-
 
 namespace sfx2 { namespace sidebar {
 
@@ -41,7 +39,7 @@ public:
     */
     static void ShowPanel (
         const ::rtl::OUString& rsPanelId,
-        const cssu::Reference<css::frame::XFrame>& rxFrame);
+        const css::uno::Reference<css::frame::XFrame>& rxFrame);
 };
 
 } } // end of namespace sfx2::sidebar
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx
index eded1b333079..537c085280f4 100644
--- a/include/sfx2/sidebar/SidebarPanelBase.hxx
+++ b/include/sfx2/sidebar/SidebarPanelBase.hxx
@@ -34,8 +34,6 @@
 #include <boost/noncopyable.hpp>
 #include <boost/function.hpp>
 
-namespace cssu = ::com::sun::star::uno;
-
 
 class Window;
 
@@ -60,57 +58,57 @@ class SFX2_DLLPUBLIC SidebarPanelBase
       public SidebarPanelBaseInterfaceBase
 {
 public:
-    static cssu::Reference<css::ui::XUIElement> Create (
+    static css::uno::Reference<css::ui::XUIElement> Create (
         const ::rtl::OUString& rsResourceURL,
-        const cssu::Reference<css::frame::XFrame>& rxFrame,
+        const css::uno::Reference<css::frame::XFrame>& rxFrame,
         Window* pControl,
         const css::ui::LayoutSize& rLayoutSize);
 
     // XContextChangeEventListener
     virtual void SAL_CALL notifyContextChangeEvent (
         const css::ui::ContextChangeEventObject& rEvent)
-        throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XEventListener
     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;
 
     // XUIElement
-    virtual cssu::Reference<css::frame::XFrame> SAL_CALL getFrame (void)
-        throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference<css::frame::XFrame> SAL_CALL getFrame (void)
+        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual ::rtl::OUString SAL_CALL getResourceURL (void)
-        throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual sal_Int16 SAL_CALL getType (void)
-        throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual cssu::Reference<cssu::XInterface> SAL_CALL getRealInterface (void)
-        throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getRealInterface (void)
+        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XToolPanel
-    virtual cssu::Reference<css::accessibility::XAccessible> SAL_CALL createAccessible (
-        const cssu::Reference<css::accessibility::XAccessible>& rxParentAccessible)
-        throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual cssu::Reference<css::awt::XWindow> SAL_CALL getWindow (void)
-        throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL createAccessible (
+        const css::uno::Reference<css::accessibility::XAccessible>& rxParentAccessible)
+        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow (void)
+        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XSidebarPanel
     virtual css::ui::LayoutSize SAL_CALL getHeightForWidth (sal_Int32 nWidth)
-        throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual sal_Int32 SAL_CALL getMinimalWidth ()
-        throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 protected:
-    cssu::Reference<css::frame::XFrame> mxFrame;
+    css::uno::Reference<css::frame::XFrame> mxFrame;
 
     SidebarPanelBase (
         const ::rtl::OUString& rsResourceURL,
-        const cssu::Reference<css::frame::XFrame>& rxFrame,
+        const css::uno::Reference<css::frame::XFrame>& rxFrame,
         Window* pWindow,
         const css::ui::LayoutSize& rLayoutSize);
     virtual ~SidebarPanelBase (void);
 
     virtual void SAL_CALL disposing (void)
-        throw (cssu::RuntimeException) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException) SAL_OVERRIDE;
 
 private:
     Window* mpControl;
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx
index aa712c6b4a01..8bcc6be00f82 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/util/URL.hpp>
 #include <map>
 
-namespace cssu = ::com::sun::star::uno;
 
 namespace sfx2 { namespace sidebar {
 
@@ -54,14 +53,14 @@ public:
 
     virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE;
 
-    cssu::Reference<css::frame::XToolbarController> GetControllerForItemId (
+    css::uno::Reference<css::frame::XToolbarController> GetControllerForItemId (
         const sal_uInt16 nItemId) const;
     sal_uInt16 GetItemIdForSubToolbarName (
         const ::rtl::OUString& rsCOmmandName) const;
 
     void SetController (
         const sal_uInt16 nItemId,
-        const cssu::Reference<css::frame::XToolbarController>& rxController,
+        const css::uno::Reference<css::frame::XToolbarController>& rxController,
         const ::rtl::OUString& rsCommandName);
 
 private:
@@ -69,7 +68,7 @@ private:
     class ItemDescriptor
     {
     public:
-        cssu::Reference<css::frame::XToolbarController> mxController;
+        css::uno::Reference<css::frame::XToolbarController> mxController;
         css::util::URL maURL;
         rtl::OUString msCurrentCommand;
     };
@@ -86,7 +85,7 @@ private:
 
     void CreateController (
         const sal_uInt16 nItemId,
-        const cssu::Reference<css::frame::XFrame>& rxFrame,
+        const css::uno::Reference<css::frame::XFrame>& rxFrame,
         const sal_Int32 nItemWidth = 0);
     void RegisterHandlers (void);
 };
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index 8d1a9913dab1..4123a786cdcf 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -37,8 +37,6 @@
 
 class SvBorder;
 
-namespace cssu = ::com::sun::star::uno;
-
 
 namespace sfx2 { namespace sidebar {
 
@@ -159,55 +157,55 @@ public:
 
     virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
 
-    static cssu::Reference<css::beans::XPropertySet> GetPropertySet (void);
+    static css::uno::Reference<css::beans::XPropertySet> GetPropertySet (void);
 
     // beans::XPropertySet
-    virtual cssu::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo (void)
-        throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo (void)
+        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL setPropertyValue (
         const ::rtl::OUString& rsPropertyName,
-        const cssu::Any& rValue)
+        const css::uno::Any& rValue)
         throw (css::beans::UnknownPropertyException,
                css::uno::RuntimeException,
                std::exception) SAL_OVERRIDE;
-    virtual cssu::Any SAL_CALL getPropertyValue (
+    virtual css::uno::Any SAL_CALL getPropertyValue (
         const ::rtl::OUString& rsPropertyName)
         throw(css::beans::UnknownPropertyException,
             css::lang::WrappedTargetException,
-            cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL addPropertyChangeListener(
         const ::rtl::OUString& rsPropertyName,
-        const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener)
+        const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
         throw(css::beans::UnknownPropertyException,
             css::lang::WrappedTargetException,
-            cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL removePropertyChangeListener(
         const ::rtl::OUString& rsPropertyName,
-        const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener)
+        const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
         throw(css::beans::UnknownPropertyException,
             css::lang::WrappedTargetException,
-            cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL addVetoableChangeListener(
         const ::rtl::OUString& rsPropertyName,
-        const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener)
+        const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
         throw(css::beans::UnknownPropertyException,
             css::lang::WrappedTargetException,
-            cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL removeVetoableChangeListener(
         const ::rtl::OUString& rsPropertyName,
-        const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener)
+        const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
         throw(css::beans::UnknownPropertyException,
             css::lang::WrappedTargetException,
-            cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // beans::XPropertySetInfo
-    virtual cssu::Sequence<css::beans::Property> SAL_CALL getProperties (void)
-        throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Sequence<css::beans::Property> SAL_CALL getProperties (void)
+        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual css::beans::Property SAL_CALL getPropertyByName (const ::rtl::OUString& rsName)
         throw(css::beans::UnknownPropertyException,
-            cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual sal_Bool SAL_CALL hasPropertyByName (const ::rtl::OUString& rsName)
-        throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
     static Theme& GetCurrentTheme();
@@ -225,13 +223,13 @@ private:
     PropertyNameToIdMap maPropertyNameToIdMap;
     typedef ::std::vector<rtl::OUString> PropertyIdToNameMap;
     PropertyIdToNameMap maPropertyIdToNameMap;
-    typedef ::std::vector<cssu::Any> RawValueContainer;
+    typedef ::std::vector<css::uno::Any> RawValueContainer;
     RawValueContainer maRawValues;
 
-    typedef ::std::vector<cssu::Reference<css::beans::XPropertyChangeListener> > ChangeListenerContainer;
+    typedef ::std::vector<css::uno::Reference<css::beans::XPropertyChangeListener> > ChangeListenerContainer;
     typedef ::std::map<ThemeItem,ChangeListenerContainer> ChangeListeners;
     ChangeListeners maChangeListeners;
-    typedef ::std::vector<cssu::Reference<css::beans::XVetoableChangeListener> > VetoableListenerContainer;
+    typedef ::std::vector<css::uno::Reference<css::beans::XVetoableChangeListener> > VetoableListenerContainer;
     typedef ::std::map<ThemeItem,VetoableListenerContainer> VetoableListeners;
     VetoableListeners maVetoableListeners;
 
@@ -249,7 +247,7 @@ private:
     void SetupPropertyMaps (void);
     void UpdateTheme (void);
     static PropertyType GetPropertyType (const ThemeItem eItem);
-    static cssu::Type GetCppuType (const PropertyType eType);
+    static css::uno::Type GetCppuType (const PropertyType eType);
     static sal_Int32 GetIndex (
         const ThemeItem eItem,
         const PropertyType eType);
@@ -267,7 +265,7 @@ private:
         const ChangeListenerContainer* pListeners,
         const css::beans::PropertyChangeEvent& rEvent) const;
     void ProcessNewValue (
-        const cssu::Any& rValue,
+        const css::uno::Any& rValue,
         const ThemeItem eItem,
         const PropertyType eType);
 };