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>

6 files changed, 92 insertions, 142 deletions

diff --git a/ucb/source/ucp/hierarchy/dynamicresultset.hxx b/ucb/source/ucp/hierarchy/dynamicresultset.hxx
index bb4bba1fd3aa..9dd4780f6096 100644
--- a/ucb/source/ucp/hierarchy/dynamicresultset.hxx
+++ b/ucb/source/ucp/hierarchy/dynamicresultset.hxx
@@ -36,10 +36,9 @@ private:
 
 public:
     DynamicResultSet(
-            const com::sun::star::uno::Reference<
-                com::sun::star::uno::XComponentContext >& rxContext,
+            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
             const rtl::Reference< HierarchyContent >& rxContent,
-            const com::sun::star::ucb::OpenCommandArgument2& rCommand );
+            const css::ucb::OpenCommandArgument2& rCommand );
 };
 
 }
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index 6bdb4e9be3ea..60740ae039ca 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
@@ -81,7 +81,7 @@ public:
 
     bool getIsDocument() const { return !getIsFolder(); }
 
-    com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo >
+    css::uno::Sequence< css::ucb::ContentInfo >
     getCreatableContentsInfo() const;
 
     const HierarchyEntryData & getHierarchyEntryData() const { return m_aData; }
@@ -96,7 +96,7 @@ private:
 class HierarchyContentProvider;
 
 class HierarchyContent : public ::ucbhelper::ContentImplHelper,
-                         public com::sun::star::ucb::XContentCreator
+                         public css::ucb::XContentCreator
 {
     enum ContentKind  { LINK, FOLDER, ROOT };
     enum ContentState { TRANSIENT,  // created via CreateNewContent,
@@ -114,61 +114,46 @@ class HierarchyContent : public ::ucbhelper::ContentImplHelper,
 
 private:
     HierarchyContent(
-            const com::sun::star::uno::Reference<
-                com::sun::star::uno::XComponentContext >& rxContext,
+            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
             HierarchyContentProvider* pProvider,
-            const com::sun::star::uno::Reference<
-                com::sun::star::ucb::XContentIdentifier >& Identifier,
+            const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
             const HierarchyContentProperties& rProps );
     HierarchyContent(
-            const com::sun::star::uno::Reference<
-                com::sun::star::uno::XComponentContext >& rxContext,
+            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
             HierarchyContentProvider* pProvider,
-            const com::sun::star::uno::Reference<
-                com::sun::star::ucb::XContentIdentifier >& Identifier,
-            const com::sun::star::ucb::ContentInfo& Info );
-
-    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 com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo >
-    getCommands( const com::sun::star::uno::Reference<
-                    com::sun::star::ucb::XCommandEnvironment > & xEnv ) override;
+            const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
+            const css::ucb::ContentInfo& Info );
+
+    virtual css::uno::Sequence< css::beans::Property >
+    getProperties( const css::uno::Reference<css::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;
 
     static bool hasData(
-            const com::sun::star::uno::Reference<
-                com::sun::star::uno::XComponentContext >& rxContext,
+            const css::uno::Reference<  css::uno::XComponentContext >& rxContext,
             HierarchyContentProvider* pProvider,
-            const com::sun::star::uno::Reference<
-                com::sun::star::ucb::XContentIdentifier >& Identifier );
+            const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier );
     bool hasData(
-            const com::sun::star::uno::Reference<
-                com::sun::star::ucb::XContentIdentifier >& Identifier )
+            const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
     { return hasData( m_xContext, m_pProvider, Identifier ); }
     static bool loadData(
-            const com::sun::star::uno::Reference<
-                com::sun::star::uno::XComponentContext >& rxContext,
+            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
             HierarchyContentProvider* pProvider,
-            const com::sun::star::uno::Reference<
-                com::sun::star::ucb::XContentIdentifier >& Identifier,
+            const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
             HierarchyContentProperties& rProps );
     bool storeData();
-    bool renameData( const com::sun::star::uno::Reference<
-                            com::sun::star::ucb::XContentIdentifier >& xOldId,
-                         const com::sun::star::uno::Reference<
-                            com::sun::star::ucb::XContentIdentifier >& xNewId );
+    bool renameData( const css::uno::Reference< css::ucb::XContentIdentifier >& xOldId,
+                     const css::uno::Reference< css::ucb::XContentIdentifier >& xNewId );
     bool removeData();
 
-    void setKind( const com::sun::star::uno::Reference<
-                    com::sun::star::ucb::XContentIdentifier >& Identifier );
+    void setKind( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier );
 
     bool isReadOnly();
 
     bool isFolder() const { return ( m_eKind > LINK ); }
 
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::ucb::XContentIdentifier >
+    css::uno::Reference< css::ucb::XContentIdentifier >
     makeNewIdentifier( const OUString& rTitle );
 
     typedef rtl::Reference< HierarchyContent > HierarchyContentRef;
@@ -176,52 +161,42 @@ private:
     void queryChildren( HierarchyContentRefList& rChildren );
 
     bool exchangeIdentity(
-                const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::ucb::XContentIdentifier >& xNewId );
+                const css::uno::Reference< css::ucb::XContentIdentifier >& xNewId );
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >
-    getPropertyValues( const ::com::sun::star::uno::Sequence<
-                            ::com::sun::star::beans::Property >& rProperties );
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
+    css::uno::Reference< css::sdbc::XRow >
+    getPropertyValues( const css::uno::Sequence< css::beans::Property >& rProperties );
+    css::uno::Sequence< css::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 )
-        throw( ::com::sun::star::uno::Exception, std::exception );
+            const css::uno::Sequence< css::beans::PropertyValue >& rValues,
+            const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
+        throw( css::uno::Exception, std::exception );
 
     void insert( sal_Int32 nNameClashResolve,
-                 const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::ucb::XCommandEnvironment > & xEnv )
-        throw( ::com::sun::star::uno::Exception, std::exception );
+                 const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
+        throw( css::uno::Exception, std::exception );
 
     void destroy( bool bDeletePhysical,
-                  const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::ucb::XCommandEnvironment > & xEnv )
-        throw( ::com::sun::star::uno::Exception, std::exception );
+                  const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
+        throw( css::uno::Exception, std::exception );
 
-    void transfer( const ::com::sun::star::ucb::TransferInfo& rInfo,
-                   const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::ucb::XCommandEnvironment > & xEnv )
-        throw( ::com::sun::star::uno::Exception, std::exception );
+    void transfer( const css::ucb::TransferInfo& rInfo,
+                   const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
+        throw( css::uno::Exception, std::exception );
 
 public:
     // Create existing content. Fail, if not already exists.
     static HierarchyContent* create(
-            const com::sun::star::uno::Reference<
-                com::sun::star::uno::XComponentContext >& rxContext,
+            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
             HierarchyContentProvider* pProvider,
-            const com::sun::star::uno::Reference<
-                com::sun::star::ucb::XContentIdentifier >& Identifier );
+            const css::uno::Reference<
+                css::ucb::XContentIdentifier >& Identifier );
 
     // Create new content. Fail, if already exists.
     static HierarchyContent* create(
-            const com::sun::star::uno::Reference<
-                com::sun::star::uno::XComponentContext >& rxContext,
+            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
             HierarchyContentProvider* pProvider,
-            const com::sun::star::uno::Reference<
-                com::sun::star::ucb::XContentIdentifier >& Identifier,
-            const com::sun::star::ucb::ContentInfo& Info );
+            const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
+            const css::ucb::ContentInfo& Info );
 
     virtual ~HierarchyContent();
 
@@ -242,56 +217,50 @@ public:
     // XServiceInfo
     virtual OUString SAL_CALL
     getImplementationName()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
+        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     // XContent
     virtual OUString SAL_CALL
     getContentType()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual com::sun::star::uno::Reference<
-                com::sun::star::ucb::XContentIdentifier > SAL_CALL
+        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
     getIdentifier()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     // XCommandProcessor
-    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;
 
 
     // Additional interfaces
 
 
     // XContentCreator
-    virtual com::sun::star::uno::Sequence<
-                com::sun::star::ucb::ContentInfo > SAL_CALL
+    virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL
     queryCreatableContentsInfo()
-        throw( com::sun::star::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;
+        throw( css::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;
 
 
     // Non-interface methods.
 
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >
-    getPropertyValues( const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::uno::XComponentContext >& rxContext,
-                       const ::com::sun::star::uno::Sequence<
-                            ::com::sun::star::beans::Property >& rProperties,
+    static css::uno::Reference< css::sdbc::XRow >
+    getPropertyValues( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                       const css::uno::Sequence< css::beans::Property >& rProperties,
                        const HierarchyContentProperties& rData,
                        HierarchyContentProvider* pProvider,
                        const OUString& rContentId );
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.hxx b/ucb/source/ucp/hierarchy/hierarchydata.hxx
index a9eb1a705106..cb02be2209ee 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx
@@ -81,27 +81,21 @@ class HierarchyEntry
     OUString m_aName;
     OUString m_aPath;
     ::osl::Mutex    m_aMutex;
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::uno::XComponentContext >     m_xContext;
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::lang::XMultiServiceFactory > m_xConfigProvider;
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::container::XHierarchicalNameAccess >
+    css::uno::Reference< css::uno::XComponentContext >     m_xContext;
+    css::uno::Reference< css::lang::XMultiServiceFactory > m_xConfigProvider;
+    css::uno::Reference< css::container::XHierarchicalNameAccess >
                                                            m_xRootReadAccess;
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::util::XOfficeInstallationDirectories >
+    css::uno::Reference< css::util::XOfficeInstallationDirectories >
                                                            m_xOfficeInstDirs;
     bool m_bTriedToGetRootReadAccess;
 
 private:
     static OUString createPathFromHierarchyURL( const HierarchyUri & rURI );
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::container::XHierarchicalNameAccess >
+    css::uno::Reference< css::container::XHierarchicalNameAccess >
     getRootReadAccess();
 
 public:
-    HierarchyEntry( const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::uno::XComponentContext >& rxContext,
+    HierarchyEntry( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                     HierarchyContentProvider* pProvider,
                     const OUString& rURL );
 
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index d3cdf8ff8cde..41cfa3dc4b4a 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -117,7 +117,7 @@ public:
     // XTypeProvider
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
         throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
         throw( css::uno::RuntimeException, std::exception ) override;
 
     // XComponent
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
index 1ecd4932aa5f..505149a5abc5 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
@@ -40,17 +40,15 @@ private:
 
 public:
     HierarchyResultSetDataSupplier(
-                    const com::sun::star::uno::Reference<
-                        com::sun::star::uno::XComponentContext >& rxContext,
+                    const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                     const rtl::Reference< HierarchyContent >& rContent,
-                    sal_Int32 nOpenMode = com::sun::star::ucb::OpenMode::ALL );
+                    sal_Int32 nOpenMode = css::ucb::OpenMode::ALL );
     virtual ~HierarchyResultSetDataSupplier();
 
     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;
@@ -59,14 +57,14 @@ public:
     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;
 };
 
 } // namespace hierarchy_ucp
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index 290865ed0d96..aa6a93b11e44 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
@@ -48,10 +48,8 @@ namespace hierarchy_ucp {
 
 struct ConfigProviderMapEntry
 {
-    com::sun::star::uno::Reference<
-        com::sun::star::lang::XMultiServiceFactory > xConfigProvider;
-    com::sun::star::uno::Reference<
-        com::sun::star::container::XHierarchicalNameAccess > xRootReadAccess;
+    css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider;
+    css::uno::Reference< css::container::XHierarchicalNameAccess > xRootReadAccess;
     bool bTriedToGetRootReadAccess;
 
     ConfigProviderMapEntry() : bTriedToGetRootReadAccess( false ) {}
@@ -66,16 +64,14 @@ typedef std::unordered_map
 ConfigProviderMap;
 
 class HierarchyContentProvider : public ::ucbhelper::ContentProviderImplHelper,
-                                 public com::sun::star::lang::XInitialization
+                                 public css::lang::XInitialization
 {
     ConfigProviderMap   m_aConfigProviderMap;
-    com::sun::star::uno::Reference<
-        com::sun::star::util::XOfficeInstallationDirectories > m_xOfficeInstDirs;
+    css::uno::Reference< css::util::XOfficeInstallationDirectories > m_xOfficeInstDirs;
 
 public:
     explicit HierarchyContentProvider(
-                const com::sun::star::uno::Reference<
-                    com::sun::star::uno::XComponentContext >& rxContext );
+                const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     virtual ~HierarchyContentProvider();
 
     // XInterface
@@ -108,31 +104,25 @@ 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;
 
     // 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;
+    initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+        throw( css::uno::Exception,
+               css::uno::RuntimeException, std::exception ) override;
 
     // Non-Interface methods
-    com::sun::star::uno::Reference<
-        com::sun::star::lang::XMultiServiceFactory >
+    css::uno::Reference< css::lang::XMultiServiceFactory >
     getConfigProvider( const OUString & rServiceSpecifier );
-    com::sun::star::uno::Reference<
-        com::sun::star::container::XHierarchicalNameAccess >
+    css::uno::Reference< css::container::XHierarchicalNameAccess >
     getRootConfigReadNameAccess( const OUString & rServiceSpecifier );
 
     // Note: may retrun an empty reference.
-    com::sun::star::uno::Reference<
-        com::sun::star::util::XOfficeInstallationDirectories >
+    css::uno::Reference< css::util::XOfficeInstallationDirectories >
     getOfficeInstallationDirectories();
 };