com::sun::star->css in configmgr

Change-Id: Ief642571ddccbf016fa1625b5859b4889a4a3e8e
Reviewed-on: https://gerrit.libreoffice.org/17366
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

16 files changed, 299 insertions, 326 deletions

diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index 8b864c6a27fc..e3cb69199faf 100644
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
@@ -92,23 +92,23 @@ class Node;
 class RootAccess;
 
 class Access:
-    public cppu::OWeakObject, public com::sun::star::lang::XTypeProvider,
-    public com::sun::star::lang::XServiceInfo,
-    public com::sun::star::lang::XComponent,
-    public com::sun::star::container::XHierarchicalNameReplace,
-    public com::sun::star::container::XContainer,
-    public com::sun::star::beans::XExactName,
-    public com::sun::star::beans::XPropertySetInfo,
-    public com::sun::star::container::XHierarchicalName,
-    public com::sun::star::container::XNamed,
-    public com::sun::star::beans::XProperty,
-    public com::sun::star::beans::XPropertySet,
-    public com::sun::star::beans::XMultiPropertySet,
-    public com::sun::star::beans::XHierarchicalPropertySet,
-    public com::sun::star::beans::XMultiHierarchicalPropertySet,
-    public com::sun::star::beans::XHierarchicalPropertySetInfo,
-    public com::sun::star::container::XNameContainer,
-    public com::sun::star::lang::XSingleServiceFactory
+    public cppu::OWeakObject, public css::lang::XTypeProvider,
+    public css::lang::XServiceInfo,
+    public css::lang::XComponent,
+    public css::container::XHierarchicalNameReplace,
+    public css::container::XContainer,
+    public css::beans::XExactName,
+    public css::beans::XPropertySetInfo,
+    public css::container::XHierarchicalName,
+    public css::container::XNamed,
+    public css::beans::XProperty,
+    public css::beans::XPropertySet,
+    public css::beans::XMultiPropertySet,
+    public css::beans::XHierarchicalPropertySet,
+    public css::beans::XMultiHierarchicalPropertySet,
+    public css::beans::XHierarchicalPropertySetInfo,
+    public css::container::XNameContainer,
+    public css::lang::XSingleServiceFactory
 {
 public:
     oslInterlockedCount acquireCounting();
@@ -134,296 +134,296 @@ public:
     using OWeakObject::acquire;
     using OWeakObject::release;
 
-    virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
-    getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL
+    getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL
+    getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual OUString SAL_CALL getImplementationName()
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Sequence< OUString > SAL_CALL
+    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL dispose()
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL addEventListener(
-        com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
+        css::uno::Reference< css::lang::XEventListener >
             const & xListener)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL removeEventListener(
-        com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
+        css::uno::Reference< css::lang::XEventListener >
             const & aListener)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual com::sun::star::uno::Type SAL_CALL getElementType()
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Type SAL_CALL getElementType()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual sal_Bool SAL_CALL hasElements()
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual com::sun::star::uno::Any SAL_CALL getByName(
+    virtual css::uno::Any SAL_CALL getByName(
         OUString const & aName)
         throw (
-            com::sun::star::container::NoSuchElementException,
-            com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::container::NoSuchElementException,
+            css::lang::WrappedTargetException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
-    getElementNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Sequence< OUString > SAL_CALL
+    getElementNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual sal_Bool SAL_CALL hasByName(OUString const & aName)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual com::sun::star::uno::Any SAL_CALL getByHierarchicalName(
+    virtual css::uno::Any SAL_CALL getByHierarchicalName(
         OUString const & aName)
         throw (
-            com::sun::star::container::NoSuchElementException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::container::NoSuchElementException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL replaceByHierarchicalName(
-        OUString const & aName, com::sun::star::uno::Any const & aElement)
+        OUString const & aName, css::uno::Any const & aElement)
         throw (
-            com::sun::star::lang::IllegalArgumentException,
-            com::sun::star::container::NoSuchElementException,
-            com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::lang::IllegalArgumentException,
+            css::container::NoSuchElementException,
+            css::lang::WrappedTargetException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL addContainerListener(
-        com::sun::star::uno::Reference<
-            com::sun::star::container::XContainerListener > const & xListener)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::uno::Reference<
+            css::container::XContainerListener > const & xListener)
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL removeContainerListener(
-        com::sun::star::uno::Reference<
-            com::sun::star::container::XContainerListener > const & xListener)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::uno::Reference<
+            css::container::XContainerListener > const & xListener)
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual OUString SAL_CALL getExactName(
         OUString const & aApproximateName)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property >
-    SAL_CALL getProperties() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Sequence< css::beans::Property >
+    SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual com::sun::star::beans::Property SAL_CALL getPropertyByName(
+    virtual css::beans::Property SAL_CALL getPropertyByName(
         OUString const & aName)
         throw (
-            com::sun::star::beans::UnknownPropertyException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::beans::UnknownPropertyException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual sal_Bool SAL_CALL hasPropertyByName(OUString const & Name)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual OUString SAL_CALL getHierarchicalName()
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual OUString SAL_CALL composeHierarchicalName(
         OUString const & aRelativeName)
         throw (
-            com::sun::star::lang::IllegalArgumentException,
-            com::sun::star::lang::NoSupportException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::lang::IllegalArgumentException,
+            css::lang::NoSupportException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual OUString SAL_CALL getName()
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL setName(OUString const & aName)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual com::sun::star::beans::Property SAL_CALL getAsProperty()
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::beans::Property SAL_CALL getAsProperty()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual
-    com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >
-    SAL_CALL getPropertySetInfo() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    css::uno::Reference< css::beans::XPropertySetInfo >
+    SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL setPropertyValue(
         OUString const & aPropertyName,
-        com::sun::star::uno::Any const & aValue)
+        css::uno::Any const & aValue)
         throw (
-            com::sun::star::beans::UnknownPropertyException,
-            com::sun::star::beans::PropertyVetoException,
-            com::sun::star::lang::IllegalArgumentException,
-            com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::beans::UnknownPropertyException,
+            css::beans::PropertyVetoException,
+            css::lang::IllegalArgumentException,
+            css::lang::WrappedTargetException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(
+    virtual css::uno::Any SAL_CALL getPropertyValue(
         OUString const & PropertyName)
         throw (
-            com::sun::star::beans::UnknownPropertyException,
-            com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL addPropertyChangeListener(
         OUString const & aPropertyName,
-        com::sun::star::uno::Reference<
-            com::sun::star::beans::XPropertyChangeListener > const & xListener)
+        css::uno::Reference<
+            css::beans::XPropertyChangeListener > const & xListener)
         throw (
-            com::sun::star::beans::UnknownPropertyException,
-            com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL removePropertyChangeListener(
         OUString const & aPropertyName,
-        com::sun::star::uno::Reference<
-            com::sun::star::beans::XPropertyChangeListener > const & aListener)
+        css::uno::Reference<
+            css::beans::XPropertyChangeListener > const & aListener)
         throw (
-            com::sun::star::beans::UnknownPropertyException,
-            com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL addVetoableChangeListener(
         OUString const & PropertyName,
-        com::sun::star::uno::Reference<
-            com::sun::star::beans::XVetoableChangeListener > const & aListener)
+        css::uno::Reference<
+            css::beans::XVetoableChangeListener > const & aListener)
         throw (
-            com::sun::star::beans::UnknownPropertyException,
-            com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL removeVetoableChangeListener(
         OUString const & PropertyName,
-        com::sun::star::uno::Reference<
-            com::sun::star::beans::XVetoableChangeListener > const & aListener)
+        css::uno::Reference<
+            css::beans::XVetoableChangeListener > const & aListener)
         throw (
-            com::sun::star::beans::UnknownPropertyException,
-            com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL setPropertyValues(
-        com::sun::star::uno::Sequence< OUString > const & aPropertyNames,
-        com::sun::star::uno::Sequence< com::sun::star::uno::Any > const &
+        css::uno::Sequence< OUString > const & aPropertyNames,
+        css::uno::Sequence< css::uno::Any > const &
             aValues)
         throw (
-            com::sun::star::beans::PropertyVetoException,
-            com::sun::star::lang::IllegalArgumentException,
-            com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::beans::PropertyVetoException,
+            css::lang::IllegalArgumentException,
+            css::lang::WrappedTargetException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual com::sun::star::uno::Sequence< com::sun::star::uno::Any > SAL_CALL
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL
     getPropertyValues(
-        com::sun::star::uno::Sequence< OUString > const & aPropertyNames)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::uno::Sequence< OUString > const & aPropertyNames)
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL addPropertiesChangeListener(
-        com::sun::star::uno::Sequence< OUString > const & aPropertyNames,
-        com::sun::star::uno::Reference<
-            com::sun::star::beans::XPropertiesChangeListener > const &
+        css::uno::Sequence< OUString > const & aPropertyNames,
+        css::uno::Reference<
+            css::beans::XPropertiesChangeListener > const &
                 xListener)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL removePropertiesChangeListener(
-        com::sun::star::uno::Reference<
-            com::sun::star::beans::XPropertiesChangeListener > const &
+        css::uno::Reference<
+            css::beans::XPropertiesChangeListener > const &
                 xListener)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL firePropertiesChangeEvent(
-        com::sun::star::uno::Sequence< OUString > const & aPropertyNames,
-        com::sun::star::uno::Reference<
-            com::sun::star::beans::XPropertiesChangeListener > const &
+        css::uno::Sequence< OUString > const & aPropertyNames,
+        css::uno::Reference<
+            css::beans::XPropertiesChangeListener > const &
                 xListener)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual
-    com::sun::star::uno::Reference<
-        com::sun::star::beans::XHierarchicalPropertySetInfo > SAL_CALL
+    css::uno::Reference<
+        css::beans::XHierarchicalPropertySetInfo > SAL_CALL
     getHierarchicalPropertySetInfo()
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL setHierarchicalPropertyValue(
         OUString const & aHierarchicalPropertyName,
-        com::sun::star::uno::Any const & aValue)
+        css::uno::Any const & aValue)
         throw (
-            com::sun::star::beans::UnknownPropertyException,
-            com::sun::star::beans::PropertyVetoException,
-            com::sun::star::lang::IllegalArgumentException,
-            com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::beans::UnknownPropertyException,
+            css::beans::PropertyVetoException,
+            css::lang::IllegalArgumentException,
+            css::lang::WrappedTargetException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual com::sun::star::uno::Any SAL_CALL getHierarchicalPropertyValue(
+    virtual css::uno::Any SAL_CALL getHierarchicalPropertyValue(
         OUString const & aHierarchicalPropertyName)
         throw (
-            com::sun::star::beans::UnknownPropertyException,
-            com::sun::star::lang::IllegalArgumentException,
-            com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::beans::UnknownPropertyException,
+            css::lang::IllegalArgumentException,
+            css::lang::WrappedTargetException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL setHierarchicalPropertyValues(
-        com::sun::star::uno::Sequence< OUString > const &
+        css::uno::Sequence< OUString > const &
             aHierarchicalPropertyNames,
-        com::sun::star::uno::Sequence< com::sun::star::uno::Any > const &
+        css::uno::Sequence< css::uno::Any > const &
             Values)
         throw (
-            com::sun::star::beans::PropertyVetoException,
-            com::sun::star::lang::IllegalArgumentException,
-            com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::beans::PropertyVetoException,
+            css::lang::IllegalArgumentException,
+            css::lang::WrappedTargetException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual com::sun::star::uno::Sequence< com::sun::star::uno::Any > SAL_CALL
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL
     getHierarchicalPropertyValues(
-        com::sun::star::uno::Sequence< OUString > const &
+        css::uno::Sequence< OUString > const &
             aHierarchicalPropertyNames)
         throw (
-            com::sun::star::lang::IllegalArgumentException,
-            com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::lang::IllegalArgumentException,
+            css::lang::WrappedTargetException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual com::sun::star::beans::Property SAL_CALL
+    virtual css::beans::Property SAL_CALL
     getPropertyByHierarchicalName(OUString const & aHierarchicalName)
         throw (
-            com::sun::star::beans::UnknownPropertyException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::beans::UnknownPropertyException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual sal_Bool SAL_CALL hasPropertyByHierarchicalName(
         OUString const & aHierarchicalName)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL replaceByName(
-        OUString const & aName, com::sun::star::uno::Any const & aElement)
+        OUString const & aName, css::uno::Any const & aElement)
         throw (
-            com::sun::star::lang::IllegalArgumentException,
-            com::sun::star::container::NoSuchElementException,
-            com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::lang::IllegalArgumentException,
+            css::container::NoSuchElementException,
+            css::lang::WrappedTargetException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL insertByName(
-        OUString const & aName, com::sun::star::uno::Any const & aElement)
+        OUString const & aName, css::uno::Any const & aElement)
         throw (
-            com::sun::star::lang::IllegalArgumentException,
-            com::sun::star::container::ElementExistException,
-            com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::lang::IllegalArgumentException,
+            css::container::ElementExistException,
+            css::lang::WrappedTargetException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL removeByName(OUString const & aName)
         throw (
-            com::sun::star::container::NoSuchElementException,
-            com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::container::NoSuchElementException,
+            css::lang::WrappedTargetException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
+    virtual css::uno::Reference< css::uno::XInterface >
     SAL_CALL createInstance()
         throw (
-            com::sun::star::uno::Exception,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Exception,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
+    virtual css::uno::Reference< css::uno::XInterface >
     SAL_CALL createInstanceWithArguments(
-        com::sun::star::uno::Sequence< com::sun::star::uno::Any > const &
+        css::uno::Sequence< css::uno::Any > const &
             aArguments)
         throw (
-            com::sun::star::uno::Exception,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Exception,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 protected:
     explicit Access(Components & components);
@@ -434,7 +434,7 @@ protected:
     virtual rtl::Reference< RootAccess > getRootAccess() = 0;
     virtual rtl::Reference< Access > getParentAccess() = 0;
 
-    virtual void addTypes(std::vector< com::sun::star::uno::Type > * types)
+    virtual void addTypes(std::vector< css::uno::Type > * types)
         const = 0;
 
     virtual void addSupportedServiceNames(
@@ -443,9 +443,9 @@ protected:
     virtual void initDisposeBroadcaster(Broadcaster * broadcaster);
     virtual void clearListeners() throw ();
 
-    virtual com::sun::star::uno::Any SAL_CALL queryInterface(
-        com::sun::star::uno::Type const & aType)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Any SAL_CALL queryInterface(
+        css::uno::Type const & aType)
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     Components & getComponents() const { return components_;}
 
@@ -456,20 +456,20 @@ protected:
     std::vector< rtl::Reference< ChildAccess > > getAllChildren();
 
     void checkValue(
-        com::sun::star::uno::Any const & value, Type type, bool nillable);
+        css::uno::Any const & value, Type type, bool nillable);
 
     void insertLocalizedValueChild(
-        OUString const & name, com::sun::star::uno::Any const & value,
+        OUString const & name, css::uno::Any const & value,
         Modifications * localModifications);
 
     void reportChildChanges(
-        std::vector< com::sun::star::util::ElementChange > * changes);
+        std::vector< css::util::ElementChange > * changes);
 
     void commitChildChanges(bool valid, Modifications * globalModifications);
 
     void initBroadcasterAndChanges(
         Modifications::Node const & modifications, Broadcaster * broadcaster,
-        std::vector< com::sun::star::util::ElementChange > * changes);
+        std::vector< css::util::ElementChange > * changes);
 
     bool isDisposed() const { return disposed_;}
 
@@ -512,8 +512,7 @@ private:
 
     void checkKnownProperty(OUString const & descriptor);
 
-    rtl::Reference< ChildAccess > getFreeSetMember(
-        com::sun::star::uno::Any const & value);
+    rtl::Reference< ChildAccess > getFreeSetMember( css::uno::Any const & value);
 
     rtl::Reference< Access > getNotificationRoot();
 
@@ -521,20 +520,20 @@ private:
 
     typedef
         std::multiset<
-            com::sun::star::uno::Reference<
-                com::sun::star::lang::XEventListener > >
+            css::uno::Reference<
+                css::lang::XEventListener > >
         DisposeListeners;
 
     typedef
         std::multiset<
-            com::sun::star::uno::Reference<
-                com::sun::star::container::XContainerListener > >
+            css::uno::Reference<
+                css::container::XContainerListener > >
         ContainerListeners;
 
     typedef
         std::multiset<
-            com::sun::star::uno::Reference<
-                com::sun::star::beans::XPropertyChangeListener > >
+            css::uno::Reference<
+                css::beans::XPropertyChangeListener > >
         PropertyChangeListenersElement;
 
     typedef config_map< PropertyChangeListenersElement >
@@ -542,8 +541,8 @@ private:
 
     typedef
         std::multiset<
-            com::sun::star::uno::Reference<
-                com::sun::star::beans::XVetoableChangeListener > >
+            css::uno::Reference<
+                css::beans::XVetoableChangeListener > >
         VetoableChangeListenersElement;
 
     typedef config_map< VetoableChangeListenersElement >
@@ -551,8 +550,8 @@ private:
 
     typedef
         std::multiset<
-            com::sun::star::uno::Reference<
-                com::sun::star::beans::XPropertiesChangeListener > >
+            css::uno::Reference<
+                css::beans::XPropertiesChangeListener > >
         PropertiesChangeListeners;
 
     Components & components_;
diff --git a/configmgr/source/broadcaster.hxx b/configmgr/source/broadcaster.hxx
index 46b7f64ee934..e808dd84f9e1 100644
--- a/configmgr/source/broadcaster.hxx
+++ b/configmgr/source/broadcaster.hxx
@@ -48,40 +48,32 @@ public:
     Broadcaster() {}
 
     void addDisposeNotification(
-        com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
-            const & listener,
-        com::sun::star::lang::EventObject const & event);
+        css::uno::Reference< css::lang::XEventListener > const & listener,
+        css::lang::EventObject const & event);
 
     void addContainerElementInsertedNotification(
-        com::sun::star::uno::Reference<
-            com::sun::star::container::XContainerListener > const & listener,
-        com::sun::star::container::ContainerEvent const & event);
+        css::uno::Reference< css::container::XContainerListener > const & listener,
+        css::container::ContainerEvent const & event);
 
     void addContainerElementRemovedNotification(
-        com::sun::star::uno::Reference<
-            com::sun::star::container::XContainerListener > const & listener,
-        com::sun::star::container::ContainerEvent const & event);
+        css::uno::Reference< css::container::XContainerListener > const & listener,
+        css::container::ContainerEvent const & event);
 
     void addContainerElementReplacedNotification(
-        com::sun::star::uno::Reference<
-            com::sun::star::container::XContainerListener > const & listener,
-        com::sun::star::container::ContainerEvent const & event);
+        css::uno::Reference< css::container::XContainerListener > const & listener,
+        css::container::ContainerEvent const & event);
 
     void addPropertyChangeNotification(
-        com::sun::star::uno::Reference<
-            com::sun::star::beans::XPropertyChangeListener > const & listener,
-        com::sun::star::beans::PropertyChangeEvent const & event);
+        css::uno::Reference< css::beans::XPropertyChangeListener > const & listener,
+        css::beans::PropertyChangeEvent const & event);
 
     void addPropertiesChangeNotification(
-        com::sun::star::uno::Reference<
-            com::sun::star::beans::XPropertiesChangeListener > const & listener,
-        com::sun::star::uno::Sequence<
-            com::sun::star::beans::PropertyChangeEvent > const & event);
+        css::uno::Reference< css::beans::XPropertiesChangeListener > const & listener,
+        css::uno::Sequence< css::beans::PropertyChangeEvent > const & event);
 
     void addChangesNotification(
-        com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >
-            const & listener,
-        com::sun::star::util::ChangesEvent const & event);
+        css::uno::Reference< css::util::XChangesListener > const & listener,
+        css::util::ChangesEvent const & event);
 
     void send();
 
@@ -90,63 +82,48 @@ private:
     Broadcaster& operator=(const Broadcaster&) SAL_DELETED_FUNCTION;
 
     struct DisposeNotification {
-        com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
-            listener;
-        com::sun::star::lang::EventObject event;
+        css::uno::Reference< css::lang::XEventListener >  listener;
+        css::lang::EventObject                            event;
 
         DisposeNotification(
-            com::sun::star::uno::Reference<
-                com::sun::star::lang::XEventListener > const & theListener,
-            com::sun::star::lang::EventObject const & theEvent);
+            css::uno::Reference< css::lang::XEventListener > const & theListener,
+            css::lang::EventObject const & theEvent);
     };
 
     struct ContainerNotification {
-        com::sun::star::uno::Reference<
-            com::sun::star::container::XContainerListener > listener;
-        com::sun::star::container::ContainerEvent event;
+        css::uno::Reference< css::container::XContainerListener > listener;
+        css::container::ContainerEvent event;
 
         ContainerNotification(
-            com::sun::star::uno::Reference<
-                com::sun::star::container::XContainerListener > const &
-                    theListener,
-            com::sun::star::container::ContainerEvent const & theEvent);
+            css::uno::Reference< css::container::XContainerListener > const & theListener,
+            css::container::ContainerEvent const & theEvent);
     };
 
     struct PropertyChangeNotification {
-        com::sun::star::uno::Reference<
-            com::sun::star::beans::XPropertyChangeListener > listener;
-        com::sun::star::beans::PropertyChangeEvent event;
+        css::uno::Reference< css::beans::XPropertyChangeListener > listener;
+        css::beans::PropertyChangeEvent                            event;
 
         PropertyChangeNotification(
-            com::sun::star::uno::Reference<
-                com::sun::star::beans::XPropertyChangeListener > const &
-                theListener,
-            com::sun::star::beans::PropertyChangeEvent const & theEvent);
+            css::uno::Reference< css::beans::XPropertyChangeListener > const & theListener,
+            css::beans::PropertyChangeEvent const & theEvent);
     };
 
     struct PropertiesChangeNotification {
-        com::sun::star::uno::Reference<
-            com::sun::star::beans::XPropertiesChangeListener > listener;
-        com::sun::star::uno::Sequence<
-            com::sun::star::beans::PropertyChangeEvent > event;
+        css::uno::Reference< css::beans::XPropertiesChangeListener > listener;
+        css::uno::Sequence< css::beans::PropertyChangeEvent >        event;
 
         PropertiesChangeNotification(
-            com::sun::star::uno::Reference<
-                com::sun::star::beans::XPropertiesChangeListener > const &
-                theListener,
-            com::sun::star::uno::Sequence<
-                com::sun::star::beans::PropertyChangeEvent > const & theEvent);
+            css::uno::Reference< css::beans::XPropertiesChangeListener > const & theListener,
+            css::uno::Sequence< css::beans::PropertyChangeEvent > const & theEvent);
     };
 
     struct ChangesNotification {
-        com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >
-            listener;
-        com::sun::star::util::ChangesEvent event;
+        css::uno::Reference< css::util::XChangesListener > listener;
+        css::util::ChangesEvent                            event;
 
         ChangesNotification(
-            com::sun::star::uno::Reference<
-                com::sun::star::util::XChangesListener > const & theListener,
-            com::sun::star::util::ChangesEvent const & theEvent);
+            css::uno::Reference< css::util::XChangesListener > const & theListener,
+            css::util::ChangesEvent const & theEvent);
     };
 
     typedef std::vector< DisposeNotification > DisposeNotifications;
diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx
index 2838bbd86c93..6f0750a3fc10 100644
--- a/configmgr/source/childaccess.hxx
+++ b/configmgr/source/childaccess.hxx
@@ -51,11 +51,11 @@ class Node;
 class RootAccess;
 
 class ChildAccess:
-    public Access, public com::sun::star::container::XChild,
-    public com::sun::star::lang::XUnoTunnel
+    public Access, public css::container::XChild,
+    public css::lang::XUnoTunnel
 {
 public:
-    static com::sun::star::uno::Sequence< sal_Int8 > getTunnelId();
+    static css::uno::Sequence< sal_Int8 > getTunnelId();
 
     ChildAccess(
         Components & components, rtl::Reference< RootAccess > const & root,
@@ -82,20 +82,19 @@ public:
     virtual void SAL_CALL acquire() throw () SAL_OVERRIDE;
     virtual void SAL_CALL release() throw () SAL_OVERRIDE;
 
-    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
+    virtual css::uno::Reference< css::uno::XInterface >
     SAL_CALL getParent()
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL setParent(
-        com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
-            const &)
+        css::uno::Reference< css::uno::XInterface > const &)
         throw (
-            com::sun::star::lang::NoSupportException,
-            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::lang::NoSupportException,
+            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual sal_Int64 SAL_CALL getSomething(
-        com::sun::star::uno::Sequence< sal_Int8 > const & aIdentifier)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::uno::Sequence< sal_Int8 > const & aIdentifier)
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     void bind(
         rtl::Reference< RootAccess > const & root,
@@ -109,7 +108,7 @@ public:
     void setNode(rtl::Reference< Node > const & node);
 
     void setProperty(
-        com::sun::star::uno::Any const & value,
+        css::uno::Any const & value,
         Modifications * localModifications);
 
     css::uno::Any asValue();
@@ -123,20 +122,20 @@ private:
     virtual ~ChildAccess();
 
     virtual void addTypes(
-        std::vector< com::sun::star::uno::Type > * types) const SAL_OVERRIDE;
+        std::vector< css::uno::Type > * types) const SAL_OVERRIDE;
 
     virtual void addSupportedServiceNames(
         std::vector< OUString > * services) SAL_OVERRIDE;
 
-    virtual com::sun::star::uno::Any SAL_CALL queryInterface(
-        com::sun::star::uno::Type const & aType)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Any SAL_CALL queryInterface(
+        css::uno::Type const & aType)
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     rtl::Reference< RootAccess > root_;
     rtl::Reference< Access > parent_; // null if free node
     OUString name_;
     rtl::Reference< Node > node_;
-    std::unique_ptr< com::sun::star::uno::Any > changedValue_;
+    std::unique_ptr< css::uno::Any > changedValue_;
     bool inTransaction_;
         // to determine if a free node can be inserted underneath some root
     std::shared_ptr<osl::Mutex> lock_;
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index d0c2536f908e..f43181f18f9d 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -53,8 +53,7 @@ class RootAccess;
 class Components {
 public:
     static Components & getSingleton(
-        com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
-            const & context);
+        css::uno::Reference< css::uno::XComponentContext > const & context);
 
     static bool allLocales(OUString const & locale);
 
@@ -101,7 +100,7 @@ public:
         std::set< OUString > const & excludedPaths,
         Modifications * modifications);
 
-    com::sun::star::beans::Optional< com::sun::star::uno::Any >
+    css::beans::Optional< css::uno::Any >
     getExternalValue(OUString const & descriptor);
 
 private:
@@ -113,8 +112,7 @@ private:
         Additions *);
 public:
     explicit Components(
-        com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
-            const & context);
+        css::uno::Reference< css::uno::XComponentContext > const & context);
 
     ~Components();
 private:
@@ -151,13 +149,13 @@ private:
 
     typedef
         config_map<
-            com::sun::star::uno::Reference<
-                com::sun::star::beans::XPropertySet > >
+            css::uno::Reference<
+                css::beans::XPropertySet > >
         ExternalServices;
 
     class WriteThread;
 
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+    css::uno::Reference< css::uno::XComponentContext >
         context_;
     Data data_;
     WeakRootSet roots_;
diff --git a/configmgr/source/configurationprovider.hxx b/configmgr/source/configurationprovider.hxx
index 7fbf5b7619a4..f29a8c728976 100644
--- a/configmgr/source/configurationprovider.hxx
+++ b/configmgr/source/configurationprovider.hxx
@@ -37,19 +37,19 @@ namespace com { namespace sun { namespace star {
 
 namespace configmgr { namespace configuration_provider {
 
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface > createDefault(
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+css::uno::Reference< css::uno::XInterface > createDefault(
+    css::uno::Reference< css::uno::XComponentContext >
         const & context);
 
 OUString SAL_CALL getImplementationName();
 
-com::sun::star::uno::Sequence< OUString > SAL_CALL
+css::uno::Sequence< OUString > SAL_CALL
 getSupportedServiceNames();
 
-com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >
+css::uno::Reference< css::lang::XSingleComponentFactory >
 SAL_CALL createFactory(
     cppu::ComponentFactoryFunc, OUString const &,
-    com::sun::star::uno::Sequence< OUString > const &, rtl_ModuleCount *);
+    css::uno::Sequence< OUString > const &, rtl_ModuleCount *);
 
 } }
 
diff --git a/configmgr/source/configurationregistry.hxx b/configmgr/source/configurationregistry.hxx
index abfeaf29064f..1bfda104dc1c 100644
--- a/configmgr/source/configurationregistry.hxx
+++ b/configmgr/source/configurationregistry.hxx
@@ -35,14 +35,14 @@ namespace com { namespace sun { namespace star {
 
 namespace configmgr { namespace configuration_registry {
 
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
+css::uno::Reference< css::uno::XInterface > SAL_CALL
 create(
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+    css::uno::Reference< css::uno::XComponentContext >
         const & context);
 
 OUString SAL_CALL getImplementationName();
 
-com::sun::star::uno::Sequence< OUString > SAL_CALL
+css::uno::Sequence< OUString > SAL_CALL
 getSupportedServiceNames();
 
 } }
diff --git a/configmgr/source/defaultprovider.hxx b/configmgr/source/defaultprovider.hxx
index cd06e6eb6442..c3825ea46a88 100644
--- a/configmgr/source/defaultprovider.hxx
+++ b/configmgr/source/defaultprovider.hxx
@@ -35,14 +35,14 @@ namespace com { namespace sun { namespace star {
 
 namespace configmgr { namespace default_provider {
 
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
+css::uno::Reference< css::uno::XInterface > SAL_CALL
 create(
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+    css::uno::Reference< css::uno::XComponentContext >
         const & context);
 
 OUString SAL_CALL getImplementationName();
 
-com::sun::star::uno::Sequence< OUString > SAL_CALL
+css::uno::Sequence< OUString > SAL_CALL
 getSupportedServiceNames();
 
 } }
diff --git a/configmgr/source/localizedvaluenode.hxx b/configmgr/source/localizedvaluenode.hxx
index 9d44a33cd081..f2aa68a084f9 100644
--- a/configmgr/source/localizedvaluenode.hxx
+++ b/configmgr/source/localizedvaluenode.hxx
@@ -33,20 +33,20 @@ namespace configmgr {
 class LocalizedValueNode: public Node {
 public:
     explicit LocalizedValueNode(int layer);
-    LocalizedValueNode(int layer, com::sun::star::uno::Any const & value);
+    LocalizedValueNode(int layer, css::uno::Any const & value);
 
     virtual rtl::Reference< Node > clone(bool keepTemplateName) const SAL_OVERRIDE;
 
     virtual OUString getTemplateName() const SAL_OVERRIDE;
 
-    com::sun::star::uno::Any  getValue() const { return value_;}
-    com::sun::star::uno::Any *getValuePtr(int layer)
+    css::uno::Any  getValue() const { return value_;}
+    css::uno::Any *getValuePtr(int layer)
     {
         setLayer(layer);
         return &value_;
     }
 
-    void setValue(int layer, com::sun::star::uno::Any const & value);
+    void setValue(int layer, css::uno::Any const & value);
 
 private:
     LocalizedValueNode(LocalizedValueNode const & other);
@@ -55,7 +55,7 @@ private:
 
     virtual Kind kind() const SAL_OVERRIDE;
 
-    com::sun::star::uno::Any value_;
+    css::uno::Any value_;
 };
 
 }
diff --git a/configmgr/source/propertynode.cxx b/configmgr/source/propertynode.cxx
index 967a1057b238..3ead60f89a3c 100644
--- a/configmgr/source/propertynode.cxx
+++ b/configmgr/source/propertynode.cxx
@@ -70,7 +70,7 @@ void PropertyNode::setValue(int layer, css::uno::Any const & value) {
     externalDescriptor_.clear();
 }
 
-com::sun::star::uno::Any *PropertyNode::getValuePtr(int layer)
+css::uno::Any *PropertyNode::getValuePtr(int layer)
 {
     setLayer(layer);
     externalDescriptor_.clear();
diff --git a/configmgr/source/propertynode.hxx b/configmgr/source/propertynode.hxx
index 805efa18de65..273fc5235eef 100644
--- a/configmgr/source/propertynode.hxx
+++ b/configmgr/source/propertynode.hxx
@@ -37,7 +37,7 @@ class PropertyNode: public Node {
 public:
     PropertyNode(
         int layer, Type staticType, bool nillable,
-        com::sun::star::uno::Any const & value, bool extension);
+        css::uno::Any const & value, bool extension);
 
     virtual rtl::Reference< Node > clone(bool keepTemplateName) const SAL_OVERRIDE;
 
@@ -45,10 +45,10 @@ public:
 
     bool isNillable() const { return nillable_;}
 
-    com::sun::star::uno::Any getValue(Components & components);
+    css::uno::Any getValue(Components & components);
 
-    void setValue(int layer, com::sun::star::uno::Any const & value);
-    com::sun::star::uno::Any *getValuePtr(int layer);
+    void setValue(int layer, css::uno::Any const & value);
+    css::uno::Any *getValuePtr(int layer);
 
     void setExternal(int layer, OUString const & descriptor);
 
@@ -67,7 +67,7 @@ private:
     bool nillable_;
     bool extension_;
     OUString externalDescriptor_;
-    com::sun::star::uno::Any value_;
+    css::uno::Any value_;
 };
 
 }
diff --git a/configmgr/source/readonlyaccess.hxx b/configmgr/source/readonlyaccess.hxx
index 7e9db8120bf8..9b8d903d5504 100644
--- a/configmgr/source/readonlyaccess.hxx
+++ b/configmgr/source/readonlyaccess.hxx
@@ -23,14 +23,14 @@ namespace com { namespace sun { namespace star {
 
 namespace configmgr { namespace read_only_access {
 
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
+css::uno::Reference< css::uno::XInterface > SAL_CALL
 create(
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+    css::uno::Reference< css::uno::XComponentContext >
         const &);
 
 OUString SAL_CALL getImplementationName();
 
-com::sun::star::uno::Sequence< OUString > SAL_CALL
+css::uno::Sequence< OUString > SAL_CALL
 getSupportedServiceNames();
 
 } }
diff --git a/configmgr/source/readwriteaccess.hxx b/configmgr/source/readwriteaccess.hxx
index 98649a250bb3..82f8300ccfe0 100644
--- a/configmgr/source/readwriteaccess.hxx
+++ b/configmgr/source/readwriteaccess.hxx
@@ -23,14 +23,14 @@ namespace com { namespace sun { namespace star {
 
 namespace configmgr { namespace read_write_access {
 
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
+css::uno::Reference< css::uno::XInterface > SAL_CALL
 create(
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+    css::uno::Reference< css::uno::XComponentContext >
         const &);
 
 OUString SAL_CALL getImplementationName();
 
-com::sun::star::uno::Sequence< OUString > SAL_CALL
+css::uno::Sequence< OUString > SAL_CALL
 getSupportedServiceNames();
 
 } }
diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx
index 4f80907a90db..e775dda4512d 100644
--- a/configmgr/source/rootaccess.hxx
+++ b/configmgr/source/rootaccess.hxx
@@ -54,8 +54,8 @@ class Components;
 class Node;
 
 class RootAccess:
-    public Access, public com::sun::star::util::XChangesNotifier,
-    public com::sun::star::util::XChangesBatch
+    public Access, public css::util::XChangesNotifier,
+    public css::util::XChangesBatch
 {
 public:
     RootAccess(
@@ -80,26 +80,26 @@ public:
     void setAlive(bool b);
 
     virtual void SAL_CALL addChangesListener(
-        com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >
+        css::uno::Reference< css::util::XChangesListener >
             const & aListener)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL removeChangesListener(
-        com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >
+        css::uno::Reference< css::util::XChangesListener >
             const & aListener)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL commitChanges()
         throw (
-            com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException,
+            css::lang::WrappedTargetException,
+            css::uno::RuntimeException,
             std::exception) SAL_OVERRIDE;
 
     virtual sal_Bool SAL_CALL hasPendingChanges()
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual com::sun::star::util::ChangesSet SAL_CALL getPendingChanges()
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::util::ChangesSet SAL_CALL getPendingChanges()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
     virtual ~RootAccess();
@@ -118,7 +118,7 @@ private:
 
     virtual rtl::Reference< Access > getParentAccess() SAL_OVERRIDE;
 
-    virtual void addTypes(std::vector< com::sun::star::uno::Type > * types)
+    virtual void addTypes(std::vector< css::uno::Type > * types)
         const SAL_OVERRIDE;
 
     virtual void addSupportedServiceNames(
@@ -128,17 +128,17 @@ private:
 
     virtual void clearListeners() throw () SAL_OVERRIDE;
 
-    virtual com::sun::star::uno::Any SAL_CALL queryInterface(
-        com::sun::star::uno::Type const & aType)
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Any SAL_CALL queryInterface(
+        css::uno::Type const & aType)
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual OUString SAL_CALL getImplementationName()
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     typedef
         std::multiset<
-            com::sun::star::uno::Reference<
-                com::sun::star::util::XChangesListener > >
+            css::uno::Reference<
+                css::util::XChangesListener > >
         ChangesListeners;
 
     OUString pathRepresentation_;
diff --git a/configmgr/source/type.hxx b/configmgr/source/type.hxx
index cece6a2dbfdd..091c3f353cb4 100644
--- a/configmgr/source/type.hxx
+++ b/configmgr/source/type.hxx
@@ -39,9 +39,9 @@ bool isListType(Type type);
 
 Type elementType(Type type);
 
-com::sun::star::uno::Type mapType(Type type);
+css::uno::Type mapType(Type type);
 
-Type getDynamicType(com::sun::star::uno::Any const & value);
+Type getDynamicType(css::uno::Any const & value);
 
 }
 
diff --git a/configmgr/source/update.hxx b/configmgr/source/update.hxx
index cd37c6c1b1c8..c1ede9b21caf 100644
--- a/configmgr/source/update.hxx
+++ b/configmgr/source/update.hxx
@@ -35,14 +35,14 @@ namespace com { namespace sun { namespace star {
 
 namespace configmgr { namespace update {
 
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
+css::uno::Reference< css::uno::XInterface > SAL_CALL
 create(
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+    css::uno::Reference< css::uno::XComponentContext >
         const &);
 
 OUString SAL_CALL getImplementationName();
 
-com::sun::star::uno::Sequence< OUString > SAL_CALL
+css::uno::Sequence< OUString > SAL_CALL
 getSupportedServiceNames();
 
 } }
diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx
index e15b303726a5..f2c3b3c2e5bb 100644
--- a/configmgr/source/valueparser.hxx
+++ b/configmgr/source/valueparser.hxx
@@ -71,7 +71,7 @@ private:
     ValueParser(const ValueParser&) SAL_DELETED_FUNCTION;
     ValueParser& operator=(const ValueParser&) SAL_DELETED_FUNCTION;
 
-    template< typename T > com::sun::star::uno::Any convertItems();
+    template< typename T > css::uno::Any convertItems();
 
     enum State { STATE_TEXT, STATE_TEXT_UNICODE, STATE_IT, STATE_IT_UNICODE };
 
@@ -80,7 +80,7 @@ private:
     OUString localizedName_;
     State state_;
     xmlreader::Pad pad_;
-    std::vector< com::sun::star::uno::Any > items_;
+    std::vector< css::uno::Any > items_;
 };
 
 }