com::sun::star->css in tools/ and ucb/

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

12 files changed, 135 insertions, 154 deletions

diff --git a/ucb/source/ucp/cmis/auth_provider.cxx b/ucb/source/ucp/cmis/auth_provider.cxx
index 500b601b7179..3adefe88473b 100644
--- a/ucb/source/ucp/cmis/auth_provider.cxx
+++ b/ucb/source/ucp/cmis/auth_provider.cxx
@@ -22,7 +22,7 @@ using namespace std;
 
 namespace cmis
 {
-    com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment> 
+    css::uno::Reference< css::ucb::XCommandEnvironment>
         AuthProvider::sm_xEnv;
     bool AuthProvider::authenticationQuery( string& username, string& password )
     {
@@ -75,8 +75,8 @@ namespace cmis
             "box below. For example:\n"
             "https://login.live.com/oauth20_desktop.srf?code=YOUR_CODE&lc=1033";
         OUString url_oustr( url, strlen( url ), RTL_TEXTENCODING_UTF8 );
-        const com::sun::star::uno::Reference< 
-            com::sun::star::ucb::XCommandEnvironment> xEnv = getXEnv( );
+        const css::uno::Reference<
+            css::ucb::XCommandEnvironment> xEnv = getXEnv( );
 
         if ( xEnv.is() )
         {
diff --git a/ucb/source/ucp/cmis/auth_provider.hxx b/ucb/source/ucp/cmis/auth_provider.hxx
index fa50054241ad..1c521d52d8e8 100644
--- a/ucb/source/ucp/cmis/auth_provider.hxx
+++ b/ucb/source/ucp/cmis/auth_provider.hxx
@@ -17,14 +17,13 @@ namespace cmis
 {
     class AuthProvider : public libcmis::AuthProvider
     {
-        const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment>& m_xEnv;
-        static com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment> sm_xEnv;
+        const css::uno::Reference< css::ucb::XCommandEnvironment>& m_xEnv;
+        static css::uno::Reference< css::ucb::XCommandEnvironment> sm_xEnv;
         OUString m_sUrl;
         OUString m_sBindingUrl;
 
         public:
-            AuthProvider ( const com::sun::star::uno::Reference<
-                                   com::sun::star::ucb::XCommandEnvironment>& xEnv,
+            AuthProvider ( const css::uno::Reference< css::ucb::XCommandEnvironment>& xEnv,
                            const OUString& sUrl,
                            const OUString& sBindingUrl ):
                 m_xEnv( xEnv ), m_sUrl( sUrl ), m_sBindingUrl( sBindingUrl ) { }
@@ -35,11 +34,9 @@ namespace cmis
                     const char* /*username*/,
                     const char* /*password*/ );
 
-            static void setXEnv( const com::sun::star::uno::Reference<
-                    com::sun::star::ucb::XCommandEnvironment>& xEnv ) { sm_xEnv = xEnv; }
+            static void setXEnv( const css::uno::Reference< css::ucb::XCommandEnvironment>& xEnv ) { sm_xEnv = xEnv; }
 
-            static com::sun::star::uno::Reference< 
-                com::sun::star::ucb::XCommandEnvironment> getXEnv( ) { return sm_xEnv; }
+            static css::uno::Reference< css::ucb::XCommandEnvironment> getXEnv( ) { return sm_xEnv; }
     };
 }
 
diff --git a/ucb/source/ucp/cmis/certvalidation_handler.hxx b/ucb/source/ucp/cmis/certvalidation_handler.hxx
index e0e7ea3b7417..dde7b8774fc6 100644
--- a/ucb/source/ucp/cmis/certvalidation_handler.hxx
+++ b/ucb/source/ucp/cmis/certvalidation_handler.hxx
@@ -20,16 +20,14 @@ namespace cmis
 {
     class CertValidationHandler : public libcmis::CertValidationHandler
     {
-        const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment>& m_xEnv;
-        const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& m_xContext;
+        const css::uno::Reference< css::ucb::XCommandEnvironment>& m_xEnv;
+        const css::uno::Reference< css::uno::XComponentContext >& m_xContext;
         OUString m_sHostname;
 
         public:
             CertValidationHandler (
-                           const com::sun::star::uno::Reference<
-                                   com::sun::star::ucb::XCommandEnvironment>& xEnv,
-                           const com::sun::star::uno::Reference<
-                                   com::sun::star::uno::XComponentContext>& xContext,
+                           const css::uno::Reference< css::ucb::XCommandEnvironment>& xEnv,
+                           const css::uno::Reference< css::uno::XComponentContext>& xContext,
                            const OUString& sHostname ):
                 m_xEnv( xEnv ), m_xContext( xContext ), m_sHostname( sHostname ) { }
 
diff --git a/ucb/source/ucp/cmis/children_provider.hxx b/ucb/source/ucp/cmis/children_provider.hxx
index 1473318e2567..770c29e68d11 100644
--- a/ucb/source/ucp/cmis/children_provider.hxx
+++ b/ucb/source/ucp/cmis/children_provider.hxx
@@ -20,7 +20,7 @@ namespace cmis
         public:
             virtual ~ChildrenProvider( ) { };
 
-            virtual std::list< com::sun::star::uno::Reference< com::sun::star::ucb::XContent > > getChildren( ) = 0;
+            virtual std::list< css::uno::Reference< css::ucb::XContent > > getChildren( ) = 0;
     };
 }
 
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 6da4cd9881b1..16c1298aa910 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -346,11 +346,11 @@ namespace cmis
 #ifndef SYSTEM_CURL
             // Initialize NSS library to make sure libcmis (and curl) can access CACERTs using NSS
             // when using internal libcurl.
-            uno::Reference< com::sun::star::xml::crypto::XNSSInitializer >
-                xNSSInitializer = com::sun::star::xml::crypto::NSSInitializer::create( m_xContext );
+            uno::Reference< css::xml::crypto::XNSSInitializer >
+                xNSSInitializer = css::xml::crypto::NSSInitializer::create( m_xContext );
 
-            uno::Reference< com::sun::star::xml::crypto::XDigestContext > xDigestContext(
-                    xNSSInitializer->getDigestContext( com::sun::star::xml::crypto::DigestID::SHA256,
+            uno::Reference< css::xml::crypto::XDigestContext > xDigestContext(
+                    xNSSInitializer->getDigestContext( css::xml::crypto::DigestID::SHA256,
                                                               uno::Sequence< beans::NamedValue >() ),
                                                               uno::UNO_SET_THROW );
 #endif
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx
index 40b69a943c22..f835a963524f 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -50,7 +50,7 @@ namespace cmis
 
 class ContentProvider;
 class Content : public ::ucbhelper::ContentImplHelper,
-                public com::sun::star::ucb::XContentCreator,
+                public css::ucb::XContentCreator,
                 public ChildrenProvider
 {
 private:
@@ -68,91 +68,86 @@ private:
     libcmis::ObjectTypePtr m_pObjectType;
     std::map< std::string, libcmis::PropertyPtr > m_pObjectProps;
 
-    bool isFolder( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv );
+    bool isFolder( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
     void setCmisProperty(const std::string& rName, const std::string& rValue,
-            const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv );
+            const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
-    com::sun::star::uno::Any getBadArgExcept();
+    css::uno::Any getBadArgExcept();
 
-    com::sun::star::uno::Reference< com::sun::star::sdbc::XRow >
+    css::uno::Reference< css::sdbc::XRow >
         getPropertyValues(
-            const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProperties,
-            const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv );
+            const css::uno::Sequence< css::beans::Property >& rProperties,
+            const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
-    libcmis::Session* getSession( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv );
-    libcmis::ObjectTypePtr getObjectType( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv );
+    libcmis::Session* getSession( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
+    libcmis::ObjectTypePtr getObjectType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
 private:
     typedef rtl::Reference< Content > ContentRef;
     typedef std::list< ContentRef > ContentRefList;
 
-    com::sun::star::uno::Any open(const com::sun::star::ucb::OpenCommandArgument2 & rArg,
-        const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv )
-            throw( com::sun::star::uno::Exception, libcmis::Exception );
+    css::uno::Any open(const css::ucb::OpenCommandArgument2 & rArg,
+        const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
+            throw( css::uno::Exception, libcmis::Exception );
 
-    void transfer( const com::sun::star::ucb::TransferInfo& rTransferInfo,
-        const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv )
-            throw( com::sun::star::uno::Exception );
+    void transfer( const css::ucb::TransferInfo& rTransferInfo,
+        const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
+            throw( css::uno::Exception );
 
-    void insert( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & xInputStream,
+    void insert( const css::uno::Reference< css::io::XInputStream > & xInputStream,
         bool bReplaceExisting, const OUString & rMimeType,
-        const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv )
+        const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
             throw (css::uno::Exception, std::exception);
 
-    OUString checkIn( const com::sun::star::ucb::CheckinArgument& rArg,
-        const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv )
-            throw( com::sun::star::uno::Exception );
+    OUString checkIn( const css::ucb::CheckinArgument& rArg,
+        const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
+            throw( css::uno::Exception );
 
-    OUString checkOut( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv )
-            throw( com::sun::star::uno::Exception );
+    OUString checkOut( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
+            throw( css::uno::Exception );
 
-    OUString cancelCheckOut( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv )
-            throw( com::sun::star::uno::Exception );
+    OUString cancelCheckOut( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
+            throw( css::uno::Exception );
 
-    static void copyData( com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xIn,
-        com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xOut );
+    static void copyData( css::uno::Reference< css::io::XInputStream > xIn,
+        css::uno::Reference< css::io::XOutputStream > xOut );
 
-    com::sun::star::uno::Sequence< com::sun::star::uno::Any >
-        setPropertyValues( const com::sun::star::uno::Sequence<
-            com::sun::star::beans::PropertyValue >& rValues,
-            const com::sun::star::uno::Reference<
-            com::sun::star::ucb::XCommandEnvironment >& xEnv );
+    css::uno::Sequence< css::uno::Any >
+        setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& rValues,
+            const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
-    com::sun::star::uno::Sequence< com::sun::star::document::CmisVersion >
-        getAllVersions( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv )
-            throw(com::sun::star::uno::Exception,
+    css::uno::Sequence< css::document::CmisVersion >
+        getAllVersions( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
+            throw(css::uno::Exception,
                   std::exception);
 
-    bool feedSink( com::sun::star::uno::Reference< com::sun::star::uno::XInterface> aSink,
-        const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv );
+    bool feedSink( css::uno::Reference< css::uno::XInterface> aSink,
+        const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
 public:
-    Content( const com::sun::star::uno::Reference<
-        com::sun::star::uno::XComponentContext >& rxContext, ContentProvider *pProvider,
-        const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier,
+    Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+        ContentProvider *pProvider,
+        const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
         libcmis::ObjectPtr pObject = libcmis::ObjectPtr( ) )
-            throw ( com::sun::star::ucb::ContentCreationException );
+            throw ( css::ucb::ContentCreationException );
 
-    Content( const com::sun::star::uno::Reference<
-        com::sun::star::uno::XComponentContext >& rxContext, ContentProvider *pProvider,
-        const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier,
+    Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+        ContentProvider *pProvider,
+        const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
         bool bIsFolder)
-            throw ( com::sun::star::ucb::ContentCreationException );
+            throw ( css::ucb::ContentCreationException );
 
     virtual ~Content();
 
-    virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property >
-        getProperties( const com::sun::star::uno::Reference<
-            com::sun::star::ucb::XCommandEnvironment > & xEnv ) override;
+    virtual css::uno::Sequence< css::beans::Property >
+        getProperties( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override;
 
     libcmis::ObjectPtr updateProperties(
-            const com::sun::star::uno::Any& iCmisProps,
-            const com::sun::star::uno::Reference<
-            com::sun::star::ucb::XCommandEnvironment > & xEnv);
+            const css::uno::Any& iCmisProps,
+            const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv);
 
-    virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo >
-        getCommands( const com::sun::star::uno::Reference<
-            com::sun::star::ucb::XCommandEnvironment > & xEnv ) override;
+    virtual css::uno::Sequence< css::ucb::CommandInfo >
+        getCommands( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override;
 
     virtual OUString getParentURL() override;
 
@@ -171,40 +166,40 @@ public:
 
     virtual OUString SAL_CALL
     getImplementationName()
-            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+            throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
+    virtual css::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames()
-            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+            throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual OUString SAL_CALL
     getContentType()
-            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+            throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual com::sun::star::uno::Any SAL_CALL
-        execute( const com::sun::star::ucb::Command& aCommand,
+    virtual css::uno::Any SAL_CALL
+        execute( const css::ucb::Command& aCommand,
         sal_Int32 CommandId,
-        const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment )
-            throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
+            throw( css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL abort( sal_Int32 CommandId )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+            throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo >
+    virtual css::uno::Sequence< css::ucb::ContentInfo >
         SAL_CALL queryCreatableContentsInfo()
-            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+            throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent >
-        SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::ucb::XContent >
+        SAL_CALL createNewContent( const css::ucb::ContentInfo& Info )
+            throw( css::uno::RuntimeException, std::exception ) override;
 
-    com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo >
-        queryCreatableContentsInfo( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv )
-                throw( com::sun::star::uno::RuntimeException );
+    css::uno::Sequence< css::ucb::ContentInfo >
+        queryCreatableContentsInfo( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
+                throw( css::uno::RuntimeException );
 
-    virtual std::list< com::sun::star::uno::Reference< com::sun::star::ucb::XContent > > getChildren( ) override;
+    virtual std::list< css::uno::Reference< css::ucb::XContent > > getChildren( ) override;
 
-    libcmis::ObjectPtr getObject( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ) throw (css::uno::RuntimeException, css::ucb::CommandFailedException, libcmis::Exception);
+    libcmis::ObjectPtr getObject( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw (css::uno::RuntimeException, css::ucb::CommandFailedException, libcmis::Exception);
 };
 
 }
diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.hxx b/ucb/source/ucp/cmis/cmis_datasupplier.hxx
index 9fe7b7739368..b637dab707a9 100644
--- a/ucb/source/ucp/cmis/cmis_datasupplier.hxx
+++ b/ucb/source/ucp/cmis/cmis_datasupplier.hxx
@@ -23,10 +23,10 @@ namespace cmis
 
     struct ResultListEntry
     {
-        com::sun::star::uno::Reference< com::sun::star::ucb::XContent > xContent;
-        com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > xRow;
+        css::uno::Reference< css::ucb::XContent > xContent;
+        css::uno::Reference< css::sdbc::XRow > xRow;
 
-        explicit ResultListEntry( com::sun::star::uno::Reference< com::sun::star::ucb::XContent > xCnt ) : xContent( xCnt )
+        explicit ResultListEntry( css::uno::Reference< css::ucb::XContent > xCnt ) : xContent( xCnt )
         {
         }
 
@@ -52,9 +52,9 @@ namespace cmis
             virtual ~DataSupplier();
 
             virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override;
-            virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >
+            virtual css::uno::Reference< css::ucb::XContentIdentifier >
                 queryContentIdentifier( sal_uInt32 nIndex ) override;
-            virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent >
+            virtual css::uno::Reference< css::ucb::XContent >
                 queryContent( sal_uInt32 nIndex ) override;
 
             virtual bool getResult( sal_uInt32 nIndex ) override;
@@ -63,14 +63,14 @@ namespace cmis
             virtual sal_uInt32 currentCount() override;
             virtual bool isCountFinal() override;
 
-            virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow >
+            virtual css::uno::Reference< css::sdbc::XRow >
                 queryPropertyValues( sal_uInt32 nIndex  ) override;
             virtual void releasePropertyValues( sal_uInt32 nIndex ) override;
 
             virtual void close() override;
 
             virtual void validate()
-                throw( com::sun::star::ucb::ResultSetException ) override;
+                throw( css::ucb::ResultSetException ) override;
     };
 
 }
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx
index c9819b51c423..292da1b83e6a 100644
--- a/ucb/source/ucp/cmis/cmis_provider.cxx
+++ b/ucb/source/ucp/cmis/cmis_provider.cxx
@@ -20,11 +20,10 @@ using namespace com::sun::star;
 
 namespace cmis
 {
-uno::Reference< com::sun::star::ucb::XContent > SAL_CALL
+uno::Reference< css::ucb::XContent > SAL_CALL
 ContentProvider::queryContent(
-            const uno::Reference<
-                    com::sun::star::ucb::XContentIdentifier >& Identifier )
-    throw( com::sun::star::ucb::IllegalIdentifierException,
+            const uno::Reference< css::ucb::XContentIdentifier >& Identifier )
+    throw( css::ucb::IllegalIdentifierException,
            uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -48,13 +47,13 @@ ContentProvider::queryContent(
             registerNewContent( xContent );
         }
     }
-    catch ( com::sun::star::ucb::ContentCreationException const & )
+    catch ( css::ucb::ContentCreationException const & )
     {
-        throw com::sun::star::ucb::IllegalIdentifierException();
+        throw css::ucb::IllegalIdentifierException();
     }
 
     if ( !xContent->getIdentifier().is() )
-        throw com::sun::star::ucb::IllegalIdentifierException();
+        throw css::ucb::IllegalIdentifierException();
 
     return xContent;
 }
@@ -117,7 +116,7 @@ css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & r
 XTYPEPROVIDER_IMPL_3( ContentProvider,
                       lang::XTypeProvider,
                       lang::XServiceInfo,
-                      com::sun::star::ucb::XContentProvider );
+                      css::ucb::XContentProvider );
 
 XSERVICEINFO_IMPL_1_CTX( ContentProvider,
                      OUString("com.sun.star.comp.CmisContentProvider"),
diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx b/ucb/source/ucp/cmis/cmis_provider.hxx
index 4cff7beab5db..bf818a6a7f87 100644
--- a/ucb/source/ucp/cmis/cmis_provider.hxx
+++ b/ucb/source/ucp/cmis/cmis_provider.hxx
@@ -23,8 +23,7 @@ private:
     std::map< std::pair< OUString, OUString >, libcmis::Session* > m_aSessionCache;
 
 public:
-    explicit ContentProvider( const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::uno::XComponentContext >& rxContext );
+    explicit ContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     virtual ~ContentProvider();
 
     // XInterface
@@ -57,12 +56,10 @@ public:
                           css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XContentProvider
-    virtual ::com::sun::star::uno::Reference<
-                ::com::sun::star::ucb::XContent > SAL_CALL
-    queryContent( const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::ucb::XContentIdentifier >& Identifier )
-        throw( ::com::sun::star::ucb::IllegalIdentifierException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
+    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
+        throw( css::ucb::IllegalIdentifierException,
+               css::uno::RuntimeException, std::exception ) override;
 
     libcmis::Session* getSession( const OUString& sBindingUrl, const OUString& sUsername );
     void registerSession( const OUString& sBindingUrl, const OUString& sUsername, libcmis::Session* pSession );
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index 2cf091522e7c..40d88c769b7c 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -131,11 +131,11 @@ namespace cmis
 #ifndef SYSTEM_CURL
         // Initialize NSS library to make sure libcmis (and curl) can access CACERTs using NSS
         // when using internal libcurl.
-        uno::Reference< com::sun::star::xml::crypto::XNSSInitializer >
-            xNSSInitializer = com::sun::star::xml::crypto::NSSInitializer::create( m_xContext );
+        uno::Reference< css::xml::crypto::XNSSInitializer >
+            xNSSInitializer = css::xml::crypto::NSSInitializer::create( m_xContext );
 
-        uno::Reference< com::sun::star::xml::crypto::XDigestContext > xDigestContext(
-                xNSSInitializer->getDigestContext( com::sun::star::xml::crypto::DigestID::SHA256,
+        uno::Reference< css::xml::crypto::XDigestContext > xDigestContext(
+                xNSSInitializer->getDigestContext( css::xml::crypto::DigestID::SHA256,
                                                           uno::Sequence< beans::NamedValue >() ),
                                                           uno::UNO_SET_THROW );
 #endif
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx b/ucb/source/ucp/cmis/cmis_repo_content.hxx
index cd5cc6311c87..42ba9bbbbc3b 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx
@@ -57,38 +57,34 @@ private:
 
 private:
 
-    com::sun::star::uno::Any getBadArgExcept();
+    css::uno::Any getBadArgExcept();
 
-    com::sun::star::uno::Reference< com::sun::star::sdbc::XRow >
+    css::uno::Reference< css::sdbc::XRow >
         getPropertyValues(
-            const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProperties,
-            const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv );
+            const css::uno::Sequence< css::beans::Property >& rProperties,
+            const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /*
      * Call me to ensure the repositories have been fetched
      */
-    void getRepositories( const com::sun::star::uno::Reference<
-            com::sun::star::ucb::XCommandEnvironment >& xEnv );
+    void getRepositories( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
-    libcmis::RepositoryPtr getRepository( const com::sun::star::uno::Reference<
-            com::sun::star::ucb::XCommandEnvironment >& xEnv );
+    libcmis::RepositoryPtr getRepository( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
 public:
-    RepoContent( const com::sun::star::uno::Reference<
-        com::sun::star::uno::XComponentContext >& rxContext, ContentProvider *pProvider,
-        const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier,
+    RepoContent( const css::uno::Reference<
+        css::uno::XComponentContext >& rxContext, ContentProvider *pProvider,
+        const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
         std::vector< libcmis::RepositoryPtr > aRepos = std::vector< libcmis::RepositoryPtr > ( ) )
-            throw ( com::sun::star::ucb::ContentCreationException );
+            throw ( css::ucb::ContentCreationException );
 
     virtual ~RepoContent();
 
-    virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property >
-        getProperties( const com::sun::star::uno::Reference<
-            com::sun::star::ucb::XCommandEnvironment > & xEnv ) override;
+    virtual css::uno::Sequence< css::beans::Property >
+        getProperties( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override;
 
-    virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo >
-        getCommands( const com::sun::star::uno::Reference<
-            com::sun::star::ucb::XCommandEnvironment > & xEnv ) override;
+    virtual css::uno::Sequence< css::ucb::CommandInfo >
+        getCommands( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override;
 
     virtual OUString getParentURL() override;
 
@@ -107,26 +103,26 @@ public:
 
     virtual OUString SAL_CALL
     getImplementationName()
-            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+            throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
+    virtual css::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames()
-            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+            throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual OUString SAL_CALL
     getContentType()
-            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+            throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual com::sun::star::uno::Any SAL_CALL
-        execute( const com::sun::star::ucb::Command& aCommand,
+    virtual css::uno::Any SAL_CALL
+        execute( const css::ucb::Command& aCommand,
         sal_Int32 CommandId,
-        const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment )
-            throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
+            throw( css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL abort( sal_Int32 CommandId )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+            throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual std::list< com::sun::star::uno::Reference< com::sun::star::ucb::XContent > > getChildren( ) override;
+    virtual std::list< css::uno::Reference< css::ucb::XContent > > getChildren( ) override;
 };
 
 }
diff --git a/ucb/source/ucp/cmis/cmis_resultset.hxx b/ucb/source/ucp/cmis/cmis_resultset.hxx
index c3e05e2dfa83..e8d57c199e1f 100644
--- a/ucb/source/ucp/cmis/cmis_resultset.hxx
+++ b/ucb/source/ucp/cmis/cmis_resultset.hxx
@@ -20,7 +20,7 @@ namespace cmis
     class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper
     {
         ChildrenProvider* m_pChildrenProvider;
-        com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv;
+        css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv;
 
         private:
             virtual void initStatic() override;
@@ -29,11 +29,10 @@ namespace cmis
         public:
 
             DynamicResultSet(
-                    const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
+                    const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                     ChildrenProvider* pChildrenProvider,
-                    const com::sun::star::ucb::OpenCommandArgument2& rCommand,
-                    const com::sun::star::uno::Reference<
-                    com::sun::star::ucb::XCommandEnvironment >& rxEnv );
+                    const css::ucb::OpenCommandArgument2& rCommand,
+                    const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv );
 
     };
 }