desktop: com::sun::star->css

Change-Id: Ie94dea9b4f48829132ceadcbf36634eeed191bb9
Reviewed-on: https://gerrit.libreoffice.org/18498
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

6 files changed, 46 insertions, 53 deletions

diff --git a/desktop/source/deployment/inc/dp_dependencies.hxx b/desktop/source/deployment/inc/dp_dependencies.hxx
index 1d64f3b49b40..ba8233aa9778 100644
--- a/desktop/source/deployment/inc/dp_dependencies.hxx
+++ b/desktop/source/deployment/inc/dp_dependencies.hxx
@@ -49,8 +49,8 @@ namespace Dependencies {
        a list of the unsatisfied dependencies from <code>infoset</code> (in no
        specific order)
     */
-    DESKTOP_DEPLOYMENTMISC_DLLPUBLIC com::sun::star::uno::Sequence<
-        com::sun::star::uno::Reference< com::sun::star::xml::dom::XElement > >
+    DESKTOP_DEPLOYMENTMISC_DLLPUBLIC css::uno::Sequence<
+        css::uno::Reference< css::xml::dom::XElement > >
     check(dp_misc::DescriptionInfoset const & infoset);
 
     /**
@@ -64,7 +64,7 @@ namespace Dependencies {
        &ldquo;unknown&rdquo; is substituted for an empty/missing name
     */
     DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString getErrorText(
-        com::sun::star::uno::Reference< com::sun::star::xml::dom::XElement >
+        css::uno::Reference< css::xml::dom::XElement >
             const & dependency);
 }
 
diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
index f8e7cb15a1b1..66460bc87219 100644
--- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
+++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
@@ -72,10 +72,8 @@ public:
        with no content)
     */
     DescriptionInfoset(
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::uno::XComponentContext > const & context,
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::dom::XNode > const & element);
+        css::uno::Reference< css::uno::XComponentContext > const & context,
+        css::uno::Reference< css::xml::dom::XNode > const & element);
 
     ~DescriptionInfoset();
 
@@ -110,7 +108,7 @@ public:
         The value attribute can contain various platform tokens. They must be separated by
         commas.Each token will be stripped from leading and trailing white space (trim()).
     */
-    ::com::sun::star::uno::Sequence< OUString > getSupportedPlaforms() const;
+    css::uno::Sequence< OUString > getSupportedPlaforms() const;
 
     /**
         Returns the localized publisher name and the corresponding URL.
@@ -177,7 +175,7 @@ public:
        @return
        dependencies; will never be null
     */
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNodeList >
+    css::uno::Reference< css::xml::dom::XNodeList >
     getDependencies() const;
 
     /**
@@ -186,8 +184,7 @@ public:
        @return
        update information URLs
     */
-    ::com::sun::star::uno::Sequence< OUString >
-    getUpdateInformationUrls() const;
+    css::uno::Sequence< OUString > getUpdateInformationUrls() const;
 
      /**
         Return the download URLs from the update information.
@@ -199,8 +196,7 @@ public:
         @return
         download URLs
      */
-    ::com::sun::star::uno::Sequence< OUString >
-    getUpdateDownloadUrls() const;
+    css::uno::Sequence< OUString > getUpdateDownloadUrls() const;
 
     /**
         Returns the URL for the icon image.
@@ -213,7 +209,7 @@ private:
     SAL_DLLPRIVATE ::boost::optional< OUString > getOptionalValue(
         OUString const & expression) const;
 
-    SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< OUString > getUrls(
+    SAL_DLLPRIVATE css::uno::Sequence< OUString > getUrls(
         OUString const & expression) const;
 
     /** Retrieves a child element which as lang attribute which matches the office locale.
@@ -225,11 +221,11 @@ private:
         the expression used to obtain the parent of the localized children. It can be null.
         Then a null reference is returned.
     */
-    SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode >
+    SAL_DLLPRIVATE css::uno::Reference< css::xml::dom::XNode >
         getLocalizedChild( OUString const & sParent) const;
-    SAL_DLLPRIVATE  ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode>
+    SAL_DLLPRIVATE  css::uno::Reference< css::xml::dom::XNode>
         matchLanguageTag(
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > const & xParent,
+        css::uno::Reference< css::xml::dom::XNode > const & xParent,
         OUString const & rTag) const;
 
     /** If there is no child element with a locale matching the office locale, then we use
@@ -239,9 +235,9 @@ private:
         However, since OOo 2.4 we use also the first child as default for the license
         unless the two attributes are present.
     */
-    SAL_DLLPRIVATE  ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode>
+    SAL_DLLPRIVATE  css::uno::Reference< css::xml::dom::XNode>
         getChildWithDefaultLocale(
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > const & xParent) const;
+        css::uno::Reference< css::xml::dom::XNode > const & xParent) const;
     /**
         @param out_bParentExists
             indicates if the element node specified in sXPathParent exists.
@@ -266,14 +262,11 @@ private:
      */
     SAL_DLLPRIVATE bool
         checkBlacklistVersion(const OUString& currentversion,
-                              ::com::sun::star::uno::Sequence< OUString > const & versions) const;
-
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::uno::XComponentContext > m_context;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::dom::XNode > m_element;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::xpath::XXPathAPI > m_xpath;
+                              css::uno::Sequence< OUString > const & versions) const;
+
+    css::uno::Reference< css::uno::XComponentContext > m_context;
+    css::uno::Reference< css::xml::dom::XNode >        m_element;
+    css::uno::Reference< css::xml::xpath::XXPathAPI >  m_xpath;
 };
 
 inline  bool DescriptionInfoset::hasDescription() const
diff --git a/desktop/source/deployment/inc/dp_identifier.hxx b/desktop/source/deployment/inc/dp_identifier.hxx
index 1da6bd2379db..16d95c57baf9 100644
--- a/desktop/source/deployment/inc/dp_identifier.hxx
+++ b/desktop/source/deployment/inc/dp_identifier.hxx
@@ -60,10 +60,10 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString generateIdentifier(
    the explicit identifier of the given package if present, otherwise the
    implicit legacy identifier of the given package
 
-   @throws com::sun::star::uno::RuntimeException
+   @throws css::uno::RuntimeException
 */
 DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString getIdentifier(
-    ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage >
+    css::uno::Reference< css::deployment::XPackage >
         const & package);
 
 /**
diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h
index 5a548afc9d35..e2d2412c95fb 100644
--- a/desktop/source/deployment/inc/dp_misc.h
+++ b/desktop/source/deployment/inc/dp_misc.h
@@ -48,9 +48,9 @@ protected:
 };
 
 
-inline void try_dispose( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> const & x )
+inline void try_dispose( css::uno::Reference< css::uno::XInterface> const & x )
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> xComp( x, ::com::sun::star::uno::UNO_QUERY );
+    css::uno::Reference< css::lang::XComponent> xComp( x, css::uno::UNO_QUERY );
     if (xComp.is())
         xComp->dispose();
 }
@@ -94,9 +94,9 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString generateRandomPipeId();
 class AbortChannel;
 
 DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> resolveUnoURL(
+css::uno::Reference< css::uno::XInterface> resolveUnoURL(
     OUString const & connectString,
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const & xLocalContext,
+    css::uno::Reference< css::uno::XComponentContext> const & xLocalContext,
     AbortChannel * abortChannel = 0 );
 
 
@@ -105,7 +105,7 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool office_is_running();
 
 DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
 oslProcess raiseProcess( OUString const & appURL,
-                         ::com::sun::star::uno::Sequence< OUString > const & args );
+                         css::uno::Sequence< OUString > const & args );
 
 
 
@@ -146,15 +146,15 @@ void TRACE(OUString const & sText);
 DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
 void syncRepositories(
     bool force,
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::ucb::XCommandEnvironment> const & xCmdEnv);
+    css::uno::Reference<
+        css::ucb::XCommandEnvironment> const & xCmdEnv);
 
 /** workaround: for some reason the bridge threads which communicate with the
     uno.exe process are not released on time
 */
 DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
 void disposeBridges(
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+    css::uno::Reference< css::uno::XComponentContext >
         const & ctx);
 
 }
diff --git a/desktop/source/deployment/inc/dp_platform.hxx b/desktop/source/deployment/inc/dp_platform.hxx
index 0331d17396d1..43c7ad8c594f 100644
--- a/desktop/source/deployment/inc/dp_platform.hxx
+++ b/desktop/source/deployment/inc/dp_platform.hxx
@@ -39,7 +39,7 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
 
 */
 DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
-bool hasValidPlatform( ::com::sun::star::uno::Sequence< OUString > const & platformStrings);
+bool hasValidPlatform( css::uno::Sequence< OUString > const & platformStrings);
 
 }
 
diff --git a/desktop/source/deployment/inc/dp_update.hxx b/desktop/source/deployment/inc/dp_update.hxx
index e7ceef3a0468..0e07563b59c1 100644
--- a/desktop/source/deployment/inc/dp_update.hxx
+++ b/desktop/source/deployment/inc/dp_update.hxx
@@ -82,21 +82,21 @@ UPDATE_SOURCE isUpdateSharedExtension(
 
  */
 DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
-::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage>
+css::uno::Reference< css::deployment::XPackage>
 getExtensionWithHighestVersion(
-    ::com::sun::star::uno::Sequence<
-    ::com::sun::star::uno::Reference<
-    ::com::sun::star::deployment::XPackage> > const & seqExtensionsWithSameId);
+    css::uno::Sequence<
+    css::uno::Reference<
+    css::deployment::XPackage> > const & seqExtensionsWithSameId);
 
 
 struct UpdateInfo
 {
-    UpdateInfo( ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage> const & ext);
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::deployment::XPackage> extension;
-//version of the update
+    UpdateInfo( css::uno::Reference< css::deployment::XPackage> const & ext);
+
+    css::uno::Reference<  css::deployment::XPackage> extension;
+    //version of the update
     OUString version;
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > info;
+    css::uno::Reference< css::xml::dom::XNode > info;
 };
 
 typedef std::map< OUString, UpdateInfo > UpdateInfoMap;
@@ -118,12 +118,12 @@ typedef std::map< OUString, UpdateInfo > UpdateInfoMap;
  */
 DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
 UpdateInfoMap getOnlineUpdateInfos(
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const &xContext,
-    ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager> const & xExtMgr,
-    ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XUpdateInformationProvider > const & updateInformation,
-    std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > > const * extensionList,
-    ::std::vector< ::std::pair< ::com::sun::star::uno::Reference<
-    ::com::sun::star::deployment::XPackage>, ::com::sun::star::uno::Any> > & out_errors);
+    css::uno::Reference< css::uno::XComponentContext> const &xContext,
+    css::uno::Reference< css::deployment::XExtensionManager> const & xExtMgr,
+    css::uno::Reference< css::deployment::XUpdateInformationProvider > const & updateInformation,
+    std::vector< css::uno::Reference< css::deployment::XPackage > > const * extensionList,
+    ::std::vector< ::std::pair< css::uno::Reference<
+    css::deployment::XPackage>, css::uno::Any> > & out_errors);
 
 /* retunrs the highest version from the provided arguments.
 */