com::sun::star->css in scaddins,sccomp,scripting

Change-Id: Id9167341940bac65f055e1e33ff0670f6fa0f6c4
Reviewed-on: https://gerrit.libreoffice.org/19629
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

20 files changed, 584 insertions, 589 deletions

diff --git a/scripting/source/basprov/baslibnode.hxx b/scripting/source/basprov/baslibnode.hxx
index 8b9e61b6cce9..f9a82af1e846 100644
--- a/scripting/source/basprov/baslibnode.hxx
+++ b/scripting/source/basprov/baslibnode.hxx
@@ -39,37 +39,37 @@ namespace basprov
 
 
     typedef ::cppu::WeakImplHelper<
-        ::com::sun::star::script::browse::XBrowseNode > BasicLibraryNodeImpl_BASE;
+        css::script::browse::XBrowseNode > BasicLibraryNodeImpl_BASE;
 
 
     class BasicLibraryNodeImpl : public BasicLibraryNodeImpl_BASE
     {
     private:
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >    m_xContext;
-     OUString  m_sScriptingContext;
-        BasicManager* m_pBasicManager;
-        ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer > m_xLibContainer;
-        ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xLibrary;
-        OUString m_sLibName;
-        bool m_bIsAppScript;
+        css::uno::Reference< css::uno::XComponentContext >    m_xContext;
+        OUString                                              m_sScriptingContext;
+        BasicManager*                                         m_pBasicManager;
+        css::uno::Reference< css::script::XLibraryContainer > m_xLibContainer;
+        css::uno::Reference< css::container::XNameContainer > m_xLibrary;
+        OUString                                              m_sLibName;
+        bool                                                  m_bIsAppScript;
 
     public:
-        BasicLibraryNodeImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+        BasicLibraryNodeImpl( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
         const OUString& sScriptingContext,
             BasicManager* pBasicManager,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer,
+            const css::uno::Reference< css::script::XLibraryContainer >& xLibContainer,
             const OUString& sLibName, bool isAppScript=true );
         virtual ~BasicLibraryNodeImpl();
 
         // XBrowseNode
         virtual OUString SAL_CALL getName(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual sal_Bool SAL_CALL hasChildNodes(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual sal_Int16 SAL_CALL getType(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
     };
 
 
diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx
index 05f7028b6fd3..547d5a10d1e2 100644
--- a/scripting/source/basprov/basmethnode.hxx
+++ b/scripting/source/basprov/basmethnode.hxx
@@ -44,8 +44,8 @@ namespace basprov
 
 
     typedef ::cppu::WeakImplHelper<
-        ::com::sun::star::script::browse::XBrowseNode,
-        ::com::sun::star::script::XInvocation > BasicMethodNodeImpl_BASE;
+        css::script::browse::XBrowseNode,
+        css::script::XInvocation > BasicMethodNodeImpl_BASE;
 
     class BasicMethodNodeImpl : public BasicMethodNodeImpl_BASE,
                                 public ::scripting_helper::OMutexHolder,
@@ -54,8 +54,8 @@ namespace basprov
                                 public ::comphelper::OPropertyArrayUsageHelper< BasicMethodNodeImpl >
     {
     private:
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >    m_xContext;
-    OUString m_sScriptingContext;
+        css::uno::Reference< css::uno::XComponentContext >    m_xContext;
+        OUString m_sScriptingContext;
         SbMethod* m_pMethod;
         bool m_bIsAppScript;
 
@@ -71,7 +71,7 @@ namespace basprov
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper(  ) const override;
 
     public:
-        BasicMethodNodeImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+        BasicMethodNodeImpl( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
             const OUString& sScriptingContext,
             SbMethod* pMethod, bool isAppScript = true );
         virtual ~BasicMethodNodeImpl();
@@ -84,37 +84,37 @@ namespace basprov
 
         // XBrowseNode
         virtual OUString SAL_CALL getName(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual sal_Bool SAL_CALL hasChildNodes(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual sal_Int16 SAL_CALL getType(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         // XPropertySet
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
+            throw (css::uno::RuntimeException, std::exception) override;
 
         // XInvocation
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > SAL_CALL getIntrospection(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Any SAL_CALL invoke(
+        virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(  )
+            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL invoke(
             const OUString& aFunctionName,
-            const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams,
-            ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
-            ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam )
-            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException,
-                   ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
-            throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::script::CannotConvertException,
-                   ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Any SAL_CALL getValue( const OUString& aPropertyName )
-            throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::uno::Any >& aParams,
+            css::uno::Sequence< sal_Int16 >& aOutParamIndex,
+            css::uno::Sequence< css::uno::Any >& aOutParam )
+            throw (css::lang::IllegalArgumentException, css::script::CannotConvertException,
+                   css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue )
+            throw (css::beans::UnknownPropertyException, css::script::CannotConvertException,
+                   css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName )
+            throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
         virtual sal_Bool SAL_CALL hasMethod( const OUString& aName )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual sal_Bool SAL_CALL hasProperty( const OUString& aName )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
     };
 
 
diff --git a/scripting/source/basprov/basmodnode.hxx b/scripting/source/basprov/basmodnode.hxx
index 308a0ac2041c..7af9c97b8107 100644
--- a/scripting/source/basprov/basmodnode.hxx
+++ b/scripting/source/basprov/basmodnode.hxx
@@ -38,32 +38,32 @@ namespace basprov
 
 
     typedef ::cppu::WeakImplHelper<
-        ::com::sun::star::script::browse::XBrowseNode > BasicModuleNodeImpl_BASE;
+        css::script::browse::XBrowseNode > BasicModuleNodeImpl_BASE;
 
 
     class BasicModuleNodeImpl : public BasicModuleNodeImpl_BASE
     {
     private:
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >    m_xContext;
-    OUString m_sScriptingContext;
+        css::uno::Reference< css::uno::XComponentContext >    m_xContext;
+        OUString m_sScriptingContext;
         SbModule* m_pModule;
         bool m_bIsAppScript;
 
     public:
-        BasicModuleNodeImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+        BasicModuleNodeImpl( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
             const OUString& sScriptingContext,
             SbModule* pModule, bool isAppScript = true );
         virtual ~BasicModuleNodeImpl();
 
         // XBrowseNode
         virtual OUString SAL_CALL getName(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual sal_Bool SAL_CALL hasChildNodes(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual sal_Int16 SAL_CALL getType(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
     };
 
 
diff --git a/scripting/source/basprov/basprov.hxx b/scripting/source/basprov/basprov.hxx
index 19a0deccc0d7..40b8304a43ae 100644
--- a/scripting/source/basprov/basprov.hxx
+++ b/scripting/source/basprov/basprov.hxx
@@ -43,10 +43,10 @@ namespace basprov
 
 
     typedef ::cppu::WeakImplHelper<
-        ::com::sun::star::lang::XServiceInfo,
-        ::com::sun::star::lang::XInitialization,
-        ::com::sun::star::script::provider::XScriptProvider,
-        ::com::sun::star::script::browse::XBrowseNode > BasicProviderImpl_BASE;
+        css::lang::XServiceInfo,
+        css::lang::XInitialization,
+        css::script::provider::XScriptProvider,
+        css::script::browse::XBrowseNode > BasicProviderImpl_BASE;
 
 
     class BasicProviderImpl : public BasicProviderImpl_BASE
@@ -54,49 +54,49 @@ namespace basprov
     private:
         BasicManager*   m_pAppBasicManager;
         BasicManager*   m_pDocBasicManager;
-        ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >             m_xLibContainerApp;
-        ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >             m_xLibContainerDoc;
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >                m_xContext;
-        ::com::sun::star::uno::Reference< ::com::sun::star::document::XScriptInvocationContext >    m_xInvocationContext;
+        css::uno::Reference< css::script::XLibraryContainer >             m_xLibContainerApp;
+        css::uno::Reference< css::script::XLibraryContainer >             m_xLibContainerDoc;
+        css::uno::Reference< css::uno::XComponentContext >                m_xContext;
+        css::uno::Reference< css::document::XScriptInvocationContext >    m_xInvocationContext;
         OUString  m_sScriptingContext;
         bool m_bIsAppScriptCtx;
         bool m_bIsUserCtx;
 
         bool isLibraryShared(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& rxLibContainer,
+            const css::uno::Reference< css::script::XLibraryContainer >& rxLibContainer,
             const OUString& rLibName );
 
     public:
         BasicProviderImpl(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
+            const css::uno::Reference< css::uno::XComponentContext >& xContext );
         virtual ~BasicProviderImpl();
 
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
+            throw (css::uno::RuntimeException, std::exception) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
-            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
         // XScriptProvider
-        virtual ::com::sun::star::uno::Reference < ::com::sun::star::script::provider::XScript > SAL_CALL getScript(
+        virtual css::uno::Reference < css::script::provider::XScript > SAL_CALL getScript(
             const OUString& scriptURI )
-            throw (  ::com::sun::star::script::provider::ScriptFrameworkErrorException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (  css::script::provider::ScriptFrameworkErrorException, css::uno::RuntimeException, std::exception) override;
 
         // XBrowseNode
         virtual OUString SAL_CALL getName(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual sal_Bool SAL_CALL hasChildNodes(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual sal_Int16 SAL_CALL getType(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
     };
 
 
diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx
index 94061f4dc4f3..6805cd69cc34 100644
--- a/scripting/source/basprov/basscript.hxx
+++ b/scripting/source/basprov/basscript.hxx
@@ -41,7 +41,7 @@ namespace basprov
 
 
     typedef ::cppu::WeakImplHelper<
-        ::com::sun::star::script::provider::XScript > BasicScriptImpl_BASE;
+        css::script::provider::XScript > BasicScriptImpl_BASE;
 
 
     class BasicScriptImpl : public BasicScriptImpl_BASE, public SfxListener,
@@ -52,14 +52,14 @@ namespace basprov
     {
     private:
         SbMethodRef         m_xMethod;
-        OUString     m_funcName;
+        OUString            m_funcName;
         BasicManager*       m_documentBasicManager;
-        ::com::sun::star::uno::Reference< ::com::sun::star::document::XScriptInvocationContext >
+        css::uno::Reference< css::document::XScriptInvocationContext >
                             m_xDocumentScriptContext;
         // hack, OPropertyContainer doesn't allow you to define a property of unknown
         // type ( I guess because an Any can't contain an Any... I've always wondered why?
     // as its not unusual to do that in corba )
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_caller;
+        css::uno::Sequence< css::uno::Any > m_caller;
     protected:
         // OPropertySetHelper
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(  ) override;
@@ -76,7 +76,7 @@ namespace basprov
             const OUString& funcName,
             SbMethodRef xMethod,
             BasicManager& documentBasicManager,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::document::XScriptInvocationContext >& documentScriptContext
+            const css::uno::Reference< css::document::XScriptInvocationContext >& documentScriptContext
         );
         virtual ~BasicScriptImpl();
 
@@ -87,17 +87,17 @@ namespace basprov
         DECLARE_XTYPEPROVIDER()
 
         // XScript
-        virtual ::com::sun::star::uno::Any SAL_CALL invoke(
-            const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams,
-            ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
-            ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam )
+        virtual css::uno::Any SAL_CALL invoke(
+            const css::uno::Sequence< css::uno::Any >& aParams,
+            css::uno::Sequence< sal_Int16 >& aOutParamIndex,
+            css::uno::Sequence< css::uno::Any >& aOutParam )
             throw (
-                    ::com::sun::star::script::provider::ScriptFrameworkErrorException,
-                    ::com::sun::star::reflection::InvocationTargetException,
-                    ::com::sun::star::uno::RuntimeException, std::exception ) override;
+                    css::script::provider::ScriptFrameworkErrorException,
+                    css::reflection::InvocationTargetException,
+                    css::uno::RuntimeException, std::exception ) override;
         // XPropertySet
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
+            throw (css::uno::RuntimeException, std::exception) override;
 
         // SfxListener
         virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
diff --git a/scripting/source/dlgprov/DialogModelProvider.hxx b/scripting/source/dlgprov/DialogModelProvider.hxx
index ef278b37da05..ccf04a80d16d 100644
--- a/scripting/source/dlgprov/DialogModelProvider.hxx
+++ b/scripting/source/dlgprov/DialogModelProvider.hxx
@@ -41,37 +41,37 @@ class DialogModelProvider:
 public:
     explicit DialogModelProvider(css::uno::Reference< css::uno::XComponentContext > const & context);
 private:
-    // ::com::sun::star::lang::XInitialization:
-    virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
+    // css::lang::XInitialization:
+    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
 
-    // ::com::sun::star::container::XElementAccess:
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override;
+    // css::container::XElementAccess:
+    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override;
 
-    // ::com::sun::star::container::XNameAccess:
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception) override;
+    // css::container::XNameAccess:
+    virtual css::uno::Any SAL_CALL getByName(const OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception) override;
     virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL hasByName(const OUString & aName) throw (css::uno::RuntimeException, std::exception) override;
 
-    // ::com::sun::star::container::XNameReplace:
-    virtual void SAL_CALL replaceByName(const OUString & aName, const ::com::sun::star::uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception) override;
+    // css::container::XNameReplace:
+    virtual void SAL_CALL replaceByName(const OUString & aName, const css::uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception) override;
 
-    // ::com::sun::star::container::XNameContainer:
-    virtual void SAL_CALL insertByName(const OUString & aName, const ::com::sun::star::uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, std::exception) override;
+    // css::container::XNameContainer:
+    virtual void SAL_CALL insertByName(const OUString & aName, const css::uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, std::exception) override;
     virtual void SAL_CALL removeByName(const OUString & Name) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception) override;
 
-    // ::com::sun::star::lang::XServiceInfo:
+    // css::lang::XServiceInfo:
     virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& 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) override;
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
 private:
     DialogModelProvider(const DialogModelProvider &) = delete;
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index afb21e755351..8dfa86a2e622 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -327,7 +327,7 @@ namespace dlgprov
 
 
     void SAL_CALL DialogEventsAttacherImpl::attachEvents( const Sequence< Reference< XInterface > >& Objects,
-        const com::sun::star::uno::Reference<com::sun::star::script::XScriptListener>&,
+        const css::uno::Reference<css::script::XScriptListener>&,
         const Any& Helper )
         throw (IllegalArgumentException, IntrospectionException, CannotCreateAdapterException,
                ServiceNotRegisteredException, RuntimeException, std::exception)
@@ -448,10 +448,10 @@ namespace dlgprov
 
 
     DialogUnoScriptListenerImpl::DialogUnoScriptListenerImpl( const Reference< XComponentContext >& rxContext,
-            const Reference< ::com::sun::star::frame::XModel >& rxModel,
-            const Reference< ::com::sun::star::awt::XControl >& rxControl,
-            const Reference< ::com::sun::star::uno::XInterface >& rxHandler,
-            const Reference< ::com::sun::star::beans::XIntrospectionAccess >& rxIntrospectionAccess,
+            const Reference< css::frame::XModel >& rxModel,
+            const Reference< css::awt::XControl >& rxControl,
+            const Reference< css::uno::XInterface >& rxHandler,
+            const Reference< css::beans::XIntrospectionAccess >& rxIntrospectionAccess,
             bool bDialogProviderMode )
         : DialogSFScriptListenerImpl( rxContext, rxModel )
         ,m_xControl( rxControl )
diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx
index 8debbea1b63a..01c13139c3dc 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -38,12 +38,12 @@ namespace dlgprov
 {
     // class DialogEventsAttacherImpl
     typedef std::unordered_map< OUString,
-        ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >,
+        css::uno::Reference< css::script::XScriptListener >,
         OUStringHash,
         std::equal_to< OUString > > ListenerHash;
 
     typedef ::cppu::WeakImplHelper<
-        ::com::sun::star::script::XScriptEventsAttacher > DialogEventsAttacherImpl_BASE;
+        css::script::XScriptEventsAttacher > DialogEventsAttacherImpl_BASE;
 
 
     class DialogEventsAttacherImpl : public DialogEventsAttacherImpl_BASE
@@ -51,32 +51,32 @@ namespace dlgprov
     private:
         bool mbUseFakeVBAEvents;
         ListenerHash listernersForTypes;
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
-        ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacher > m_xEventAttacher;
-        ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener > getScriptListenerForKey( const OUString& sScriptName ) throw ( ::com::sun::star::uno::RuntimeException );
-        ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier > getFakeVbaEventsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, OUString& sCodeName );
-        void nestedAttachEvents( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& Objects, const ::com::sun::star::uno::Any& Helper, OUString& sDialogCodeName );
-        void attachEventsToControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier >& events, const ::com::sun::star::uno::Any& Helper  );
+        css::uno::Reference< css::uno::XComponentContext > m_xContext;
+        css::uno::Reference< css::script::XEventAttacher > m_xEventAttacher;
+        css::uno::Reference< css::script::XScriptListener > getScriptListenerForKey( const OUString& sScriptName ) throw ( css::uno::RuntimeException );
+        css::uno::Reference< css::script::XScriptEventsSupplier > getFakeVbaEventsSupplier( const css::uno::Reference< css::awt::XControl>& xControl, OUString& sCodeName );
+        void nestedAttachEvents( const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& Objects, const css::uno::Any& Helper, OUString& sDialogCodeName );
+        void attachEventsToControl( const css::uno::Reference< css::awt::XControl>& xControl, const css::uno::Reference< css::script::XScriptEventsSupplier >& events, const css::uno::Any& Helper  );
     public:
-        DialogEventsAttacherImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel,
-             const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& xControl,
-             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler,
-             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess >& xIntrospect,
+        DialogEventsAttacherImpl( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+             const css::uno::Reference< css::frame::XModel >& xModel,
+             const css::uno::Reference< css::awt::XControl >& xControl,
+             const css::uno::Reference< css::uno::XInterface >& xHandler,
+             const css::uno::Reference< css::beans::XIntrospectionAccess >& xIntrospect,
              bool bProviderMode,
-             const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >& xRTLListener ,const OUString& sDialogLibName );
+             const css::uno::Reference< css::script::XScriptListener >& xRTLListener ,const OUString& sDialogLibName );
         virtual ~DialogEventsAttacherImpl();
 
         // XScriptEventsAttacher
-        virtual void SAL_CALL attachEvents( const ::com::sun::star::uno::Sequence<
-            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& Objects,
-            const com::sun::star::uno::Reference<com::sun::star::script::XScriptListener>&,
-            const ::com::sun::star::uno::Any& Helper )
-            throw (::com::sun::star::lang::IllegalArgumentException,
-                   ::com::sun::star::beans::IntrospectionException,
-                   ::com::sun::star::script::CannotCreateAdapterException,
-                   ::com::sun::star::lang::ServiceNotRegisteredException,
-                   ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL attachEvents( const css::uno::Sequence<
+            css::uno::Reference< css::uno::XInterface > >& Objects,
+            const css::uno::Reference<css::script::XScriptListener>&,
+            const css::uno::Any& Helper )
+            throw (css::lang::IllegalArgumentException,
+                   css::beans::IntrospectionException,
+                   css::script::CannotCreateAdapterException,
+                   css::lang::ServiceNotRegisteredException,
+                   css::uno::RuntimeException, std::exception) override;
     };
 
 
@@ -85,32 +85,32 @@ namespace dlgprov
 
 
     typedef ::cppu::WeakImplHelper<
-        ::com::sun::star::script::XAllListener > DialogAllListenerImpl_BASE;
+        css::script::XAllListener > DialogAllListenerImpl_BASE;
 
 
     class DialogAllListenerImpl : public DialogAllListenerImpl_BASE
     {
     private:
-        ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener > m_xScriptListener;
+        css::uno::Reference< css::script::XScriptListener > m_xScriptListener;
         OUString m_sScriptType;
         OUString m_sScriptCode;
 
-        void firing_impl( const ::com::sun::star::script::AllEventObject& Event, ::com::sun::star::uno::Any* pRet );
+        void firing_impl( const css::script::AllEventObject& Event, css::uno::Any* pRet );
 
     public:
-        DialogAllListenerImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >& rxListener,
+        DialogAllListenerImpl( const css::uno::Reference< css::script::XScriptListener >& rxListener,
             const OUString& rScriptType, const OUString& rScriptCode );
         virtual ~DialogAllListenerImpl();
 
         // XEventListener
-        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
+            throw (css::uno::RuntimeException, std::exception) override;
 
         // XAllListener
-        virtual void SAL_CALL firing( const ::com::sun::star::script::AllEventObject& Event )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Any SAL_CALL approveFiring( const ::com::sun::star::script::AllEventObject& Event )
-            throw (::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL firing( const css::script::AllEventObject& Event )
+            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL approveFiring( const css::script::AllEventObject& Event )
+            throw (css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override;
     };
 
 
@@ -119,27 +119,27 @@ namespace dlgprov
 
 
     typedef ::cppu::WeakImplHelper<
-        ::com::sun::star::script::XScriptListener > DialogScriptListenerImpl_BASE;
+        css::script::XScriptListener > DialogScriptListenerImpl_BASE;
 
 
     class DialogScriptListenerImpl : public DialogScriptListenerImpl_BASE
     {
     protected:
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
-        virtual void firing_impl( const ::com::sun::star::script::ScriptEvent& aScriptEvent, ::com::sun::star::uno::Any* pRet ) = 0;
+        css::uno::Reference< css::uno::XComponentContext > m_xContext;
+        virtual void firing_impl( const css::script::ScriptEvent& aScriptEvent, css::uno::Any* pRet ) = 0;
     public:
-        DialogScriptListenerImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) : m_xContext( rxContext ) {}
+        DialogScriptListenerImpl( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : m_xContext( rxContext ) {}
         virtual ~DialogScriptListenerImpl();
 
         // XEventListener
-        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
+            throw (css::uno::RuntimeException, std::exception) override;
 
         // XScriptListener
-        virtual void SAL_CALL firing( const ::com::sun::star::script::ScriptEvent& aScriptEvent )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Any SAL_CALL approveFiring( const ::com::sun::star::script::ScriptEvent& aScriptEvent )
-            throw (::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL firing( const css::script::ScriptEvent& aScriptEvent )
+            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL approveFiring( const css::script::ScriptEvent& aScriptEvent )
+            throw (css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override;
     };
 
 
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index c6b23ba052e0..1107fc711094 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -97,7 +97,7 @@ static const char aResourceResolverPropName[] = "ResourceResolver";
         aInetObj.removeSegment();
         OUString aDlgLocation = aInetObj.GetMainURL( INetURLObject::NO_DECODE );
         bool bReadOnly = true;
-        ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale();
+        css::lang::Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale();
         OUString aComment;
 
         Sequence<Any> aArgs( 6 );
diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx
index 3bdddc8151dd..0b1dccc3888e 100644
--- a/scripting/source/dlgprov/dlgprov.hxx
+++ b/scripting/source/dlgprov/dlgprov.hxx
@@ -54,100 +54,100 @@ namespace dlgprov
 
     // class DialogProviderImpl
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > lcl_createControlModel(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext);
-    ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > lcl_getStringResourceManager(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext,const OUString& i_sURL);
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > lcl_createDialogModel(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext,
-                const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInput,
-                const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel,
-                const ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager >& xStringResourceManager,
-                const ::com::sun::star::uno::Any &aDialogSourceURL) throw ( ::com::sun::star::uno::Exception );
+    css::uno::Reference< css::container::XNameContainer > lcl_createControlModel(const css::uno::Reference< css::uno::XComponentContext >& i_xContext);
+    css::uno::Reference< css::resource::XStringResourceManager > lcl_getStringResourceManager(const css::uno::Reference< css::uno::XComponentContext >& i_xContext,const OUString& i_sURL);
+    css::uno::Reference< css::container::XNameContainer > lcl_createDialogModel(
+                const css::uno::Reference< css::uno::XComponentContext >& i_xContext,
+                const css::uno::Reference< css::io::XInputStream >& xInput,
+                const css::uno::Reference< css::frame::XModel >& xModel,
+                const css::uno::Reference< css::resource::XStringResourceManager >& xStringResourceManager,
+                const css::uno::Any &aDialogSourceURL) throw ( css::uno::Exception );
 
     typedef ::cppu::WeakImplHelper<
-        ::com::sun::star::lang::XServiceInfo,
-        ::com::sun::star::lang::XInitialization,
-        ::com::sun::star::awt::XDialogProvider2,
-        ::com::sun::star::awt::XContainerWindowProvider > DialogProviderImpl_BASE;
+        css::lang::XServiceInfo,
+        css::lang::XInitialization,
+        css::awt::XDialogProvider2,
+        css::awt::XContainerWindowProvider > DialogProviderImpl_BASE;
 
     class DialogProviderImpl : public DialogProviderImpl_BASE
     {
     private:
         struct BasicRTLParams
         {
-             ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > mxInput;
-             ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxDlgLib;
-             ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener > mxBasicRTLListener;
+             css::uno::Reference< css::io::XInputStream >          mxInput;
+             css::uno::Reference< css::container::XNameContainer > mxDlgLib;
+             css::uno::Reference< css::script::XScriptListener >   mxBasicRTLListener;
         };
         std::unique_ptr< BasicRTLParams > m_BasicInfo;
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >        m_xContext;
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >                 m_xModel;
+        css::uno::Reference< css::uno::XComponentContext >        m_xContext;
+        css::uno::Reference< css::frame::XModel >                 m_xModel;
 
     OUString msDialogLibName;
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > createDialogModel( const OUString& sURL );
+        css::uno::Reference< css::awt::XControlModel > createDialogModel( const OUString& sURL );
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XUnoControlDialog > createDialogControl(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxDialogModel,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent );
+        css::uno::Reference< css::awt::XUnoControlDialog > createDialogControl(
+            const css::uno::Reference< css::awt::XControlModel >& rxDialogModel,
+            const css::uno::Reference< css::awt::XWindowPeer >& xParent );
 
-        void attachControlEvents( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxControlContainer,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxHandler,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess >& rxIntrospectionAccess,
+        void attachControlEvents( const css::uno::Reference< css::awt::XControl >& rxControlContainer,
+            const css::uno::Reference< css::uno::XInterface >& rxHandler,
+            const css::uno::Reference< css::beans::XIntrospectionAccess >& rxIntrospectionAccess,
             bool bDialogProviderMode );
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > inspectHandler(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxHandler );
+        css::uno::Reference< css::beans::XIntrospectionAccess > inspectHandler(
+            const css::uno::Reference< css::uno::XInterface >& rxHandler );
     // helper methods
-            ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createDialogModel(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInput,
-                const ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager >& xStringResourceManager,
-                const ::com::sun::star::uno::Any &aDialogSourceURL) throw ( ::com::sun::star::uno::Exception );
-            ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > createDialogModelForBasic() throw ( ::com::sun::star::uno::Exception );
+            css::uno::Reference< css::container::XNameContainer > createDialogModel(
+                const css::uno::Reference< css::io::XInputStream >& xInput,
+                const css::uno::Reference< css::resource::XStringResourceManager >& xStringResourceManager,
+                const css::uno::Any &aDialogSourceURL) throw ( css::uno::Exception );
+            css::uno::Reference< css::awt::XControlModel > createDialogModelForBasic() throw ( css::uno::Exception );
 
         // XDialogProvider / XDialogProvider2 impl method
-        ::com::sun::star::uno::Reference < ::com::sun::star::awt::XControl > SAL_CALL createDialogImpl(
+        css::uno::Reference < css::awt::XControl > SAL_CALL createDialogImpl(
             const OUString& URL,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent,
+            const css::uno::Reference< css::uno::XInterface >& xHandler,
+            const css::uno::Reference< css::awt::XWindowPeer >& xParent,
             bool bDialogProviderMode )
-                throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
 
     public:
         DialogProviderImpl(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+            const css::uno::Reference< css::uno::XComponentContext >& rxContext );
         virtual ~DialogProviderImpl();
 
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
+            throw (css::uno::RuntimeException, std::exception) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
-            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
         // XDialogProvider
-        virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XDialog > SAL_CALL createDialog(
+        virtual css::uno::Reference < css::awt::XDialog > SAL_CALL createDialog(
             const OUString& URL )
-            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 
         // XDialogProvider2
-        virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XDialog > SAL_CALL createDialogWithHandler(
+        virtual css::uno::Reference < css::awt::XDialog > SAL_CALL createDialogWithHandler(
             const OUString& URL,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler )
-            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::uno::XInterface >& xHandler )
+            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 
-        virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XDialog > SAL_CALL createDialogWithArguments(
+        virtual css::uno::Reference < css::awt::XDialog > SAL_CALL createDialogWithArguments(
             const OUString& URL,
-            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments )
-            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::beans::NamedValue >& Arguments )
+            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createContainerWindow(
+        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createContainerWindow(
             const OUString& URL, const OUString& WindowType,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler )
-            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::awt::XWindowPeer >& xParent,
+            const css::uno::Reference< css::uno::XInterface >& xHandler )
+            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
      };
 
 
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index 342964f238a3..1f5ef05a3d1b 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -93,7 +93,7 @@ void SAL_CALL ScriptProtocolHandler::initialize(
 
 Reference< XDispatch > SAL_CALL ScriptProtocolHandler::queryDispatch(
     const URL& aURL, const OUString& sTargetFrameName, sal_Int32 nSearchFlags )
-    throw( ::com::sun::star::uno::RuntimeException, std::exception )
+    throw( css::uno::RuntimeException, std::exception )
 {
     (void)sTargetFrameName;
     (void)nSearchFlags;
@@ -161,9 +161,9 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
                 {
                     if ( xListener.is() )
                     {
-                        ::com::sun::star::frame::DispatchResultEvent aEvent(
+                        css::frame::DispatchResultEvent aEvent(
                                 static_cast< ::cppu::OWeakObject* >( this ),
-                                ::com::sun::star::frame::DispatchResultState::FAILURE,
+                                css::frame::DispatchResultState::FAILURE,
                                 invokeResult );
                         try
                         {
@@ -285,17 +285,17 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
     {
         // always call dispatchFinished(), because we didn't load a document but
         // executed a macro instead!
-        ::com::sun::star::frame::DispatchResultEvent aEvent;
+        css::frame::DispatchResultEvent aEvent;
 
         aEvent.Source = static_cast< ::cppu::OWeakObject* >( this );
         aEvent.Result = invokeResult;
         if ( bSuccess )
         {
-            aEvent.State = ::com::sun::star::frame::DispatchResultState::SUCCESS;
+            aEvent.State = css::frame::DispatchResultState::SUCCESS;
         }
         else
         {
-            aEvent.State = ::com::sun::star::frame::DispatchResultState::FAILURE;
+            aEvent.State = css::frame::DispatchResultState::FAILURE;
         }
 
         try
@@ -522,11 +522,9 @@ extern "C"
         )
         {
             // Define variables which are used in following macros.
-            ::com::sun::star::uno::Reference<
-            ::com::sun::star::lang::XSingleServiceFactory > xFactory ;
-            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
-            xServiceManager( static_cast<
-            ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager ) ) ;
+            css::uno::Reference< css::lang::XSingleServiceFactory > xFactory;
+            css::uno::Reference< css::lang::XMultiServiceFactory > xServiceManager(
+                static_cast< css::lang::XMultiServiceFactory* >( pServiceManager ) ) ;
 
             if ( ::scripting_protocolhandler::ScriptProtocolHandler::impl_getStaticImplementationName().equals(
                 OUString::createFromAscii( pImplementationName ) ) )
diff --git a/scripting/source/protocolhandler/scripthandler.hxx b/scripting/source/protocolhandler/scripthandler.hxx
index 6e7a8776fb1c..8c033d3d288d 100644
--- a/scripting/source/protocolhandler/scripthandler.hxx
+++ b/scripting/source/protocolhandler/scripthandler.hxx
@@ -109,10 +109,10 @@ public:
 
     /* Implementation for X(Notifying)Dispatch */
     virtual void SAL_CALL dispatchWithNotification(
-    const css::util::URL& aURL,
-    const css::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArgs,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& Listener )
-    throw ( css::uno::RuntimeException, std::exception ) override;
+        const css::util::URL& aURL,
+        const css::uno::Sequence< css::beans::PropertyValue >& lArgs,
+        const css::uno::Reference< css::frame::XDispatchResultListener >& Listener )
+        throw ( css::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL dispatch(
         const css::util::URL& aURL,
         const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx
index 2b1595ee0840..c45e61873080 100644
--- a/scripting/source/provider/ActiveMSPList.cxx
+++ b/scripting/source/provider/ActiveMSPList.cxx
@@ -258,9 +258,8 @@ ActiveMSPList::addActiveMSP( const Reference< uno::XInterface >& xComponent,
 }
 
 
-void SAL_CALL
-ActiveMSPList::disposing( const ::com::sun::star::lang::EventObject& Source )
-throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+void SAL_CALL ActiveMSPList::disposing( const css::lang::EventObject& Source )
+throw ( css::uno::RuntimeException, std::exception )
 
 {
     try
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index bf21ae21adb1..78326a9109be 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -483,7 +483,7 @@ public:
 
     // XInterface
     virtual Any SAL_CALL queryInterface( const Type& aType )
-        throw ( com::sun::star::uno::RuntimeException, std::exception ) override
+        throw ( css::uno::RuntimeException, std::exception ) override
     {
         Any aRet = t_BrowseNodeBase::queryInterface( aType );
         if ( aRet.hasValue() )
@@ -517,12 +517,12 @@ public:
     // XTypeProvider (implemnented by base, but needs to be overridden for
     //                delegating to aggregate)
     virtual Sequence< Type > SAL_CALL getTypes()
-        throw ( com::sun::star::uno::RuntimeException, std::exception ) override
+        throw ( css::uno::RuntimeException, std::exception ) override
     {
         return m_xWrappedTypeProv->getTypes();
     }
     virtual Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw ( com::sun::star::uno::RuntimeException, std::exception ) override
+        throw ( css::uno::RuntimeException, std::exception ) override
     {
         return css::uno::Sequence<sal_Int8>();
     }
diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx
index a432e2389742..b3f79422f7b3 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -76,7 +76,7 @@ public:
     // XNameAccess
     virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw ( css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
 
     // XElementAccess
     virtual css::uno::Type SAL_CALL getElementType(  ) throw ( css::uno::RuntimeException, std::exception) override;
diff --git a/scripting/source/provider/ScriptImpl.hxx b/scripting/source/provider/ScriptImpl.hxx
index c8758f3224f8..773ee22c11eb 100644
--- a/scripting/source/provider/ScriptImpl.hxx
+++ b/scripting/source/provider/ScriptImpl.hxx
@@ -36,7 +36,7 @@ namespace func_provider
 {
 
 class ScriptImpl :
-            public ::cppu::WeakImplHelper < ::drafts::com::sun::star::script::framework::provider::XScript >
+            public ::cppu::WeakImplHelper < ::draftscss::script::framework::provider::XScript >
 {
 
 public:
@@ -47,7 +47,7 @@ public:
     */
     ScriptImpl(
         const css::uno::Reference< css::beans::XPropertySet > & scriptingContext,
-        const css::uno::Reference< ::drafts::com::sun::star::script::framework::runtime::XScriptInvocation > & runtimeMgr,
+        const css::uno::Reference< ::draftscss::script::framework::runtime::XScriptInvocation > & runtimeMgr,
         const OUString& scriptURI )
     throw ( css::uno::RuntimeException );
 
@@ -89,7 +89,7 @@ public:
 
 private:
     css::uno::Reference< css::beans::XPropertySet > m_XScriptingContext;
-    css::uno::Reference < ::drafts::com::sun::star::script::framework::runtime::XScriptInvocation > m_RunTimeManager;
+    css::uno::Reference < ::draftscss::script::framework::runtime::XScriptInvocation > m_RunTimeManager;
     OUString m_ScriptURI;
 
     /* copy ctor disabled, i.e. not defined */
diff --git a/scripting/source/provider/URIHelper.hxx b/scripting/source/provider/URIHelper.hxx
index 3291466462d6..cd28835843cd 100644
--- a/scripting/source/provider/URIHelper.hxx
+++ b/scripting/source/provider/URIHelper.hxx
@@ -69,7 +69,7 @@ public:
 
     virtual OUString SAL_CALL
         getRootStorageURI()
-            throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+            throw ( css::uno::RuntimeException, std::exception ) override;
 
     virtual OUString SAL_CALL
         getScriptURI( const OUString& rStorageURI )
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 79b018eb9edb..95ac7bedf04d 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -177,7 +177,7 @@ void StringResourceImpl::removeModifyListener( const Reference< XModifyListener
 
 OUString StringResourceImpl::implResolveString
     ( const OUString& ResourceID, LocaleItem* pLocaleItem )
-        throw (::com::sun::star::resource::MissingResourceException)
+        throw (css::resource::MissingResourceException)
 {
     OUString aRetStr;
     bool bSuccess = false;
@@ -194,20 +194,20 @@ OUString StringResourceImpl::implResolveString
     {
         OUString errorMsg("StringResourceImpl: No entry for ResourceID: ");
         errorMsg = errorMsg.concat( ResourceID );
-        throw ::com::sun::star::resource::MissingResourceException( errorMsg );
+        throw css::resource::MissingResourceException( errorMsg );
     }
     return aRetStr;
 }
 
 OUString StringResourceImpl::resolveString( const OUString& ResourceID )
-    throw (::com::sun::star::resource::MissingResourceException, RuntimeException, std::exception)
+    throw (css::resource::MissingResourceException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     return implResolveString( ResourceID, m_pCurrentLocaleItem );
 }
 
 OUString StringResourceImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale )
-    throw ( ::com::sun::star::resource::MissingResourceException, RuntimeException, std::exception)
+    throw ( css::resource::MissingResourceException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     LocaleItem* pLocaleItem = getItemForLocale( locale, false );
@@ -265,7 +265,7 @@ Sequence< OUString > StringResourceImpl::implGetResourceIDs( LocaleItem* pLocale
 }
 
 Sequence< OUString > StringResourceImpl::getResourceIDsForLocale
-    ( const Locale& locale ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+    ( const Locale& locale ) throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     LocaleItem* pLocaleItem = getItemForLocale( locale, false );
@@ -432,7 +432,7 @@ void StringResourceImpl::setStringForLocale
 }
 
 void StringResourceImpl::implRemoveId( const OUString& ResourceID, LocaleItem* pLocaleItem )
-    throw (::com::sun::star::resource::MissingResourceException)
+    throw (css::resource::MissingResourceException)
 {
     if( pLocaleItem != NULL && loadLocale( pLocaleItem ) )
     {
@@ -442,7 +442,7 @@ void StringResourceImpl::implRemoveId( const OUString& ResourceID, LocaleItem* p
         {
             OUString errorMsg("StringResourceImpl: No entries for ResourceID: ");
             errorMsg = errorMsg.concat( ResourceID );
-            throw ::com::sun::star::resource::MissingResourceException( errorMsg );
+            throw css::resource::MissingResourceException( errorMsg );
         }
         rHashMap.erase( it );
         pLocaleItem->m_bModified = true;
@@ -451,7 +451,7 @@ void StringResourceImpl::implRemoveId( const OUString& ResourceID, LocaleItem* p
 }
 
 void StringResourceImpl::removeId( const OUString& ResourceID )
-    throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
+    throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     implCheckReadOnly( "StringResourceImpl::removeId(): Read only" );
@@ -459,7 +459,7 @@ void StringResourceImpl::removeId( const OUString& ResourceID )
 }
 
 void StringResourceImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale )
-    throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
+    throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     implCheckReadOnly( "StringResourceImpl::removeIdForLocale(): Read only" );
@@ -642,7 +642,7 @@ sal_Int32 StringResourceImpl::getUniqueNumericId(  )
 
 LocaleItem* StringResourceImpl::getItemForLocale
     ( const Locale& locale, bool bException )
-        throw (::com::sun::star::lang::IllegalArgumentException)
+        throw (css::lang::IllegalArgumentException)
 {
     LocaleItem* pRetItem = NULL;
 
@@ -811,7 +811,7 @@ void StringResourcePersistenceImpl::implInitializeCommonParameters
         throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 1 );
     }
 
-    com::sun::star::lang::Locale aCurrentLocale;
+    css::lang::Locale aCurrentLocale;
     bool bLocaleOk = (aArguments[2] >>= aCurrentLocale);
     if( !bLocaleOk )
     {
@@ -859,12 +859,12 @@ void StringResourcePersistenceImpl::removeModifyListener( const Reference< XModi
 
 // XStringResourceResolver
 OUString StringResourcePersistenceImpl::resolveString( const OUString& ResourceID )
-    throw (::com::sun::star::resource::MissingResourceException, RuntimeException, std::exception)
+    throw (css::resource::MissingResourceException, RuntimeException, std::exception)
 {
     return StringResourceImpl::resolveString( ResourceID ) ;
 }
 OUString StringResourcePersistenceImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale )
-    throw ( ::com::sun::star::resource::MissingResourceException, RuntimeException, std::exception)
+    throw ( css::resource::MissingResourceException, RuntimeException, std::exception)
 {
     return StringResourceImpl::resolveStringForLocale( ResourceID, locale );
 }
@@ -928,17 +928,17 @@ void StringResourcePersistenceImpl::setStringForLocale
     StringResourceImpl::setStringForLocale( ResourceID, Str, locale );
 }
 Sequence< OUString > StringResourcePersistenceImpl::getResourceIDsForLocale
-    ( const Locale& locale ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+    ( const Locale& locale ) throw (css::uno::RuntimeException, std::exception)
 {
     return StringResourceImpl::getResourceIDsForLocale( locale );
 }
 void StringResourcePersistenceImpl::removeId( const OUString& ResourceID )
-    throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
+    throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
 {
     StringResourceImpl::removeId( ResourceID );
 }
 void StringResourcePersistenceImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale )
-    throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
+    throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
 {
     StringResourceImpl::removeIdForLocale( ResourceID, locale );
 }
@@ -975,7 +975,7 @@ sal_Bool StringResourcePersistenceImpl::isModified(  )
 }
 
 void StringResourcePersistenceImpl::setComment( const OUString& Comment )
-    throw (::com::sun::star::uno::RuntimeException, std::exception)
+    throw (css::uno::RuntimeException, std::exception)
 {
     m_aComment = Comment;
 }
@@ -995,7 +995,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage
 (
     const OUString& aNameBase,
     const OUString& aComment,
-    const Reference< ::com::sun::star::embed::XStorage >& Storage,
+    const Reference< css::embed::XStorage >& Storage,
     bool bUsedForStore,
     bool bStoreAll
 )
@@ -1106,7 +1106,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage
 
 void StringResourcePersistenceImpl::storeToURL( const OUString& URL,
     const OUString& NameBase, const OUString& Comment,
-    const Reference< ::com::sun::star::task::XInteractionHandler >& Handler )
+    const Reference< css::task::XInteractionHandler >& Handler )
         throw (Exception, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
@@ -1125,7 +1125,7 @@ void StringResourcePersistenceImpl::implKillRemovedLocaleFiles
 (
     const OUString& Location,
     const OUString& aNameBase,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xFileAccess
+    const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess
 )
     throw (Exception, RuntimeException, std::exception)
 {
@@ -1151,7 +1151,7 @@ void StringResourcePersistenceImpl::implKillChangedDefaultFiles
 (
     const OUString& Location,
     const OUString& aNameBase,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xFileAccess
+    const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess
 )
     throw (Exception, RuntimeException, std::exception)
 {
@@ -2356,12 +2356,12 @@ void StringResourceWithStorageImpl::removeModifyListener( const Reference< XModi
 
 // XStringResourceResolver
 OUString StringResourceWithStorageImpl::resolveString( const OUString& ResourceID )
-    throw (::com::sun::star::resource::MissingResourceException, RuntimeException, std::exception)
+    throw (css::resource::MissingResourceException, RuntimeException, std::exception)
 {
     return StringResourceImpl::resolveString( ResourceID ) ;
 }
 OUString StringResourceWithStorageImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale )
-    throw ( ::com::sun::star::resource::MissingResourceException, RuntimeException, std::exception)
+    throw ( css::resource::MissingResourceException, RuntimeException, std::exception)
 {
     return StringResourceImpl::resolveStringForLocale( ResourceID, locale );
 }
@@ -2382,7 +2382,7 @@ Sequence< OUString > StringResourceWithStorageImpl::getResourceIDs(  )
     return StringResourceImpl::getResourceIDs();
 }
 Sequence< OUString > StringResourceWithStorageImpl::getResourceIDsForLocale
-    ( const Locale& locale ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+    ( const Locale& locale ) throw (css::uno::RuntimeException, std::exception)
 {
     return StringResourceImpl::getResourceIDsForLocale( locale );
 }
@@ -2430,12 +2430,12 @@ void StringResourceWithStorageImpl::setStringForLocale
     StringResourceImpl::setStringForLocale( ResourceID, Str, locale );
 }
 void StringResourceWithStorageImpl::removeId( const OUString& ResourceID )
-    throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
+    throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
 {
     StringResourceImpl::removeId( ResourceID );
 }
 void StringResourceWithStorageImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale )
-    throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
+    throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
 {
     StringResourceImpl::removeIdForLocale( ResourceID, locale );
 }
@@ -2478,7 +2478,7 @@ sal_Bool StringResourceWithStorageImpl::isModified(  )
     return StringResourcePersistenceImpl::isModified();
 }
 void StringResourceWithStorageImpl::setComment( const OUString& Comment )
-    throw (::com::sun::star::uno::RuntimeException, std::exception)
+    throw (css::uno::RuntimeException, std::exception)
 {
     StringResourcePersistenceImpl::setComment( Comment );
 }
@@ -2490,7 +2490,7 @@ void StringResourceWithStorageImpl::storeToStorage( const Reference< XStorage >&
 }
 void StringResourceWithStorageImpl::storeToURL( const OUString& URL,
     const OUString& NameBase, const OUString& Comment,
-    const Reference< ::com::sun::star::task::XInteractionHandler >& Handler )
+    const Reference< css::task::XInteractionHandler >& Handler )
         throw (Exception, RuntimeException, std::exception)
 {
     StringResourcePersistenceImpl::storeToURL( URL, NameBase, Comment, Handler );
@@ -2697,12 +2697,12 @@ void StringResourceWithLocationImpl::removeModifyListener( const Reference< XMod
 
 // XStringResourceResolver
 OUString StringResourceWithLocationImpl::resolveString( const OUString& ResourceID )
-    throw (::com::sun::star::resource::MissingResourceException, RuntimeException, std::exception)
+    throw (css::resource::MissingResourceException, RuntimeException, std::exception)
 {
     return StringResourceImpl::resolveString( ResourceID ) ;
 }
 OUString StringResourceWithLocationImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale )
-    throw ( ::com::sun::star::resource::MissingResourceException, RuntimeException, std::exception)
+    throw ( css::resource::MissingResourceException, RuntimeException, std::exception)
 {
     return StringResourceImpl::resolveStringForLocale( ResourceID, locale );
 }
@@ -2723,7 +2723,7 @@ Sequence< OUString > StringResourceWithLocationImpl::getResourceIDs(  )
     return StringResourceImpl::getResourceIDs();
 }
 Sequence< OUString > StringResourceWithLocationImpl::getResourceIDsForLocale
-    ( const Locale& locale ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+    ( const Locale& locale ) throw (css::uno::RuntimeException, std::exception)
 {
     return StringResourceImpl::getResourceIDsForLocale( locale );
 }
@@ -2771,12 +2771,12 @@ void StringResourceWithLocationImpl::setStringForLocale
     StringResourceImpl::setStringForLocale( ResourceID, Str, locale );
 }
 void StringResourceWithLocationImpl::removeId( const OUString& ResourceID )
-    throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
+    throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
 {
     StringResourceImpl::removeId( ResourceID );
 }
 void StringResourceWithLocationImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale )
-    throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
+    throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
 {
     StringResourceImpl::removeIdForLocale( ResourceID, locale );
 }
@@ -2821,7 +2821,7 @@ sal_Bool StringResourceWithLocationImpl::isModified(  )
     return StringResourcePersistenceImpl::isModified();
 }
 void StringResourceWithLocationImpl::setComment( const OUString& Comment )
-    throw (::com::sun::star::uno::RuntimeException, std::exception)
+    throw (css::uno::RuntimeException, std::exception)
 {
     StringResourcePersistenceImpl::setComment( Comment );
 }
@@ -2833,7 +2833,7 @@ void StringResourceWithLocationImpl::storeToStorage( const Reference< XStorage >
 }
 void StringResourceWithLocationImpl::storeToURL( const OUString& URL,
     const OUString& NameBase, const OUString& Comment,
-    const Reference< ::com::sun::star::task::XInteractionHandler >& Handler )
+    const Reference< css::task::XInteractionHandler >& Handler )
         throw (Exception, RuntimeException, std::exception)
 {
     StringResourcePersistenceImpl::storeToURL( URL, NameBase, Comment, Handler );
@@ -2854,7 +2854,7 @@ void StringResourceWithLocationImpl::importBinary( const Sequence< ::sal_Int8 >&
 
 // XStringResourceWithLocation
 void StringResourceWithLocationImpl::storeAsURL( const OUString& URL )
-    throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
+    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     setURL( URL );
     store();
diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx
index 1c4623e84861..ea392048893e 100644
--- a/scripting/source/stringresource/stringresource.hxx
+++ b/scripting/source/stringresource/stringresource.hxx
@@ -71,14 +71,14 @@ IdToIndexMap;
 
 struct LocaleItem
 {
-    ::com::sun::star::lang::Locale      m_locale;
-    IdToStringMap                       m_aIdToStringMap;
-    IdToIndexMap                        m_aIdToIndexMap;
-    sal_Int32                           m_nNextIndex;
-    bool                                m_bLoaded;
-    bool                                m_bModified;
-
-    LocaleItem( ::com::sun::star::lang::Locale locale, bool bLoaded=true )
+    css::lang::Locale      m_locale;
+    IdToStringMap          m_aIdToStringMap;
+    IdToIndexMap           m_aIdToIndexMap;
+    sal_Int32              m_nNextIndex;
+    bool                   m_bLoaded;
+    bool                   m_bModified;
+
+    LocaleItem( css::lang::Locale locale, bool bLoaded=true )
         : m_locale( locale )
         , m_nNextIndex( 0 )
         , m_bLoaded( bLoaded )
@@ -91,29 +91,29 @@ typedef std::vector< LocaleItem* >::iterator LocaleItemVectorIt;
 typedef std::vector< LocaleItem* >::const_iterator LocaleItemVectorConstIt;
 
 typedef ::cppu::WeakImplHelper<
-    ::com::sun::star::lang::XServiceInfo,
-    ::com::sun::star::resource::XStringResourceManager > StringResourceImpl_BASE;
+    css::lang::XServiceInfo,
+    css::resource::XStringResourceManager > StringResourceImpl_BASE;
 
 class StringResourceImpl : public StringResourceImpl_BASE
 {
 protected:
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >        m_xContext;
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiComponentFactory >  m_xMCF;
+    css::uno::Reference< css::uno::XComponentContext >        m_xContext;
+    css::uno::Reference< css::lang::XMultiComponentFactory >  m_xMCF;
 
-    LocaleItem*                                                                         m_pCurrentLocaleItem;
-    LocaleItem*                                                                         m_pDefaultLocaleItem;
-    bool                                                                                m_bDefaultModified;
+    LocaleItem*                                               m_pCurrentLocaleItem;
+    LocaleItem*                                               m_pDefaultLocaleItem;
+    bool                                                      m_bDefaultModified;
 
-    ::cppu::OInterfaceContainerHelper                                                   m_aListenerContainer;
+    ::cppu::OInterfaceContainerHelper                         m_aListenerContainer;
 
-    LocaleItemVector                                                                    m_aLocaleItemVector;
-    LocaleItemVector                                                                    m_aDeletedLocaleItemVector;
-    LocaleItemVector                                                                    m_aChangedDefaultLocaleVector;
+    LocaleItemVector                                          m_aLocaleItemVector;
+    LocaleItemVector                                          m_aDeletedLocaleItemVector;
+    LocaleItemVector                                          m_aChangedDefaultLocaleVector;
 
-    bool                                                                                m_bModified;
-    bool                                                                                m_bReadOnly;
+    bool                                                      m_bModified;
+    bool                                                      m_bReadOnly;
 
-    sal_Int32                                                                           m_nNextUniqueNumericId;
+    sal_Int32                                                 m_nNextUniqueNumericId;
 
     // Scans ResourceID to start with number and adapt m_nNextUniqueNumericId
     void implScanIdForNumber( const OUString& ResourceID );
@@ -121,36 +121,36 @@ protected:
 
     // Checks read only status and throws exception if it's true
     void implCheckReadOnly( const sal_Char* pExceptionMsg )
-        throw (::com::sun::star::lang::NoSupportException);
+        throw (css::lang::NoSupportException);
 
     // Return the context's MultiComponentFactory
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiComponentFactory >
+    css::uno::Reference< css::lang::XMultiComponentFactory >
         getMultiComponentFactory();
 
     // Returns the LocalItem for a given locale, if it exists, otherwise NULL
     // This method compares the locales exactly, no closest match search is performed
-    LocaleItem* getItemForLocale( const ::com::sun::star::lang::Locale& locale, bool bException )
-        throw (::com::sun::star::lang::IllegalArgumentException);
+    LocaleItem* getItemForLocale( const css::lang::Locale& locale, bool bException )
+        throw (css::lang::IllegalArgumentException);
 
     // Returns the LocalItem for a given locale, if it exists, otherwise NULL
     // This method performs a closest match search, at least the language must match
-    LocaleItem* getClosestMatchItemForLocale( const ::com::sun::star::lang::Locale& locale );
-    void implSetCurrentLocale( const ::com::sun::star::lang::Locale& locale,
+    LocaleItem* getClosestMatchItemForLocale( const css::lang::Locale& locale );
+    void implSetCurrentLocale( const css::lang::Locale& locale,
         bool FindClosestMatch, bool bUseDefaultIfNoMatch )
-            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
 
     void implModified();
     void implNotifyListeners();
 
     //=== Impl methods for ...ForLocale methods ===
     OUString SAL_CALL implResolveString( const OUString& ResourceID, LocaleItem* pLocaleItem )
-        throw (::com::sun::star::resource::MissingResourceException);
+        throw (css::resource::MissingResourceException);
     bool implHasEntryForId( const OUString& ResourceID, LocaleItem* pLocaleItem );
-    ::com::sun::star::uno::Sequence< OUString > implGetResourceIDs( LocaleItem* pLocaleItem );
+    css::uno::Sequence< OUString > implGetResourceIDs( LocaleItem* pLocaleItem );
     void implSetString( const OUString& ResourceID,
         const OUString& Str, LocaleItem* pLocaleItem );
     void implRemoveId( const OUString& ResourceID, LocaleItem* pLocaleItem )
-        throw (::com::sun::star::resource::MissingResourceException);
+        throw (css::resource::MissingResourceException);
 
     // Method to load a locale if necessary, returns true if loading was
     // successful. Default implementation in base class just returns true.
@@ -160,81 +160,81 @@ protected:
 
 public:
     StringResourceImpl(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+        const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     virtual ~StringResourceImpl();
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
 
      // XStringResourceResolver
     virtual OUString SAL_CALL resolveString( const OUString& ResourceID )
-        throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID,
-        const ::com::sun::star::lang::Locale& locale )
-            throw ( ::com::sun::star::resource::MissingResourceException,
-                    ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale )
+            throw ( css::resource::MissingResourceException,
+                    css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID,
-        const ::com::sun::star::lang::Locale& locale )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDs(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale
-        ( const ::com::sun::star::lang::Locale& locale )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::lang::Locale SAL_CALL getCurrentLocale(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::lang::Locale SAL_CALL getDefaultLocale(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getLocales(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale )
+            throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs(  )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale
+        ( const css::lang::Locale& locale )
+            throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::lang::Locale SAL_CALL getCurrentLocale(  )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::lang::Locale SAL_CALL getDefaultLocale(  )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales(  )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // XStringResourceManager
     virtual sal_Bool SAL_CALL isReadOnly()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCurrentLocale( const ::com::sun::star::lang::Locale& locale, sal_Bool FindClosestMatch )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultLocale( const ::com::sun::star::lang::Locale& locale )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::lang::NoSupportException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException,
+               css::lang::NoSupportException, std::exception) override;
     virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str )
-        throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str,
-        const ::com::sun::star::lang::Locale& locale )
-            throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale )
+            throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL removeId( const OUString& ResourceID )
-        throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::lang::NoSupportException, std::exception) override;
+        throw (css::resource::MissingResourceException, css::uno::RuntimeException,
+               css::lang::NoSupportException, std::exception) override;
     virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID,
-        const ::com::sun::star::lang::Locale& locale )
-            throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException,
-                   ::com::sun::star::lang::NoSupportException, std::exception) override;
-    virtual void SAL_CALL newLocale( const ::com::sun::star::lang::Locale& locale )
-        throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeLocale( const ::com::sun::star::lang::Locale& locale )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::lang::NoSupportException, std::exception) override;
+        const css::lang::Locale& locale )
+            throw (css::resource::MissingResourceException, css::uno::RuntimeException,
+                   css::lang::NoSupportException, std::exception) override;
+    virtual void SAL_CALL newLocale( const css::lang::Locale& locale )
+        throw (css::container::ElementExistException, css::lang::IllegalArgumentException,
+               css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeLocale( const css::lang::Locale& locale )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException,
+               css::lang::NoSupportException, std::exception) override;
     virtual ::sal_Int32 SAL_CALL getUniqueNumericId(  )
-        throw (::com::sun::star::lang::NoSupportException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::NoSupportException,
+               css::uno::RuntimeException, std::exception) override;
  };
 
 typedef ::cppu::ImplInheritanceHelper<
         StringResourceImpl,
-        ::com::sun::star::resource::XStringResourcePersistence > StringResourcePersistenceImpl_BASE;
+        css::resource::XStringResourcePersistence > StringResourcePersistenceImpl_BASE;
 
 class BinaryOutput;
 
@@ -244,9 +244,8 @@ protected:
     OUString                                                             m_aNameBase;
     OUString                                                             m_aComment;
 
-    void SAL_CALL implInitializeCommonParameters
-        ( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
-            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    void SAL_CALL implInitializeCommonParameters( const css::uno::Sequence< css::uno::Any >& aArguments )
+            throw (css::uno::Exception, css::uno::RuntimeException);
 
     // Scan locale properties files
     virtual void implScanLocales();
@@ -259,16 +258,17 @@ protected:
 
     virtual void implLoadAllLocales() override;
 
-    void implScanLocaleNames( const ::com::sun::star::uno::Sequence< OUString >& aContentSeq );
+    void implScanLocaleNames( const css::uno::Sequence< OUString >& aContentSeq );
     static OUString implGetFileNameForLocaleItem( LocaleItem* pLocaleItem, const OUString& aNameBase );
     static OUString implGetPathForLocaleItem( LocaleItem* pLocaleItem, const OUString& aNameBase,
         const OUString& aLocation, bool bDefaultFile=false );
 
     bool implReadPropertiesFile( LocaleItem* pLocaleItem,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInput );
+        const css::uno::Reference< css::io::XInputStream >& xInput );
 
-    bool implWritePropertiesFile( LocaleItem* pLocaleItem, const ::com::sun::star::uno::Reference
-        < ::com::sun::star::io::XOutputStream >& xOutputStream, const OUString& aComment );
+    bool implWritePropertiesFile( LocaleItem* pLocaleItem,
+              const css::uno::Reference< css::io::XOutputStream >& xOutputStream,
+              const OUString& aComment );
 
     void implWriteLocaleBinary( LocaleItem* pLocaleItem, BinaryOutput& rOut );
 
@@ -276,7 +276,7 @@ protected:
     (
         const OUString& aNameBase,
         const OUString& aComment,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage,
+        const css::uno::Reference< css::embed::XStorage >& Storage,
         bool bUsedForStore,
         bool bStoreAll
     )
@@ -286,368 +286,366 @@ protected:
     (
         const OUString& Location,
         const OUString& aNameBase,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xFileAccess
+        const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess
     )
-    throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
+    throw (css::uno::Exception, css::uno::RuntimeException, std::exception);
 
     void implKillChangedDefaultFiles
     (
         const OUString& Location,
         const OUString& aNameBase,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xFileAccess
+        const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess
     )
-    throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
+    throw (css::uno::Exception, css::uno::RuntimeException, std::exception);
 
     void implStoreAtLocation
     (
         const OUString& Location,
         const OUString& aNameBase,
         const OUString& aComment,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xFileAccess,
+        const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess,
         bool bUsedForStore,
         bool bStoreAll,
         bool bKillAll = false
     )
-    throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
+    throw (css::uno::Exception, css::uno::RuntimeException, std::exception);
 
 public:
     StringResourcePersistenceImpl(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+        const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     virtual ~StringResourcePersistenceImpl();
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
 
      // XStringResourceResolver
     virtual OUString SAL_CALL resolveString( const OUString& ResourceID )
-        throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID,
-        const ::com::sun::star::lang::Locale& locale )
-            throw ( ::com::sun::star::resource::MissingResourceException,
-                    ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale )
+            throw ( css::resource::MissingResourceException,
+                    css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID,
-        const ::com::sun::star::lang::Locale& locale )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDs(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale
-        ( const ::com::sun::star::lang::Locale& locale )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::lang::Locale SAL_CALL getCurrentLocale(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::lang::Locale SAL_CALL getDefaultLocale(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getLocales(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale )
+            throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs(  )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale
+        ( const css::lang::Locale& locale )
+            throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::lang::Locale SAL_CALL getCurrentLocale(  )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::lang::Locale SAL_CALL getDefaultLocale(  )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales(  )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // XStringResourceManager
     virtual sal_Bool SAL_CALL isReadOnly()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCurrentLocale( const ::com::sun::star::lang::Locale& locale, sal_Bool FindClosestMatch )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultLocale( const ::com::sun::star::lang::Locale& locale )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::lang::NoSupportException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException,
+               css::lang::NoSupportException, std::exception) override;
     virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str )
-        throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str,
-        const ::com::sun::star::lang::Locale& locale )
-            throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale )
+            throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL removeId( const OUString& ResourceID )
-        throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::lang::NoSupportException, std::exception) override;
+        throw (css::resource::MissingResourceException, css::uno::RuntimeException,
+               css::lang::NoSupportException, std::exception) override;
     virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID,
-        const ::com::sun::star::lang::Locale& locale )
-            throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException,
-                   ::com::sun::star::lang::NoSupportException, std::exception) override;
-    virtual void SAL_CALL newLocale( const ::com::sun::star::lang::Locale& locale )
-        throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeLocale( const ::com::sun::star::lang::Locale& locale )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::lang::NoSupportException, std::exception) override;
+        const css::lang::Locale& locale )
+            throw (css::resource::MissingResourceException, css::uno::RuntimeException,
+                   css::lang::NoSupportException, std::exception) override;
+    virtual void SAL_CALL newLocale( const css::lang::Locale& locale )
+        throw (css::container::ElementExistException, css::lang::IllegalArgumentException,
+               css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeLocale( const css::lang::Locale& locale )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException,
+               css::lang::NoSupportException, std::exception) override;
     virtual ::sal_Int32 SAL_CALL getUniqueNumericId(  )
-        throw (::com::sun::star::lang::NoSupportException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::NoSupportException,
+               css::uno::RuntimeException, std::exception) override;
 
     // XStringResourcePersistence
     virtual void SAL_CALL store(  )
-        throw (::com::sun::star::lang::NoSupportException,
-               ::com::sun::star::uno::Exception,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::NoSupportException,
+               css::uno::Exception,
+               css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL isModified(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setComment( const OUString& Comment )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL storeToStorage
-        ( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage,
+        ( const css::uno::Reference< css::embed::XStorage >& Storage,
           const OUString& NameBase, const OUString& Comment )
-            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL storeToURL( const OUString& URL, const OUString& NameBase,
-        const OUString& Comment, const ::com::sun::star::uno::Reference
-        < ::com::sun::star::task::XInteractionHandler >& Handler )
-            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL importBinary( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& Data )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const OUString& Comment, const css::uno::Reference
+        < css::task::XInteractionHandler >& Handler )
+            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary(  )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 };
 
 
 typedef ::cppu::ImplInheritanceHelper<
         StringResourcePersistenceImpl,
-        ::com::sun::star::lang::XInitialization,
-        ::com::sun::star::resource::XStringResourceWithStorage > StringResourceWithStorageImpl_BASE;
+        css::lang::XInitialization,
+        css::resource::XStringResourceWithStorage > StringResourceWithStorageImpl_BASE;
 
 class StringResourceWithStorageImpl : public StringResourceWithStorageImpl_BASE
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >       m_xStorage;
-    bool                                                                        m_bStorageChanged;
+    css::uno::Reference< css::embed::XStorage >       m_xStorage;
+    bool                                              m_bStorageChanged;
 
     virtual void implScanLocales() override;
     virtual bool implLoadLocale( LocaleItem* pLocaleItem ) override;
 
 public:
-    StringResourceWithStorageImpl(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+    StringResourceWithStorageImpl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     virtual ~StringResourceWithStorageImpl();
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
-        throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
     // XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
 
      // XStringResourceResolver
     virtual OUString SAL_CALL resolveString( const OUString& ResourceID )
-        throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID,
-        const ::com::sun::star::lang::Locale& locale )
-            throw ( ::com::sun::star::resource::MissingResourceException,
-                    ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale )
+            throw ( css::resource::MissingResourceException,
+                    css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID,
-        const ::com::sun::star::lang::Locale& locale )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDs(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale
-        ( const ::com::sun::star::lang::Locale& locale )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::lang::Locale SAL_CALL getCurrentLocale(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::lang::Locale SAL_CALL getDefaultLocale(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getLocales(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale )
+            throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs(  )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale
+        ( const css::lang::Locale& locale )
+            throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::lang::Locale SAL_CALL getCurrentLocale(  )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::lang::Locale SAL_CALL getDefaultLocale(  )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales(  )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // XStringResourceManager
     virtual sal_Bool SAL_CALL isReadOnly()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCurrentLocale( const ::com::sun::star::lang::Locale& locale, sal_Bool FindClosestMatch )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultLocale( const ::com::sun::star::lang::Locale& locale )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::lang::NoSupportException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException,
+               css::lang::NoSupportException, std::exception) override;
     virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str )
-        throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str,
-        const ::com::sun::star::lang::Locale& locale )
-            throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale )
+            throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL removeId( const OUString& ResourceID )
-        throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::lang::NoSupportException, std::exception) override;
+        throw (css::resource::MissingResourceException, css::uno::RuntimeException,
+               css::lang::NoSupportException, std::exception) override;
     virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID,
-        const ::com::sun::star::lang::Locale& locale )
-            throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException,
-                   ::com::sun::star::lang::NoSupportException, std::exception) override;
-    virtual void SAL_CALL newLocale( const ::com::sun::star::lang::Locale& locale )
-        throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeLocale( const ::com::sun::star::lang::Locale& locale )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::lang::NoSupportException, std::exception) override;
+        const css::lang::Locale& locale )
+            throw (css::resource::MissingResourceException, css::uno::RuntimeException,
+                   css::lang::NoSupportException, std::exception) override;
+    virtual void SAL_CALL newLocale( const css::lang::Locale& locale )
+        throw (css::container::ElementExistException, css::lang::IllegalArgumentException,
+               css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeLocale( const css::lang::Locale& locale )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException,
+               css::lang::NoSupportException, std::exception) override;
     virtual ::sal_Int32 SAL_CALL getUniqueNumericId(  )
-        throw (::com::sun::star::lang::NoSupportException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::NoSupportException,
+               css::uno::RuntimeException, std::exception) override;
 
     // XStringResourcePersistence
     virtual void SAL_CALL store(  )
-        throw (::com::sun::star::lang::NoSupportException,
-               ::com::sun::star::uno::Exception,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::NoSupportException,
+               css::uno::Exception,
+               css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL isModified(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setComment( const OUString& Comment )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL storeToStorage
-        ( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage,
+        ( const css::uno::Reference< css::embed::XStorage >& Storage,
           const OUString& NameBase, const OUString& Comment )
-            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL storeToURL( const OUString& URL, const OUString& NameBase,
-        const OUString& Comment, const ::com::sun::star::uno::Reference
-        < ::com::sun::star::task::XInteractionHandler >& Handler )
-            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL importBinary( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& Data )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const OUString& Comment, const css::uno::Reference
+        < css::task::XInteractionHandler >& Handler )
+            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary(  )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 
     // XStringResourceWithStorage
     virtual void SAL_CALL storeAsStorage
-        ( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage )
-            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        ( const css::uno::Reference< css::embed::XStorage >& Storage )
+            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setStorage
-        ( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage )
-            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        ( const css::uno::Reference< css::embed::XStorage >& Storage )
+            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 };
 
 
 typedef ::cppu::ImplInheritanceHelper<
         StringResourcePersistenceImpl,
-        ::com::sun::star::lang::XInitialization,
-        ::com::sun::star::resource::XStringResourceWithLocation > StringResourceWithLocationImpl_BASE;
+        css::lang::XInitialization,
+        css::resource::XStringResourceWithLocation > StringResourceWithLocationImpl_BASE;
 
 class StringResourceWithLocationImpl : public StringResourceWithLocationImpl_BASE
 {
-    OUString                                                             m_aLocation;
-    bool                                                                        m_bLocationChanged;
-    com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 >   m_xSFI;
-    com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > m_xInteractionHandler;
+    OUString                                              m_aLocation;
+    bool                                                  m_bLocationChanged;
+    css::uno::Reference< css::ucb::XSimpleFileAccess3 >   m_xSFI;
+    css::uno::Reference< css::task::XInteractionHandler > m_xInteractionHandler;
 
-    const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > getFileAccess();
+    const css::uno::Reference< css::ucb::XSimpleFileAccess3 > getFileAccess();
 
     virtual void implScanLocales() override;
     virtual bool implLoadLocale( LocaleItem* pLocaleItem ) override;
 
 public:
-    StringResourceWithLocationImpl(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+    StringResourceWithLocationImpl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     virtual ~StringResourceWithLocationImpl();
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
-        throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
     // XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
 
      // XStringResourceResolver
     virtual OUString SAL_CALL resolveString( const OUString& ResourceID )
-        throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID,
-        const ::com::sun::star::lang::Locale& locale )
-            throw ( ::com::sun::star::resource::MissingResourceException,
-                    ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale )
+            throw ( css::resource::MissingResourceException,
+                    css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID,
-        const ::com::sun::star::lang::Locale& locale )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDs(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale
-        ( const ::com::sun::star::lang::Locale& locale )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::lang::Locale SAL_CALL getCurrentLocale(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::lang::Locale SAL_CALL getDefaultLocale(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getLocales(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale )
+            throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs(  )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale
+        ( const css::lang::Locale& locale )
+            throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::lang::Locale SAL_CALL getCurrentLocale(  )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::lang::Locale SAL_CALL getDefaultLocale(  )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales(  )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // XStringResourceManager
     virtual sal_Bool SAL_CALL isReadOnly()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCurrentLocale( const ::com::sun::star::lang::Locale& locale, sal_Bool FindClosestMatch )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultLocale( const ::com::sun::star::lang::Locale& locale )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::lang::NoSupportException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException,
+               css::lang::NoSupportException, std::exception) override;
     virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str )
-        throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str,
-        const ::com::sun::star::lang::Locale& locale )
-            throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale )
+            throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL removeId( const OUString& ResourceID )
-        throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::lang::NoSupportException, std::exception) override;
+        throw (css::resource::MissingResourceException, css::uno::RuntimeException,
+               css::lang::NoSupportException, std::exception) override;
     virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID,
-        const ::com::sun::star::lang::Locale& locale )
-            throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException,
-                   ::com::sun::star::lang::NoSupportException, std::exception) override;
-    virtual void SAL_CALL newLocale( const ::com::sun::star::lang::Locale& locale )
-        throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeLocale( const ::com::sun::star::lang::Locale& locale )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::lang::NoSupportException, std::exception) override;
+        const css::lang::Locale& locale )
+            throw (css::resource::MissingResourceException, css::uno::RuntimeException,
+                   css::lang::NoSupportException, std::exception) override;
+    virtual void SAL_CALL newLocale( const css::lang::Locale& locale )
+        throw (css::container::ElementExistException, css::lang::IllegalArgumentException,
+               css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeLocale( const css::lang::Locale& locale )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException,
+               css::lang::NoSupportException, std::exception) override;
     virtual ::sal_Int32 SAL_CALL getUniqueNumericId(  )
-        throw (::com::sun::star::lang::NoSupportException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::NoSupportException,
+               css::uno::RuntimeException, std::exception) override;
 
     // XStringResourcePersistence
     virtual void SAL_CALL store(  )
-        throw (::com::sun::star::lang::NoSupportException,
-               ::com::sun::star::uno::Exception,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::NoSupportException,
+               css::uno::Exception,
+               css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL isModified(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setComment( const OUString& Comment )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL storeToStorage
-        ( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage,
+        ( const css::uno::Reference< css::embed::XStorage >& Storage,
           const OUString& NameBase, const OUString& Comment )
-            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL storeToURL( const OUString& URL, const OUString& NameBase,
-        const OUString& Comment, const ::com::sun::star::uno::Reference
-        < ::com::sun::star::task::XInteractionHandler >& Handler )
-            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL importBinary( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& Data )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const OUString& Comment, const css::uno::Reference
+        < css::task::XInteractionHandler >& Handler )
+            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary(  )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 
     // XStringResourceWithLocation
     virtual void SAL_CALL storeAsURL( const OUString& URL )
-        throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setURL( const OUString& URL )
         throw (css::lang::IllegalArgumentException, css::lang::NoSupportException,
                css::uno::RuntimeException, std::exception) override;
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index 69d6a60c6699..093e4143fcb4 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -470,7 +470,7 @@ public:
         throw RuntimeException("ReadOnly container" );
 
     }
-    virtual void SAL_CALL removeByName( const OUString& ) throw (::com::sun::star::container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception) override
+    virtual void SAL_CALL removeByName( const OUString& ) throw (css::container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception) override
     {
         throw RuntimeException("ReadOnly container" );
     }
@@ -582,7 +582,7 @@ public:
     virtual void SAL_CALL queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL notifyClosing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) override;
     // XPropertySet
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
     // XInitialization
     virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override;
     // XInterface
@@ -590,7 +590,7 @@ public:
 
     // XTypeProvider
     DECLARE_XTYPEPROVIDER()
-    virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) 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) override
+    virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
     {
         if ( nHandle == EVENTLSTNR_PROPERTY_ID_MODEL )
         {
@@ -1043,7 +1043,7 @@ public:
 
     // XVBAToOOEventDescGen
     virtual Sequence< ScriptEventDescriptor > SAL_CALL getEventDescriptions( const OUString& sCtrlServiceName, const OUString& sCodeName ) throw (RuntimeException, std::exception) override;
-    virtual Reference< XScriptEventsSupplier > SAL_CALL getEventSupplier( const Reference< XInterface >& xControl,  const OUString& sCodeName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual Reference< XScriptEventsSupplier > SAL_CALL getEventSupplier( const Reference< XInterface >& xControl,  const OUString& sCodeName ) throw (css::uno::RuntimeException, std::exception) override;
 
     OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override
@@ -1079,7 +1079,7 @@ VBAToOOEventDescGen::getEventDescriptions( const OUString& sCntrlServiceName, co
 }
 
 Reference< XScriptEventsSupplier > SAL_CALL
-VBAToOOEventDescGen::getEventSupplier( const Reference< XInterface >& xControl, const OUString& sCodeName  ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+VBAToOOEventDescGen::getEventSupplier( const Reference< XInterface >& xControl, const OUString& sCodeName  ) throw (css::uno::RuntimeException, std::exception)
 {
     ScriptEventHelper evntHelper( xControl );
     Reference< XScriptEventsSupplier > xSupplier =
@@ -1088,17 +1088,17 @@ VBAToOOEventDescGen::getEventSupplier( const Reference< XInterface >& xControl,
     return xSupplier;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-ooo_vba_EventListener_get_implementation(::com::sun::star::uno::XComponentContext* context,
-                                         ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+ooo_vba_EventListener_get_implementation(css::uno::XComponentContext* context,
+                                         css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new EventListener(context));
 }
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-ooo_vba_VBAToOOEventDesc_get_implementation(::com::sun::star::uno::XComponentContext* context,
-                                            ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+ooo_vba_VBAToOOEventDesc_get_implementation(css::uno::XComponentContext* context,
+                                            css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new VBAToOOEventDescGen(context));
 }