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>

13 files changed, 64 insertions, 67 deletions

diff --git a/sfx2/source/sidebar/CommandInfoProvider.cxx b/sfx2/source/sidebar/CommandInfoProvider.cxx
index 54589df723ae..1909a9d24443 100644
--- a/sfx2/source/sidebar/CommandInfoProvider.cxx
+++ b/sfx2/source/sidebar/CommandInfoProvider.cxx
@@ -31,11 +31,10 @@
 #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
 
 using namespace css;
-using namespace cssu;
+using namespace css::uno;
 using ::rtl::OUString;
 
 
-
 namespace
 {
     typedef ::cppu::WeakComponentImplHelper1 <
@@ -63,7 +62,7 @@ namespace
                 mxFrame->removeEventListener(this);
         }
         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
         {
             (void)rEvent;
             mrInfoProvider.SetFrame(NULL);
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx
index 3a6e294246e5..8a2b86470d26 100644
--- a/sfx2/source/sidebar/ControllerFactory.cxx
+++ b/sfx2/source/sidebar/ControllerFactory.cxx
@@ -33,7 +33,7 @@
 
 
 using namespace css;
-using namespace cssu;
+using namespace css::uno;
 using ::rtl::OUString;
 
 
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index 6caa99e32001..bf817cd69563 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -33,7 +33,7 @@
 
 
 using namespace css;
-using namespace cssu;
+using namespace css::uno;
 
 
 namespace
@@ -66,14 +66,14 @@ namespace
                 mxFrame->removeFrameActionListener(this);
         }
         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
         {
             (void)rEvent;
             mrControllerItem.ResetFrame();
             mxFrame = NULL;
         }
         virtual void SAL_CALL frameAction (const css::frame::FrameActionEvent& rEvent)
-            throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             if (rEvent.Action == frame::FrameAction_CONTEXT_CHANGED)
                 mrControllerItem.NotifyFrameContextChange();
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx
index 49cbacfa2264..fb1a6a0b7848 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -135,7 +135,7 @@ void DeckTitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex)
 
 
 
-cssu::Reference<css::accessibility::XAccessible> DeckTitleBar::CreateAccessible (void)
+css::uno::Reference<css::accessibility::XAccessible> DeckTitleBar::CreateAccessible (void)
 {
     const ::rtl::OUString sAccessibleName(msTitle);
     SetAccessibleName(sAccessibleName);
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 083d15bfdf51..b96b439c0167 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -40,8 +40,7 @@
 
 
 using namespace css;
-using namespace cssu;
-
+using namespace css::uno;
 
 
 namespace sfx2 { namespace sidebar {
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index c7de577d55ac..151d4233d07c 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -32,7 +32,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 
 using namespace css;
-using namespace cssu;
+using namespace css::uno;
 
 namespace sfx2 { namespace sidebar {
 
diff --git a/sfx2/source/sidebar/Sidebar.cxx b/sfx2/source/sidebar/Sidebar.cxx
index f93502fe5d3a..245307c3328a 100644
--- a/sfx2/source/sidebar/Sidebar.cxx
+++ b/sfx2/source/sidebar/Sidebar.cxx
@@ -22,14 +22,13 @@
 #include "ResourceManager.hxx"
 
 using namespace css;
-using namespace cssu;
 
 namespace sfx2 { namespace sidebar {
 
 
 void Sidebar::ShowPanel (
     const ::rtl::OUString& rsPanelId,
-    const Reference<frame::XFrame>& rxFrame)
+    const css::uno::Reference<frame::XFrame>& rxFrame)
 {
     SidebarController* pController = SidebarController::GetSidebarControllerForFrame(rxFrame);
     const PanelDescriptor* pPanelDescriptor = ResourceManager::Instance().GetPanelDescriptor(rsPanelId);
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 2b32ba7bf20e..ed8861764a63 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -57,7 +57,7 @@
 
 
 using namespace css;
-using namespace cssu;
+using namespace css::uno;
 using ::rtl::OUString;
 
 
@@ -95,7 +95,7 @@ namespace {
 
 SidebarController::SidebarController (
     SidebarDockingWindow* pParentWindow,
-    const cssu::Reference<css::frame::XFrame>& rxFrame)
+    const css::uno::Reference<css::frame::XFrame>& rxFrame)
     : SidebarControllerInterfaceBase(m_aMutex),
       mpCurrentDeck(),
       mpParentWindow(pParentWindow),
@@ -131,7 +131,7 @@ SidebarController::SidebarController (
     }
 
     // Listen for context change events.
-    cssu::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
+    css::uno::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
         css::ui::ContextChangeEventMultiplexer::get(
             ::comphelper::getProcessComponentContext()));
     if (xMultiplexer.is())
@@ -174,13 +174,13 @@ SidebarController::~SidebarController (void)
 
 
 SidebarController* SidebarController::GetSidebarControllerForFrame (
-    const cssu::Reference<css::frame::XFrame>& rxFrame)
+    const css::uno::Reference<css::frame::XFrame>& rxFrame)
 {
     SidebarControllerContainer::iterator iEntry (maSidebarControllerContainer.find(rxFrame));
     if (iEntry == maSidebarControllerContainer.end())
         return NULL;
 
-    cssu::Reference<XInterface> xController (iEntry->second.get());
+    css::uno::Reference<XInterface> xController (iEntry->second.get());
     if ( ! xController.is())
         return NULL;
 
@@ -198,7 +198,7 @@ void SAL_CALL SidebarController::disposing (void)
 
     maFocusManager.Clear();
 
-    cssu::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
+    css::uno::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
         css::ui::ContextChangeEventMultiplexer::get(
             ::comphelper::getProcessComponentContext()));
     if (xMultiplexer.is())
@@ -240,7 +240,7 @@ void SAL_CALL SidebarController::disposing (void)
 
 
 void SAL_CALL SidebarController::notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent)
-    throw(cssu::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     // Update to the requested new context asynchronously to avoid
     // subtle errors caused by SFX2 which in rare cases can not
@@ -259,7 +259,7 @@ void SAL_CALL SidebarController::notifyContextChangeEvent (const css::ui::Contex
 
 
 void SAL_CALL SidebarController::disposing (const css::lang::EventObject& rEventObject)
-    throw(cssu::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEventObject;
 
@@ -270,7 +270,7 @@ void SAL_CALL SidebarController::disposing (const css::lang::EventObject& rEvent
 
 
 void SAL_CALL SidebarController::propertyChange (const css::beans::PropertyChangeEvent& rEvent)
-    throw(cssu::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 
@@ -281,7 +281,7 @@ void SAL_CALL SidebarController::propertyChange (const css::beans::PropertyChang
 
 
 void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEvent& rEvent)
-    throw(cssu::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     bool bIsReadWrite (true);
     if (rEvent.IsEnabled)
@@ -304,7 +304,7 @@ void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEv
 
 
 void SAL_CALL SidebarController::requestLayout (void)
-    throw(cssu::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     sal_Int32 nMinimalWidth = 0;
     if (mpCurrentDeck)
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx
index 77a34a091107..8e4c9b0f3d12 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -29,14 +29,14 @@
 #include <com/sun/star/ui/UIElementType.hpp>
 
 using namespace css;
-using namespace cssu;
+using namespace css::uno;
 
 
 namespace sfx2 { namespace sidebar {
 
 Reference<ui::XUIElement> SidebarPanelBase::Create (
     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)
 {
@@ -54,7 +54,7 @@ Reference<ui::XUIElement> SidebarPanelBase::Create (
 
 SidebarPanelBase::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)
     : SidebarPanelBaseInterfaceBase(m_aMutex),
@@ -65,7 +65,7 @@ SidebarPanelBase::SidebarPanelBase (
 {
     if (mxFrame.is())
     {
-        cssu::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
+        css::uno::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
             css::ui::ContextChangeEventMultiplexer::get(
                 ::comphelper::getProcessComponentContext()));
         if (xMultiplexer.is())
@@ -89,7 +89,7 @@ SidebarPanelBase::~SidebarPanelBase (void)
 
 
 void SAL_CALL SidebarPanelBase::disposing (void)
-    throw (cssu::RuntimeException)
+    throw (css::uno::RuntimeException)
 {
     if (mpControl != NULL)
     {
@@ -99,7 +99,7 @@ void SAL_CALL SidebarPanelBase::disposing (void)
 
     if (mxFrame.is())
     {
-        cssu::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
+        css::uno::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
             css::ui::ContextChangeEventMultiplexer::get(
                 ::comphelper::getProcessComponentContext()));
         if (xMultiplexer.is())
@@ -114,7 +114,7 @@ void SAL_CALL SidebarPanelBase::disposing (void)
 // XContextChangeEventListener
 void SAL_CALL SidebarPanelBase::notifyContextChangeEvent (
     const ui::ContextChangeEventObject& rEvent)
-    throw (cssu::RuntimeException, std::exception)
+    throw (css::uno::RuntimeException, std::exception)
 {
     IContextChangeReceiver* pContextChangeReceiver
         = dynamic_cast<IContextChangeReceiver*>(mpControl);
@@ -132,7 +132,7 @@ void SAL_CALL SidebarPanelBase::notifyContextChangeEvent (
 
 void SAL_CALL SidebarPanelBase::disposing (
     const css::lang::EventObject& rEvent)
-    throw (cssu::RuntimeException, std::exception)
+    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 
@@ -143,8 +143,8 @@ void SAL_CALL SidebarPanelBase::disposing (
 
 
 
-cssu::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame (void)
-    throw(cssu::RuntimeException, std::exception)
+css::uno::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame (void)
+    throw(css::uno::RuntimeException, std::exception)
 {
     return mxFrame;
 }
@@ -153,7 +153,7 @@ cssu::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame (void)
 
 
 ::rtl::OUString SAL_CALL SidebarPanelBase::getResourceURL (void)
-    throw(cssu::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     return msResourceURL;
 }
@@ -162,7 +162,7 @@ cssu::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame (void)
 
 
 sal_Int16 SAL_CALL SidebarPanelBase::getType (void)
-    throw(cssu::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     return ui::UIElementType::TOOLPANEL;
 }
@@ -171,7 +171,7 @@ sal_Int16 SAL_CALL SidebarPanelBase::getType (void)
 
 
 Reference<XInterface> SAL_CALL SidebarPanelBase::getRealInterface (void)
-    throw(cssu::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     return Reference<XInterface>(static_cast<XWeak*>(this));
 }
@@ -181,7 +181,7 @@ Reference<XInterface> SAL_CALL SidebarPanelBase::getRealInterface (void)
 
 Reference<accessibility::XAccessible> SAL_CALL SidebarPanelBase::createAccessible (
     const Reference<accessibility::XAccessible>& rxParentAccessible)
-    throw(cssu::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rxParentAccessible;
 
@@ -193,7 +193,7 @@ Reference<accessibility::XAccessible> SAL_CALL SidebarPanelBase::createAccessibl
 
 
 Reference<awt::XWindow> SAL_CALL SidebarPanelBase::getWindow (void)
-    throw(cssu::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     if (mpControl != NULL)
         return Reference<awt::XWindow>(
@@ -207,7 +207,7 @@ Reference<awt::XWindow> SAL_CALL SidebarPanelBase::getWindow (void)
 
 
 ui::LayoutSize SAL_CALL SidebarPanelBase::getHeightForWidth (const sal_Int32 nWidth)
-    throw(cssu::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     if (maLayoutSize.Minimum >= 0)
         return maLayoutSize;
@@ -233,7 +233,7 @@ ui::LayoutSize SAL_CALL SidebarPanelBase::getHeightForWidth (const sal_Int32 nWi
     return ui::LayoutSize(0,0,0);
 }
 
-sal_Int32 SAL_CALL SidebarPanelBase::getMinimalWidth () throw(cssu::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SidebarPanelBase::getMinimalWidth () throw(css::uno::RuntimeException, std::exception)
 {
     if (isLayoutEnabled(mpControl))
     {
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index 70eba9c0bca7..f6f1e5c0c5cf 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -30,8 +30,8 @@
 #include <com/sun/star/frame/XSubToolbarController.hpp>
 
 
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 using ::rtl::OUString;
 
 
@@ -138,7 +138,7 @@ bool SidebarToolBox::Notify (NotifyEvent& rEvent)
 
 void SidebarToolBox::CreateController (
     const sal_uInt16 nItemId,
-    const cssu::Reference<css::frame::XFrame>& rxFrame,
+    const css::uno::Reference<css::frame::XFrame>& rxFrame,
     const sal_Int32 nItemWidth)
 {
     ItemDescriptor aDescriptor;
@@ -178,7 +178,7 @@ Reference<frame::XToolbarController> SidebarToolBox::GetControllerForItemId (con
 
 void SidebarToolBox::SetController(
     const sal_uInt16 nItemId,
-    const cssu::Reference<css::frame::XToolbarController>& rxController,
+    const css::uno::Reference<css::frame::XToolbarController>& rxController,
     const ::rtl::OUString& rsCommandName)
 {
     ItemDescriptor aDescriptor;
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 2f5d228236f4..4acbe851528e 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -28,7 +28,7 @@
 #include <vcl/settings.hxx>
 
 using namespace css;
-using namespace cssu;
+using namespace css::uno;
 
 
 namespace sfx2 { namespace sidebar {
@@ -468,14 +468,14 @@ Reference<beans::XPropertySet> Theme::GetPropertySet (void)
 
 
 Reference<beans::XPropertySetInfo> SAL_CALL Theme::getPropertySetInfo (void)
-    throw(cssu::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     return Reference<beans::XPropertySetInfo>(this);
 }
 
 void SAL_CALL Theme::setPropertyValue (
     const ::rtl::OUString& rsPropertyName,
-    const cssu::Any& rValue)
+    const css::uno::Any& rValue)
     throw (css::beans::UnknownPropertyException,
            css::uno::RuntimeException,
            std::exception)
@@ -523,7 +523,7 @@ Any SAL_CALL Theme::getPropertyValue (
     const ::rtl::OUString& rsPropertyName)
     throw(css::beans::UnknownPropertyException,
         css::lang::WrappedTargetException,
-        cssu::RuntimeException, std::exception)
+        css::uno::RuntimeException, std::exception)
 {
     PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
     if (iId == maPropertyNameToIdMap.end())
@@ -543,10 +543,10 @@ Any SAL_CALL Theme::getPropertyValue (
 
 void SAL_CALL Theme::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)
+        css::uno::RuntimeException, std::exception)
 {
     ThemeItem eItem (__AnyItem);
     if (rsPropertyName.getLength() > 0)
@@ -571,10 +571,10 @@ void SAL_CALL Theme::addPropertyChangeListener(
 
 void SAL_CALL Theme::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)
+        css::uno::RuntimeException, std::exception)
 {
     ThemeItem eItem (__AnyItem);
     if (rsPropertyName.getLength() > 0)
@@ -609,10 +609,10 @@ void SAL_CALL Theme::removePropertyChangeListener(
 
 void SAL_CALL Theme::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)
+        css::uno::RuntimeException, std::exception)
 {
     ThemeItem eItem (__AnyItem);
     if (rsPropertyName.getLength() > 0)
@@ -637,10 +637,10 @@ void SAL_CALL Theme::addVetoableChangeListener(
 
 void SAL_CALL Theme::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)
+        css::uno::RuntimeException, std::exception)
 {
     ThemeItem eItem (__AnyItem);
     if (rsPropertyName.getLength() > 0)
@@ -672,8 +672,8 @@ void SAL_CALL Theme::removeVetoableChangeListener(
 
 
 
-cssu::Sequence<css::beans::Property> SAL_CALL Theme::getProperties (void)
-    throw(cssu::RuntimeException, std::exception)
+css::uno::Sequence<css::beans::Property> SAL_CALL Theme::getProperties (void)
+    throw(css::uno::RuntimeException, std::exception)
 {
     ::std::vector<beans::Property> aProperties;
 
@@ -692,7 +692,7 @@ cssu::Sequence<css::beans::Property> SAL_CALL Theme::getProperties (void)
         aProperties.push_back(aProperty);
     }
 
-    return cssu::Sequence<css::beans::Property>(
+    return css::uno::Sequence<css::beans::Property>(
         &aProperties.front(),
         aProperties.size());
 }
@@ -702,7 +702,7 @@ cssu::Sequence<css::beans::Property> SAL_CALL Theme::getProperties (void)
 
 beans::Property SAL_CALL Theme::getPropertyByName (const ::rtl::OUString& rsPropertyName)
     throw(css::beans::UnknownPropertyException,
-        cssu::RuntimeException, std::exception)
+        css::uno::RuntimeException, std::exception)
 {
     PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
     if (iId == maPropertyNameToIdMap.end())
@@ -725,7 +725,7 @@ beans::Property SAL_CALL Theme::getPropertyByName (const ::rtl::OUString& rsProp
 
 
 sal_Bool SAL_CALL Theme::hasPropertyByName (const ::rtl::OUString& rsPropertyName)
-    throw(cssu::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
     if (iId == maPropertyNameToIdMap.end())
@@ -895,7 +895,7 @@ Theme::PropertyType Theme::GetPropertyType (const ThemeItem eItem)
 
 
 
-cssu::Type Theme::GetCppuType (const PropertyType eType)
+css::uno::Type Theme::GetCppuType (const PropertyType eType)
 {
     switch(eType)
     {
diff --git a/sfx2/source/sidebar/TitleBar.hxx b/sfx2/source/sidebar/TitleBar.hxx
index 56ab6b9a9d64..a499bca14563 100644
--- a/sfx2/source/sidebar/TitleBar.hxx
+++ b/sfx2/source/sidebar/TitleBar.hxx
@@ -62,7 +62,7 @@ protected:
     virtual sidebar::Paint GetBackgroundPaint (void) = 0;
     virtual Color GetTextColor (void) = 0;
     virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex);
-    virtual cssu::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE;
+    virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE;
 
 private:
     Image maIcon;
diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx
index a1c63b27f723..09bf49febb56 100644
--- a/sfx2/source/sidebar/Tools.cxx
+++ b/sfx2/source/sidebar/Tools.cxx
@@ -34,7 +34,7 @@
 #include <cstring>
 
 using namespace css;
-using namespace cssu;
+using namespace css::uno;
 
 
 namespace sfx2 { namespace sidebar {
@@ -153,7 +153,7 @@ util::URL Tools::GetURL (const ::rtl::OUString& rsCommand)
 
 
 Reference<frame::XDispatch> Tools::GetDispatch (
-    const cssu::Reference<css::frame::XFrame>& rxFrame,
+    const css::uno::Reference<css::frame::XFrame>& rxFrame,
     const util::URL& rURL)
 {
     Reference<frame::XDispatchProvider> xProvider (rxFrame, UNO_QUERY_THROW);
@@ -165,7 +165,7 @@ Reference<frame::XDispatch> Tools::GetDispatch (
 
 
 ::rtl::OUString Tools::GetModuleName (
-    const cssu::Reference<css::frame::XFrame>& rxFrame)
+    const css::uno::Reference<css::frame::XFrame>& rxFrame)
 {
     if ( ! rxFrame.is() || ! rxFrame->getController().is())
         return ::rtl::OUString();