com::sun::star->css in unotools/

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

40 files changed, 194 insertions, 208 deletions

diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx
index e411a9c937cc..726943ce98b7 100644
--- a/unotools/source/accessibility/accessiblerelationsethelper.cxx
+++ b/unotools/source/accessibility/accessiblerelationsethelper.cxx
@@ -228,23 +228,19 @@ void AccessibleRelationSetHelper::AddRelation(const AccessibleRelation& rRelatio
 
 //=====  XTypeProvider  =======================================================
 
-uno::Sequence< ::com::sun::star::uno::Type>
-    AccessibleRelationSetHelper::getTypes()
-    throw (::com::sun::star::uno::RuntimeException, std::exception)
+uno::Sequence< css::uno::Type> AccessibleRelationSetHelper::getTypes()
+    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard (maMutex);
-    const ::com::sun::star::uno::Type aTypeList[] = {
+    css::uno::Sequence< css::uno::Type> aTypeSequence {
         cppu::UnoType<XAccessibleRelationSet>::get(),
         cppu::UnoType<lang::XTypeProvider>::get()
-        };
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>
-        aTypeSequence (aTypeList, 2);
+    };
     return aTypeSequence;
 }
 
-uno::Sequence<sal_Int8> SAL_CALL
-    AccessibleRelationSetHelper::getImplementationId()
-    throw (::com::sun::star::uno::RuntimeException, std::exception)
+uno::Sequence<sal_Int8> SAL_CALL AccessibleRelationSetHelper::getImplementationId()
+    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx
index 7c0e100fc49c..1608b9743da5 100644
--- a/unotools/source/accessibility/accessiblestatesethelper.cxx
+++ b/unotools/source/accessibility/accessiblestatesethelper.cxx
@@ -241,22 +241,18 @@ void AccessibleStateSetHelper::RemoveState(sal_Int16 aState)
 
 //=====  XTypeProvider  =======================================================
 
-uno::Sequence< ::com::sun::star::uno::Type>
-    AccessibleStateSetHelper::getTypes()
-    throw (::com::sun::star::uno::RuntimeException, std::exception)
+uno::Sequence< css::uno::Type> AccessibleStateSetHelper::getTypes()
+    throw (css::uno::RuntimeException, std::exception)
 {
-    const ::com::sun::star::uno::Type aTypeList[] = {
+    css::uno::Sequence< css::uno::Type> aTypeSequence {
         cppu::UnoType<XAccessibleStateSet>::get(),
         cppu::UnoType<lang::XTypeProvider>::get()
-        };
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>
-        aTypeSequence (aTypeList, 2);
+    };
     return aTypeSequence;
 }
 
-uno::Sequence<sal_Int8> SAL_CALL
-    AccessibleStateSetHelper::getImplementationId()
-    throw (::com::sun::star::uno::RuntimeException, std::exception)
+uno::Sequence<sal_Int8> SAL_CALL AccessibleStateSetHelper::getImplementationId()
+    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index 230af07eadcd..5bd0e82cb718 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -85,7 +85,7 @@ class SvtCmdOptions
         CommandHashMap m_aCommandHashMap;
 };
 
-typedef ::std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > > SvtFrameVector;
+typedef ::std::vector< css::uno::WeakReference< css::frame::XFrame > > SvtFrameVector;
 
 class SvtCommandOptions_Impl : public ConfigItem
 {
@@ -115,7 +115,7 @@ class SvtCommandOptions_Impl : public ConfigItem
 
         bool                HasEntries  (   SvtCommandOptions::CmdOption    eOption     ) const;
         bool                Lookup      (   SvtCommandOptions::CmdOption    eCmdOption, const OUString& ) const;
-        void EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
+        void EstablisFrameCallback(const css::uno::Reference< css::frame::XFrame >& xFrame);
 
     private:
 
@@ -215,7 +215,7 @@ void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& )
                                         pIt != m_lFrames.end();
                                       ++pIt                     )
     {
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame(pIt->get(), ::com::sun::star::uno::UNO_QUERY);
+        css::uno::Reference< css::frame::XFrame > xFrame(pIt->get(), css::uno::UNO_QUERY);
         if (xFrame.is())
             xFrame->contextChanged();
     }
@@ -257,12 +257,12 @@ bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption, co
 
 //  public method
 
-void SvtCommandOptions_Impl::EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame)
+void SvtCommandOptions_Impl::EstablisFrameCallback(const css::uno::Reference< css::frame::XFrame >& xFrame)
 {
     // check if frame already exists inside list
     // ignore double registrations
     // every frame must be notified one times only!
-    ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > xWeak(xFrame);
+    css::uno::WeakReference< css::frame::XFrame > xWeak(xFrame);
     SvtFrameVector::const_iterator pIt = ::std::find(m_lFrames.begin(), m_lFrames.end(), xWeak);
     if (pIt == m_lFrames.end())
         m_lFrames.push_back(xWeak);
@@ -344,7 +344,7 @@ bool SvtCommandOptions::Lookup( CmdOption eCmdOption, const OUString& aCommandUR
 
 //  public method
 
-void SvtCommandOptions::EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame)
+void SvtCommandOptions::EstablisFrameCallback(const css::uno::Reference< css::frame::XFrame >& xFrame)
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     m_pDataContainer->EstablisFrameCallback(xFrame);
diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx
index 69f52ec12afd..096a7f00663e 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -351,7 +351,7 @@ SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl()
         if ( !bDefaultFound && aItem.sName == COMPATIBILITY_DEFAULT_NAME )
         {
             SvtSysLocale aSysLocale;
-            com::sun::star::lang::Locale aLocale = aSysLocale.GetLanguageTag().getLocale();
+            css::lang::Locale aLocale = aSysLocale.GetLanguageTag().getLocale();
             if ( aLocale.Language == "zh" || aLocale.Language == "ja" || aLocale.Language == "ko" )
                 aItem.bExpandWordSpace = false;
 
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index bd45e394aaa8..554c18bbe991 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -80,7 +80,7 @@ catch(const Exception& rEx)   \
 namespace utl{
     class ConfigChangeListener_Impl : public cppu::WeakImplHelper
     <
-        com::sun::star::util::XChangesListener
+        css::util::XChangesListener
     >
     {
         public:
@@ -193,7 +193,7 @@ ConfigItem::~ConfigItem()
     ConfigManager::getConfigManager().removeConfigItem(*this);
 }
 
-void ConfigItem::CallNotify( const com::sun::star::uno::Sequence<OUString>& rPropertyNames )
+void ConfigItem::CallNotify( const css::uno::Sequence<OUString>& rPropertyNames )
 {
     // the call is forwarded to the virtual Notify() method
     // it is pure virtual, so all classes deriving from ConfigItem have to decide how they
@@ -344,7 +344,7 @@ void ConfigItem::impl_unpackLocalizedProperties(    const   Sequence< OUString >
     }
 }
 
-Sequence< sal_Bool > ConfigItem::GetReadOnlyStates(const com::sun::star::uno::Sequence< OUString >& rNames)
+Sequence< sal_Bool > ConfigItem::GetReadOnlyStates(const css::uno::Sequence< OUString >& rNames)
 {
     sal_Int32 i;
 
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index 081848d018c5..ee3731b99e6b 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -93,7 +93,7 @@ public:
                     SvtDefaultOptions_Impl();
 
     OUString         GetDefaultPath( sal_uInt16 nId ) const;
-    virtual void    Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) override;
+    virtual void    Notify( const css::uno::Sequence<OUString>& aPropertyNames) override;
 
 private:
     virtual void    ImplCommit() override;
@@ -234,7 +234,7 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() : ConfigItem( "Office.Common/Pa
             {
                 switch ( pValues[nProp].getValueTypeClass() )
                 {
-                    case ::com::sun::star::uno::TypeClass_STRING :
+                    case css::uno::TypeClass_STRING :
                     {
                         // multi paths
                         if ( pValues[nProp] >>= aTempStr )
@@ -246,7 +246,7 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() : ConfigItem( "Office.Common/Pa
                         break;
                     }
 
-                    case ::com::sun::star::uno::TypeClass_SEQUENCE :
+                    case css::uno::TypeClass_SEQUENCE :
                     {
                         // single paths
                         aFullPath.clear();
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index a10c74c33b9d..eda804829c83 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -96,14 +96,14 @@ public:
     GlobalEventConfig_Impl( );
     virtual ~GlobalEventConfig_Impl( );
 
-    void            Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) override;
-
-    void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (::com::sun::star::uno::RuntimeException);
-    bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
-    static ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw (::com::sun::star::uno::RuntimeException);
-    bool SAL_CALL hasElements(  ) throw (::com::sun::star::uno::RuntimeException);
+    void            Notify( const css::uno::Sequence<OUString>& aPropertyNames) override;
+
+    void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (css::uno::RuntimeException);
+    bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException);
+    static css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException);
+    bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException);
     OUString GetEventName( GlobalEventId nID );
 };
 
@@ -150,7 +150,7 @@ void GlobalEventConfig_Impl::Notify( const Sequence< OUString >& )
                                         pIt != m_lFrames.end();
                                       ++pIt                     )
     {
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame(pIt->get(), ::com::sun::star::uno::UNO_QUERY);
+        css::uno::Reference< css::frame::XFrame > xFrame(pIt->get(), css::uno::UNO_QUERY);
         if (xFrame.is())
             xFrame->contextChanged();
     }
@@ -336,7 +336,7 @@ GlobalEventConfig::~GlobalEventConfig()
     }
 }
 
-Reference< container::XNameReplace > SAL_CALL GlobalEventConfig::getEvents() throw (::com::sun::star::uno::RuntimeException, std::exception)
+Reference< container::XNameReplace > SAL_CALL GlobalEventConfig::getEvents() throw (css::uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     Reference< container::XNameReplace > ret(this);
diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx
index ed9350c75bb0..1a9dbb057203 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.cxx
@@ -68,7 +68,7 @@ public:
         bLoadVBA(false),
         bSaveVBA(false)  {}
     virtual ~SvtAppFilterOptions_Impl();
-    virtual void            Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) override;
+    virtual void            Notify( const css::uno::Sequence<OUString>& aPropertyNames) override;
     void                    Load();
 
     bool                IsLoad() const {return bLoadVBA;}
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index 483af6fe5a6a..0409768ed543 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -872,7 +872,7 @@ static const enum_convert pWidthNames[] =
     { "ultraexpanded", WIDTH_ULTRA_EXPANDED }
 };
 
-void FontSubstConfiguration::fillSubstVector( const com::sun::star::uno::Reference< XNameAccess >& rFont,
+void FontSubstConfiguration::fillSubstVector( const css::uno::Reference< XNameAccess >& rFont,
                                               const OUString& rType,
                                               std::vector< OUString >& rSubstVector ) const
 {
@@ -921,7 +921,7 @@ void FontSubstConfiguration::fillSubstVector( const com::sun::star::uno::Referen
     }
 }
 
-FontWeight FontSubstConfiguration::getSubstWeight( const com::sun::star::uno::Reference< XNameAccess >& rFont,
+FontWeight FontSubstConfiguration::getSubstWeight( const css::uno::Reference< XNameAccess >& rFont,
                                                    const OUString& rType ) const
 {
     int weight = -1;
@@ -953,7 +953,7 @@ FontWeight FontSubstConfiguration::getSubstWeight( const com::sun::star::uno::Re
     return (FontWeight)( weight >= 0 ? pWeightNames[weight].nEnum : WEIGHT_DONTKNOW );
 }
 
-FontWidth FontSubstConfiguration::getSubstWidth( const com::sun::star::uno::Reference< XNameAccess >& rFont,
+FontWidth FontSubstConfiguration::getSubstWidth( const css::uno::Reference< XNameAccess >& rFont,
                                                  const OUString& rType ) const
 {
     int width = -1;
@@ -985,7 +985,7 @@ FontWidth FontSubstConfiguration::getSubstWidth( const com::sun::star::uno::Refe
     return (FontWidth)( width >= 0 ? pWidthNames[width].nEnum : WIDTH_DONTKNOW );
 }
 
-ImplFontAttrs FontSubstConfiguration::getSubstType( const com::sun::star::uno::Reference< XNameAccess >& rFont,
+ImplFontAttrs FontSubstConfiguration::getSubstType( const css::uno::Reference< XNameAccess >& rFont,
                                                     const OUString& rType ) const
 {
     unsigned long type = 0;
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 271abe33848b..aa50fe979b16 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -160,7 +160,7 @@ public:
     virtual ~SvtLinguConfigItem();
 
     // utl::ConfigItem
-    virtual void    Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) override;
+    virtual void    Notify( const css::uno::Sequence< OUString > &rPropertyNames ) override;
 
     // make some protected functions of utl::ConfigItem public
     using utl::ConfigItem::GetNodeNames;
@@ -170,15 +170,15 @@ public:
     using utl::ConfigItem::ReplaceSetProperties;
     //using utl::ConfigItem::GetReadOnlyStates;
 
-    com::sun::star::uno::Any
+    css::uno::Any
             GetProperty( const OUString &rPropertyName ) const;
-    com::sun::star::uno::Any
+    css::uno::Any
             GetProperty( sal_Int32 nPropertyHandle ) const;
 
     bool    SetProperty( const OUString &rPropertyName,
-                         const com::sun::star::uno::Any &rValue );
+                         const css::uno::Any &rValue );
     bool    SetProperty( sal_Int32 nPropertyHandle,
-                         const com::sun::star::uno::Any &rValue );
+                         const css::uno::Any &rValue );
 
     const SvtLinguOptions& GetOptions() const;
 
diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx
index 527b8eb3e86c..f5d128b623e7 100644
--- a/unotools/source/config/misccfg.cxx
+++ b/unotools/source/config/misccfg.cxx
@@ -45,7 +45,7 @@ private:
     bool            bNotFound;
     sal_Int32       nYear2000;      // two digit year representation
 
-    static const com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+    static const css::uno::Sequence<OUString> GetPropertyNames();
     void                    Load();
 
     virtual void            ImplCommit() override;
@@ -54,7 +54,7 @@ public:
     SfxMiscCfg( );
     virtual ~SfxMiscCfg( );
 
-    virtual void            Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) override;
+    virtual void            Notify( const css::uno::Sequence<OUString>& aPropertyNames) override;
 
     bool        IsNotFoundWarning()     const {return bNotFound;}
     void        SetNotFoundWarning( bool bSet);
@@ -151,7 +151,7 @@ void SfxMiscCfg::Load()
     }
 }
 
-void SfxMiscCfg::Notify( const com::sun::star::uno::Sequence<OUString>& )
+void SfxMiscCfg::Notify( const css::uno::Sequence<OUString>& )
 {
     Load();
 }
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index fc29b3283b4f..71703899d50f 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -294,7 +294,7 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem
         //  public interface
 
         bool            IsModuleInstalled         (       SvtModuleOptions::EModule     eModule    ) const;
-        ::com::sun::star::uno::Sequence < OUString > GetAllServiceNames();
+        css::uno::Sequence < OUString > GetAllServiceNames();
         OUString        GetFactoryName            (       SvtModuleOptions::EFactory    eFactory   ) const;
         OUString        GetFactoryStandardTemplate(       SvtModuleOptions::EFactory    eFactory   ) const;
         static OUString GetFactoryEmptyDocumentURL(       SvtModuleOptions::EFactory    eFactory   );
@@ -474,7 +474,7 @@ bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eModule
     return bInstalled;
 }
 
-::com::sun::star::uno::Sequence < OUString > SvtModuleOptions_Impl::GetAllServiceNames()
+css::uno::Sequence < OUString > SvtModuleOptions_Impl::GetAllServiceNames()
 {
     std::vector<OUString> aVec;
 
@@ -1163,7 +1163,7 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByModel(const css::u
     return EFactory::UNKNOWN_FACTORY;
 }
 
-::com::sun::star::uno::Sequence < OUString > SvtModuleOptions::GetAllServiceNames()
+css::uno::Sequence < OUString > SvtModuleOptions::GetAllServiceNames()
 {
     ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() );
     return m_pDataContainer->GetAllServiceNames();
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index 5b963b09e9b2..f99b1386bacc 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -57,7 +57,7 @@ private:
 public:
                     SvtOptionsDlgOptions_Impl();
 
-    virtual void    Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void    Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
     static ::osl::Mutex & getInitMutex();
 
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 33fd23000fe8..42fcd81cbf76 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -404,7 +404,7 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() :
     NameToHandleMap aTempHashMap;
     for ( sal_Int32 n = 0; n < aPathPropSeq.getLength(); n++ )
     {
-        const com::sun::star::beans::Property& aProperty = aPathPropSeq[n];
+        const css::beans::Property& aProperty = aPathPropSeq[n];
         aTempHashMap.insert( NameToHandleMap::value_type( aProperty.Name, aProperty.Handle ));
     }
 
diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx
index 1b5650873cc6..4cc0f26c108a 100644
--- a/unotools/source/config/printwarningoptions.cxx
+++ b/unotools/source/config/printwarningoptions.cxx
@@ -59,7 +59,7 @@ public:
 
 //  override methods of baseclass
 
-    virtual void    Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void    Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
 //  public interface
 
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 38dff4156745..809522f40bd4 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -99,7 +99,7 @@ public:
                             SvtSaveOptions_Impl();
                             virtual ~SvtSaveOptions_Impl();
 
-    virtual void            Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void            Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
     sal_Int32               GetAutoSaveTime() const             { return nAutoSaveTime; }
     bool                    IsUseUserData() const               { return bUseUserData; }
@@ -772,7 +772,7 @@ public:
                             SvtLoadOptions_Impl();
                             virtual ~SvtLoadOptions_Impl();
 
-    virtual void            Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void            Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
     void                    SetLoadUserSettings(bool b){bLoadUserDefinedSettings = b; SetModified();}
     bool                IsLoadUserSettings() const {return bLoadUserDefinedSettings;}
@@ -789,7 +789,7 @@ SvtLoadOptions_Impl::SvtLoadOptions_Impl()
     EnableNotification( aNames );
     const Any* pValues = aValues.getConstArray();
     DBG_ASSERT( aValues.getLength() == aNames.getLength(), "GetProperties failed" );
-    if (pValues[0].getValueTypeClass() == ::com::sun::star::uno::TypeClass_BOOLEAN)
+    if (pValues[0].getValueTypeClass() == css::uno::TypeClass_BOOLEAN)
          bLoadUserDefinedSettings = *static_cast<sal_Bool const *>(pValues[0].getValue());
 }
 
diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx
index 5f8cda2be5b9..6c1a2b34f19e 100644
--- a/unotools/source/config/searchopt.cxx
+++ b/unotools/source/config/searchopt.cxx
@@ -59,7 +59,7 @@ public:
     SvtSearchOptions_Impl();
     virtual ~SvtSearchOptions_Impl();
 
-    virtual void    Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void    Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
     bool            GetFlag( sal_uInt16 nOffset ) const;
     void            SetFlag( sal_uInt16 nOffset, bool bVal );
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index fad440be2400..795d768cdaa5 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -681,7 +681,7 @@ void SvtSecurityOptions_Impl::ImplCommit()
                             OUString aPrefix(
                                 PROPERTYNAME_MACRO_TRUSTEDAUTHORS "/a"
                                 + OUString::number(i) + "/");
-                            Sequence< com::sun::star::beans::PropertyValue >    lPropertyValues( 3 );
+                            Sequence< css::beans::PropertyValue >    lPropertyValues( 3 );
                             lPropertyValues[ 0 ].Name = aPrefix + PROPERTYNAME_TRUSTEDAUTHOR_SUBJECTNAME;
                             lPropertyValues[ 0 ].Value <<= m_seqTrustedAuthors[ i ][0];
                             lPropertyValues[ 1 ].Name = aPrefix + PROPERTYNAME_TRUSTEDAUTHOR_SERIALNUMBER;
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index 6de88a677989..d3bbfbed99cc 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -74,7 +74,7 @@ public:
                                 SvtSysLocaleOptions_Impl();
     virtual                     ~SvtSysLocaleOptions_Impl();
 
-    virtual void                Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void                Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
             const OUString&     GetLocaleString() const
                                     { return m_aLocaleString; }
diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx
index 647e70574567..117eac5b4248 100644
--- a/unotools/source/i18n/calendarwrapper.cxx
+++ b/unotools/source/i18n/calendarwrapper.cxx
@@ -40,7 +40,7 @@ CalendarWrapper::~CalendarWrapper()
 {
 }
 
-void CalendarWrapper::loadDefaultCalendar( const ::com::sun::star::lang::Locale& rLocale )
+void CalendarWrapper::loadDefaultCalendar( const css::lang::Locale& rLocale )
 {
     try
     {
@@ -53,7 +53,7 @@ void CalendarWrapper::loadDefaultCalendar( const ::com::sun::star::lang::Locale&
     }
 }
 
-void CalendarWrapper::loadCalendar( const OUString& rUniqueID, const ::com::sun::star::lang::Locale& rLocale )
+void CalendarWrapper::loadCalendar( const OUString& rUniqueID, const css::lang::Locale& rLocale )
 {
     try
     {
@@ -67,7 +67,7 @@ void CalendarWrapper::loadCalendar( const OUString& rUniqueID, const ::com::sun:
     }
 }
 
-::com::sun::star::uno::Sequence< OUString > CalendarWrapper::getAllCalendars( const ::com::sun::star::lang::Locale& rLocale ) const
+css::uno::Sequence< OUString > CalendarWrapper::getAllCalendars( const css::lang::Locale& rLocale ) const
 {
     try
     {
@@ -79,7 +79,7 @@ void CalendarWrapper::loadCalendar( const OUString& rUniqueID, const ::com::sun:
         SAL_WARN( "unotools.i18n", "getAllCalendars: Exception caught " << e.Message );
     }
 
-    return ::com::sun::star::uno::Sequence< OUString > (0);
+    return css::uno::Sequence< OUString > (0);
 }
 
 OUString CalendarWrapper::getUniqueID() const
@@ -250,7 +250,7 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
     return 0;
 }
 
-::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > CalendarWrapper::getMonths() const
+css::uno::Sequence< css::i18n::CalendarItem2 > CalendarWrapper::getMonths() const
 {
     try
     {
@@ -261,10 +261,10 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
     {
         SAL_WARN( "unotools.i18n", "getMonths: Exception caught " << e.Message );
     }
-    return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0);
+    return css::uno::Sequence< css::i18n::CalendarItem2 > (0);
 }
 
-::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > CalendarWrapper::getDays() const
+css::uno::Sequence< css::i18n::CalendarItem2 > CalendarWrapper::getDays() const
 {
     try
     {
@@ -275,7 +275,7 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
     {
         SAL_WARN( "unotools.i18n", "getDays: Exception caught " << e.Message );
     }
-    return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0);
+    return css::uno::Sequence< css::i18n::CalendarItem2 > (0);
 }
 
 OUString CalendarWrapper::getDisplayName( sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType ) const
@@ -310,7 +310,7 @@ OUString CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_
 
 // --- XCalendar3 ------------------------------------------------------------
 
-::com::sun::star::i18n::Calendar2 CalendarWrapper::getLoadedCalendar() const
+css::i18n::Calendar2 CalendarWrapper::getLoadedCalendar() const
 {
     try
     {
@@ -321,10 +321,10 @@ OUString CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_
     {
         SAL_WARN( "unotools.i18n", "getLoadedCalendar2: Exception caught " << e.Message );
     }
-    return ::com::sun::star::i18n::Calendar2();
+    return css::i18n::Calendar2();
 }
 
-::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > CalendarWrapper::getGenitiveMonths() const
+css::uno::Sequence< css::i18n::CalendarItem2 > CalendarWrapper::getGenitiveMonths() const
 {
     try
     {
@@ -335,10 +335,10 @@ OUString CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_
     {
         SAL_WARN( "unotools.i18n", "getGenitiveMonths: Exception caught " << e.Message );
     }
-    return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0);
+    return css::uno::Sequence< css::i18n::CalendarItem2 > (0);
 }
 
-::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > CalendarWrapper::getPartitiveMonths() const
+css::uno::Sequence< css::i18n::CalendarItem2 > CalendarWrapper::getPartitiveMonths() const
 {
     try
     {
@@ -349,7 +349,7 @@ OUString CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_
     {
         SAL_WARN( "unotools.i18n", "getPartitiveMonths: Exception caught " << e.Message );
     }
-    return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0);
+    return css::uno::Sequence< css::i18n::CalendarItem2 > (0);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx
index a83b5f7b9233..47aeffa106f5 100644
--- a/unotools/source/i18n/charclass.cxx
+++ b/unotools/source/i18n/charclass.cxx
@@ -62,7 +62,7 @@ const LanguageTag& CharClass::getLanguageTag() const
     return maLanguageTag;
 }
 
-const ::com::sun::star::lang::Locale& CharClass::getMyLocale() const
+const css::lang::Locale& CharClass::getMyLocale() const
 {
     ::osl::MutexGuard aGuard( aMutex );
     return maLanguageTag.getLocale();
@@ -385,7 +385,7 @@ sal_Int32 CharClass::getStringType( const OUString& rStr, sal_Int32 nPos, sal_In
     }
 }
 
-::com::sun::star::i18n::ParseResult CharClass::parseAnyToken(
+css::i18n::ParseResult CharClass::parseAnyToken(
             const OUString& rStr,
             sal_Int32 nPos,
             sal_Int32 nStartCharFlags,
@@ -409,7 +409,7 @@ sal_Int32 CharClass::getStringType( const OUString& rStr, sal_Int32 nPos, sal_In
     }
 }
 
-::com::sun::star::i18n::ParseResult CharClass::parsePredefinedToken(
+css::i18n::ParseResult CharClass::parsePredefinedToken(
             sal_Int32 nTokenType,
             const OUString& rStr,
             sal_Int32 nPos,
diff --git a/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx
index 95bfa1ed827c..d8e3760598a6 100644
--- a/unotools/source/i18n/intlwrapper.cxx
+++ b/unotools/source/i18n/intlwrapper.cxx
@@ -23,7 +23,7 @@
 #include <comphelper/processfactory.hxx>
 
 IntlWrapper::IntlWrapper(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext,
+            const css::uno::Reference< css::uno::XComponentContext > & rxContext,
             const LanguageTag& rLanguageTag )
         :
         maLanguageTag( rLanguageTag ),
@@ -68,7 +68,7 @@ void IntlWrapper::ImplNewCollator( bool bCaseSensitive ) const
     else
     {
         p->loadDefaultCollator( maLanguageTag.getLocale(),
-                ::com::sun::star::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE );
+                css::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE );
         const_cast<IntlWrapper*>(this)->pCollator = p;
     }
 }
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index 30cfbcf18b16..f52065540ee5 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -109,7 +109,7 @@ const LanguageTag& LocaleDataWrapper::getLanguageTag() const
     return maLanguageTag;
 }
 
-const ::com::sun::star::lang::Locale& LocaleDataWrapper::getMyLocale() const
+const css::lang::Locale& LocaleDataWrapper::getMyLocale() const
 {
     ::utl::ReadWriteGuard aGuard( aMutex );
     return maLanguageTag.getLocale();
@@ -144,7 +144,7 @@ void LocaleDataWrapper::invalidateData()
 
 /* FIXME-BCP47: locale data should provide a language tag instead that could be
  * passed on. */
-::com::sun::star::i18n::LanguageCountryInfo LocaleDataWrapper::getLanguageCountryInfo() const
+css::i18n::LanguageCountryInfo LocaleDataWrapper::getLanguageCountryInfo() const
 {
     try
     {
@@ -154,10 +154,10 @@ void LocaleDataWrapper::invalidateData()
     {
         SAL_WARN( "unotools.i18n", "getLanguageCountryInfo: Exception caught " << e.Message );
     }
-    return ::com::sun::star::i18n::LanguageCountryInfo();
+    return css::i18n::LanguageCountryInfo();
 }
 
-::com::sun::star::i18n::LocaleDataItem LocaleDataWrapper::getLocaleItem() const
+css::i18n::LocaleDataItem LocaleDataWrapper::getLocaleItem() const
 {
     try
     {
@@ -167,10 +167,10 @@ void LocaleDataWrapper::invalidateData()
     {
         SAL_WARN( "unotools.i18n", "getLocaleItem: Exception caught " << e.Message );
     }
-    return ::com::sun::star::i18n::LocaleDataItem();
+    return css::i18n::LocaleDataItem();
 }
 
-::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 > LocaleDataWrapper::getAllCurrencies() const
+css::uno::Sequence< css::i18n::Currency2 > LocaleDataWrapper::getAllCurrencies() const
 {
     try
     {
@@ -180,10 +180,10 @@ void LocaleDataWrapper::invalidateData()
     {
         SAL_WARN( "unotools.i18n", "getAllCurrencies: Exception caught " << e.Message );
     }
-    return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 >(0);
+    return css::uno::Sequence< css::i18n::Currency2 >(0);
 }
 
-::com::sun::star::uno::Sequence< ::com::sun::star::i18n::FormatElement > LocaleDataWrapper::getAllFormats() const
+css::uno::Sequence< css::i18n::FormatElement > LocaleDataWrapper::getAllFormats() const
 {
     try
     {
@@ -193,10 +193,10 @@ void LocaleDataWrapper::invalidateData()
     {
         SAL_WARN( "unotools.i18n", "getAllFormats: Exception caught " << e.Message );
     }
-    return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::FormatElement >(0);
+    return css::uno::Sequence< css::i18n::FormatElement >(0);
 }
 
-::com::sun::star::i18n::ForbiddenCharacters LocaleDataWrapper::getForbiddenCharacters() const
+css::i18n::ForbiddenCharacters LocaleDataWrapper::getForbiddenCharacters() const
 {
     try
     {
@@ -206,10 +206,10 @@ void LocaleDataWrapper::invalidateData()
     {
         SAL_WARN( "unotools.i18n", "getForbiddenCharacters: Exception caught " << e.Message );
     }
-    return ::com::sun::star::i18n::ForbiddenCharacters();
+    return css::i18n::ForbiddenCharacters();
 }
 
-::com::sun::star::uno::Sequence< OUString > LocaleDataWrapper::getReservedWord() const
+css::uno::Sequence< OUString > LocaleDataWrapper::getReservedWord() const
 {
     try
     {
@@ -219,10 +219,10 @@ void LocaleDataWrapper::invalidateData()
     {
         SAL_WARN( "unotools.i18n", "getReservedWord: Exception caught " << e.Message );
     }
-    return ::com::sun::star::uno::Sequence< OUString >(0);
+    return css::uno::Sequence< OUString >(0);
 }
 
-::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > LocaleDataWrapper::getAllInstalledLocaleNames() const
+css::uno::Sequence< css::lang::Locale > LocaleDataWrapper::getAllInstalledLocaleNames() const
 {
     uno::Sequence< lang::Locale > &rInstalledLocales = InstalledLocales::get();
 
@@ -243,7 +243,7 @@ void LocaleDataWrapper::invalidateData()
 // --- Impl and helpers ----------------------------------------------------
 
 // static
-::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > LocaleDataWrapper::getInstalledLocaleNames()
+css::uno::Sequence< css::lang::Locale > LocaleDataWrapper::getInstalledLocaleNames()
 {
     const uno::Sequence< lang::Locale > &rInstalledLocales =
         InstalledLocales::get();
@@ -257,7 +257,7 @@ void LocaleDataWrapper::invalidateData()
 }
 
 // static
-::com::sun::star::uno::Sequence< sal_uInt16 > LocaleDataWrapper::getInstalledLanguageTypes()
+css::uno::Sequence< sal_uInt16 > LocaleDataWrapper::getInstalledLanguageTypes()
 {
     uno::Sequence< sal_uInt16 > &rInstalledLanguageTypes =
         InstalledLanguageTypes::get();
@@ -265,10 +265,9 @@ void LocaleDataWrapper::invalidateData()
     if ( rInstalledLanguageTypes.getLength() )
         return rInstalledLanguageTypes;
 
-    ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > xLoc =
-        getInstalledLocaleNames();
+    css::uno::Sequence< css::lang::Locale > xLoc =  getInstalledLocaleNames();
     sal_Int32 nCount = xLoc.getLength();
-    ::com::sun::star::uno::Sequence< sal_uInt16 > xLang( nCount );
+    css::uno::Sequence< sal_uInt16 > xLang( nCount );
     sal_Int32 nLanguages = 0;
     for ( sal_Int32 i=0; i<nCount; i++ )
     {
@@ -469,7 +468,7 @@ void LocaleDataWrapper::getDefaultCalendarImpl()
     }
 }
 
-const std::shared_ptr< ::com::sun::star::i18n::Calendar2 > LocaleDataWrapper::getDefaultCalendar() const
+const std::shared_ptr< css::i18n::Calendar2 > LocaleDataWrapper::getDefaultCalendar() const
 {
     ::utl::ReadWriteGuard aGuard( aMutex );
     if (!xDefaultCalendar)
@@ -480,12 +479,12 @@ const std::shared_ptr< ::com::sun::star::i18n::Calendar2 > LocaleDataWrapper::ge
     return xDefaultCalendar;
 }
 
-const ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > LocaleDataWrapper::getDefaultCalendarDays() const
+const css::uno::Sequence< css::i18n::CalendarItem2 > LocaleDataWrapper::getDefaultCalendarDays() const
 {
     return getDefaultCalendar()->Days;
 }
 
-const ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > LocaleDataWrapper::getDefaultCalendarMonths() const
+const css::uno::Sequence< css::i18n::CalendarItem2 > LocaleDataWrapper::getDefaultCalendarMonths() const
 {
     return getDefaultCalendar()->Months;
 }
@@ -1030,7 +1029,7 @@ void LocaleDataWrapper::getDigitGroupingImpl()
     }
 }
 
-const ::com::sun::star::uno::Sequence< sal_Int32 > LocaleDataWrapper::getDigitGrouping() const
+const css::uno::Sequence< sal_Int32 > LocaleDataWrapper::getDigitGrouping() const
 {
     ::utl::ReadWriteGuard aGuard( aMutex );
     if (!aGrouping.getLength() || aGrouping[0] == 0)
@@ -1366,7 +1365,7 @@ OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCa
         sal_Int16 nDisplayMonth, bool bTwoDigitYear ) const
 {
     ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical );
-    using namespace ::com::sun::star::i18n;
+    using namespace css::i18n;
     sal_Unicode     aBuf[20];
     sal_Unicode*    pBuf;
     OUString aStr;
@@ -1737,7 +1736,7 @@ void LocaleDataWrapper::evaluateLocaleDataChecking()
 
 // --- XLocaleData3 ----------------------------------------------------------
 
-::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Calendar2 > LocaleDataWrapper::getAllCalendars() const
+css::uno::Sequence< css::i18n::Calendar2 > LocaleDataWrapper::getAllCalendars() const
 {
     try
     {
@@ -1747,12 +1746,12 @@ void LocaleDataWrapper::evaluateLocaleDataChecking()
     {
         SAL_WARN( "unotools.i18n", "getAllCalendars: Exception caught " << e.Message );
     }
-    return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Calendar2 >(0);
+    return css::uno::Sequence< css::i18n::Calendar2 >(0);
 }
 
 // --- XLocaleData4 ----------------------------------------------------------
 
-::com::sun::star::uno::Sequence< OUString > LocaleDataWrapper::getDateAcceptancePatterns() const
+css::uno::Sequence< OUString > LocaleDataWrapper::getDateAcceptancePatterns() const
 {
     ::utl::ReadWriteGuard aGuard( aMutex );
 
@@ -1771,13 +1770,13 @@ void LocaleDataWrapper::evaluateLocaleDataChecking()
     {
         SAL_WARN( "unotools.i18n", "getDateAcceptancePatterns: Exception caught " << e.Message );
     }
-    return ::com::sun::star::uno::Sequence< OUString >(0);
+    return css::uno::Sequence< OUString >(0);
 }
 
 // --- Override layer --------------------------------------------------------
 
 void LocaleDataWrapper::setDateAcceptancePatterns(
-        const ::com::sun::star::uno::Sequence< OUString > & rPatterns )
+        const css::uno::Sequence< OUString > & rPatterns )
 {
     ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nWrite );
 
diff --git a/unotools/source/i18n/nativenumberwrapper.cxx b/unotools/source/i18n/nativenumberwrapper.cxx
index 8597ee0259be..102e765d4275 100644
--- a/unotools/source/i18n/nativenumberwrapper.cxx
+++ b/unotools/source/i18n/nativenumberwrapper.cxx
@@ -39,7 +39,7 @@ NativeNumberWrapper::~NativeNumberWrapper()
 OUString
 NativeNumberWrapper::getNativeNumberString(
                     const OUString& rNumberString,
-                    const ::com::sun::star::lang::Locale& rLocale,
+                    const css::lang::Locale& rLocale,
                     sal_Int16 nNativeNumberMode ) const
 {
     try
@@ -56,7 +56,7 @@ NativeNumberWrapper::getNativeNumberString(
 
 i18n::NativeNumberXmlAttributes
 NativeNumberWrapper::convertToXmlAttributes(
-                    const ::com::sun::star::lang::Locale& rLocale,
+                    const css::lang::Locale& rLocale,
                     sal_Int16 nNativeNumberMode ) const
 {
     try
diff --git a/unotools/source/i18n/numberformatcodewrapper.cxx b/unotools/source/i18n/numberformatcodewrapper.cxx
index ff27654c0fca..652c757abf1d 100644
--- a/unotools/source/i18n/numberformatcodewrapper.cxx
+++ b/unotools/source/i18n/numberformatcodewrapper.cxx
@@ -40,12 +40,12 @@ NumberFormatCodeWrapper::~NumberFormatCodeWrapper()
 {
 }
 
-void NumberFormatCodeWrapper::setLocale( const ::com::sun::star::lang::Locale& rLocale )
+void NumberFormatCodeWrapper::setLocale( const css::lang::Locale& rLocale )
 {
     aLocale = rLocale;
 }
 
-::com::sun::star::i18n::NumberFormatCode
+css::i18n::NumberFormatCode
 NumberFormatCodeWrapper::getFormatCode( sal_Int16 formatIndex ) const
 {
     try
@@ -56,10 +56,10 @@ NumberFormatCodeWrapper::getFormatCode( sal_Int16 formatIndex ) const
     {
         SAL_WARN( "unotools.i18n", "getFormatCode: Exception caught!" );
     }
-    return ::com::sun::star::i18n::NumberFormatCode();
+    return css::i18n::NumberFormatCode();
 }
 
-::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode >
+css::uno::Sequence< css::i18n::NumberFormatCode >
 NumberFormatCodeWrapper::getAllFormatCode( sal_Int16 formatUsage ) const
 {
     try
@@ -70,10 +70,10 @@ NumberFormatCodeWrapper::getAllFormatCode( sal_Int16 formatUsage ) const
     {
         SAL_WARN( "unotools.i18n", "getAllFormatCode: Exception caught!" );
     }
-    return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > (0);
+    return css::uno::Sequence< css::i18n::NumberFormatCode > (0);
 }
 
-::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode >
+css::uno::Sequence< css::i18n::NumberFormatCode >
 NumberFormatCodeWrapper::getAllFormatCodes() const
 {
     try
@@ -84,7 +84,7 @@ NumberFormatCodeWrapper::getAllFormatCodes() const
     {
         SAL_WARN( "unotools.i18n", "getAllFormatCodes: Exception caught!" );
     }
-    return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > (0);
+    return css::uno::Sequence< css::i18n::NumberFormatCode > (0);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index b469126f8e76..d1b4678cf7c4 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -98,8 +98,8 @@ namespace
     struct CachedTextSearch
     {
         ::osl::Mutex mutex;
-        ::com::sun::star::util::SearchOptions Options;
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XTextSearch > xTextSearch;
+        css::util::SearchOptions Options;
+        css::uno::Reference< css::util::XTextSearch > xTextSearch;
     };
 
     struct theCachedTextSearch
@@ -127,7 +127,7 @@ TextSearch::TextSearch(const SearchParam & rParam, LanguageType eLang )
 {
     if( LANGUAGE_NONE == eLang )
         eLang = LANGUAGE_SYSTEM;
-    ::com::sun::star::lang::Locale aLocale( LanguageTag::convertToLocale( eLang ) );
+    css::lang::Locale aLocale( LanguageTag::convertToLocale( eLang ) );
 
     Init( rParam, aLocale);
 }
@@ -143,7 +143,7 @@ TextSearch::TextSearch( const SearchOptions& rPara )
 }
 
 void TextSearch::Init( const SearchParam & rParam,
-                        const ::com::sun::star::lang::Locale& rLocale )
+                        const css::lang::Locale& rLocale )
 {
     // convert SearchParam to the UNO SearchOptions
     SearchOptions aSOpt;
@@ -180,14 +180,14 @@ void TextSearch::Init( const SearchParam & rParam,
     if( !rParam.IsCaseSensitive() )
     {
         aSOpt.searchFlag |= SearchFlags::ALL_IGNORE_CASE;
-        aSOpt.transliterateFlags |= ::com::sun::star::i18n::TransliterationModules_IGNORE_CASE;
+        aSOpt.transliterateFlags |= css::i18n::TransliterationModules_IGNORE_CASE;
     }
 
     xTextSearch = getXTextSearch( aSOpt );
 }
 
-void TextSearch::SetLocale( const ::com::sun::star::util::SearchOptions& rOptions,
-                            const ::com::sun::star::lang::Locale& rLocale )
+void TextSearch::SetLocale( const css::util::SearchOptions& rOptions,
+                            const css::lang::Locale& rLocale )
 {
     // convert SearchParam to the UNO SearchOptions
     SearchOptions aSOpt( rOptions );
@@ -207,7 +207,7 @@ TextSearch::~TextSearch()
  */
 bool TextSearch::SearchForward( const OUString &rStr,
                     sal_Int32* pStart, sal_Int32* pEnd,
-                    ::com::sun::star::util::SearchResult* pRes)
+                    css::util::SearchResult* pRes)
 {
     bool bRet = false;
     try
diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx
index a83f17388ce5..a62e54ef3f9f 100644
--- a/unotools/source/i18n/transliterationwrapper.cxx
+++ b/unotools/source/i18n/transliterationwrapper.cxx
@@ -163,7 +163,7 @@ void TransliterationWrapper::loadModuleByImplName(const OUString& rModuleName,
     try
     {
         setLanguageLocaleImpl( nLang );
-        com::sun::star::lang::Locale aLocale( aLanguageTag.getLocale());
+        css::lang::Locale aLocale( aLanguageTag.getLocale());
         // Reset LanguageTag, so the next call to loadModuleIfNeeded() forces
         // new settings.
         aLanguageTag.reset( LANGUAGE_DONTKNOW);
diff --git a/unotools/source/misc/ServiceDocumenter.hxx b/unotools/source/misc/ServiceDocumenter.hxx
index 031a7efc6e66..fd62461ba15b 100644
--- a/unotools/source/misc/ServiceDocumenter.hxx
+++ b/unotools/source/misc/ServiceDocumenter.hxx
@@ -16,10 +16,10 @@
 namespace unotools { namespace misc {
 
 class ServiceDocumenter : public ::cppu::WeakImplHelper<
-    ::com::sun::star::script::XServiceDocumenter>
+    css::script::XServiceDocumenter>
 {
     public:
-        ServiceDocumenter(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const& xContext)
+        ServiceDocumenter(css::uno::Reference< css::uno::XComponentContext> const& xContext)
             : m_xContext(xContext)
             , m_sCoreBaseUrl("http://example.com")
             , m_sServiceBaseUrl("http://api.libreoffice.org/docs/idl/ref")
diff --git a/unotools/source/misc/desktopterminationobserver.cxx b/unotools/source/misc/desktopterminationobserver.cxx
index 3c9114f721fb..08e353f4701a 100644
--- a/unotools/source/misc/desktopterminationobserver.cxx
+++ b/unotools/source/misc/desktopterminationobserver.cxx
@@ -71,7 +71,7 @@ namespace utl
             virtual void SAL_CALL notifyTermination( const EventObject& Event ) throw (RuntimeException, std::exception) override;
 
             // 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;
         };
 
         OObserverImpl::OObserverImpl()
diff --git a/unotools/source/misc/eventlisteneradapter.cxx b/unotools/source/misc/eventlisteneradapter.cxx
index ef825eab2ad3..9eaa1bdf3e45 100644
--- a/unotools/source/misc/eventlisteneradapter.cxx
+++ b/unotools/source/misc/eventlisteneradapter.cxx
@@ -107,7 +107,7 @@ namespace utl
         stopAllComponentListening( );
     }
 
-    void OEventListenerAdapter::stopComponentListening( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxComp )
+    void OEventListenerAdapter::stopComponentListening( const css::uno::Reference< css::lang::XComponent >& _rxComp )
     {
         if ( m_pImpl->aListeners.empty() )
             return;
diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx
index 41bb5b5d6eb2..9734347e031a 100644
--- a/unotools/source/misc/mediadescriptor.cxx
+++ b/unotools/source/misc/mediadescriptor.cxx
@@ -446,7 +446,7 @@ void MediaDescriptor::clearComponentDataEntry( const OUString& rName )
     }
 }
 
-::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > MediaDescriptor::requestAndVerifyDocPassword(
+css::uno::Sequence< css::beans::NamedValue > MediaDescriptor::requestAndVerifyDocPassword(
         comphelper::IDocPasswordVerifier& rVerifier,
         comphelper::DocPasswordRequestType eRequestType,
         const ::std::vector< OUString >* pDefaultPasswords )
@@ -526,7 +526,7 @@ bool MediaDescriptor::impl_addInputStream( bool bLockFile )
 }
 
 bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference< css::io::XInputStream >& _rxPostData )
-    throw(::com::sun::star::uno::RuntimeException)
+    throw(css::uno::RuntimeException)
 {
     if ( !_rxPostData.is() )
         throw css::lang::IllegalArgumentException("Found invalid PostData.",
@@ -596,7 +596,7 @@ bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference< cs
 
 /*-----------------------------------------------*/
 bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, bool bLockFile )
-    throw(::com::sun::star::uno::RuntimeException)
+    throw(css::uno::RuntimeException)
 {
     OUString referer(getUnpackedValueOrDefault(PROP_REFERRER(), OUString()));
     if (SvtSecurityOptions().isUntrustedReferer(referer)) {
diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx
index 8cdde6266ecb..cbe74f91d478 100644
--- a/unotools/source/misc/sharedunocomponent.cxx
+++ b/unotools/source/misc/sharedunocomponent.cxx
@@ -91,7 +91,7 @@ namespace utl
         virtual void SAL_CALL notifyClosing( const EventObject& Source ) throw (RuntimeException, std::exception) override;
 
         // XEventListener overridables
-        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;
 
     private:
         /** starts or stops being a CloseListener at the component
diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx
index f655217778ec..5d54883bfeb8 100644
--- a/unotools/source/ucbhelper/XTempFile.hxx
+++ b/unotools/source/ucbhelper/XTempFile.hxx
@@ -35,13 +35,13 @@ class SvStream;
 namespace utl { class TempFile; }
 
 
-typedef ::cppu::WeakImplHelper< ::com::sun::star::io::XTempFile
-    , ::com::sun::star::io::XInputStream
-    , ::com::sun::star::io::XOutputStream
-    , ::com::sun::star::io::XTruncate > OTempFileBase;
+typedef ::cppu::WeakImplHelper< css::io::XTempFile
+    , css::io::XInputStream
+    , css::io::XOutputStream
+    , css::io::XTruncate > OTempFileBase;
 
 class OTempFileService : public OTempFileBase
-    , public ::cppu::PropertySetMixin< ::com::sun::star::io::XTempFile >
+    , public ::cppu::PropertySetMixin< css::io::XTempFile >
 {
 protected:
     ::utl::TempFile* mpTempFile;
@@ -58,65 +58,65 @@ protected:
     void checkConnected ();
 
 public:
-    explicit OTempFileService (::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context);
+    explicit OTempFileService (css::uno::Reference< css::uno::XComponentContext > const & context);
 
     //Methods
     //  XInterface
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL acquire(  )
         throw () override;
     virtual void SAL_CALL release(  )
         throw () override;
     //  XTypeProvider
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId(  )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     //  XTempFile
     virtual sal_Bool SAL_CALL getRemoveFile()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setRemoveFile( sal_Bool _removefile )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getUri()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getResourceName()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // XInputStream
-    virtual ::sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead )
-        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead )
-        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL readBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead )
+        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead )
+        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip )
-        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
     virtual ::sal_Int32 SAL_CALL available(  )
-        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL closeInput(  )
-        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
     // XOutputStream
-    virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData )
-        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData )
+        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL flush(  )
-        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL closeOutput(  )
-        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
     // XSeekable
     virtual void SAL_CALL seek( sal_Int64 location )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
     virtual sal_Int64 SAL_CALL getPosition(  )
-        throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
     virtual sal_Int64 SAL_CALL getLength(  )
-        throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
     // XStream
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream(  )
+        throw (css::uno::RuntimeException, std::exception) override;
     // XTruncate
     virtual void SAL_CALL truncate()
-        throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
 
     virtual ~OTempFileService ();
 };
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx
index 266f20f6e6ce..45668518c19e 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -38,7 +38,7 @@ namespace utl
 
 typedef ::std::vector< OUString* > StringList_Impl;
 
-::com::sun::star::uno::Sequence < OUString > LocalFileHelper::GetFolderContents( const OUString& rFolder, bool bFolder )
+css::uno::Sequence < OUString > LocalFileHelper::GetFolderContents( const OUString& rFolder, bool bFolder )
 {
     StringList_Impl* pFiles = nullptr;
     try
@@ -46,15 +46,15 @@ typedef ::std::vector< OUString* > StringList_Impl;
         ::ucbhelper::Content aCnt(
             rFolder, Reference< XCommandEnvironment >(),
             comphelper::getProcessComponentContext() );
-        Reference< ::com::sun::star::sdbc::XResultSet > xResultSet;
-        ::com::sun::star::uno::Sequence< OUString > aProps { "Url" };
+        Reference< css::sdbc::XResultSet > xResultSet;
+        css::uno::Sequence< OUString > aProps { "Url" };
 
         try
         {
             ::ucbhelper::ResultSetInclude eInclude = bFolder ? ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS : ::ucbhelper::INCLUDE_DOCUMENTS_ONLY;
             xResultSet = aCnt.createCursor( aProps, eInclude );
         }
-        catch( ::com::sun::star::ucb::CommandAbortedException& )
+        catch( css::ucb::CommandAbortedException& )
         {
         }
         catch( Exception& )
@@ -74,7 +74,7 @@ typedef ::std::vector< OUString* > StringList_Impl;
                     pFiles->push_back( pFile );
                 }
             }
-            catch( ::com::sun::star::ucb::CommandAbortedException& )
+            catch( css::ucb::CommandAbortedException& )
             {
             }
             catch( Exception& )
diff --git a/unotools/source/ucbhelper/progresshandlerwrap.cxx b/unotools/source/ucbhelper/progresshandlerwrap.cxx
index 60f2c784453b..b84882fdffe4 100644
--- a/unotools/source/ucbhelper/progresshandlerwrap.cxx
+++ b/unotools/source/ucbhelper/progresshandlerwrap.cxx
@@ -26,7 +26,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::task;
 using namespace ::com::sun::star::ucb;
 
-ProgressHandlerWrap::ProgressHandlerWrap( ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > xSI )
+ProgressHandlerWrap::ProgressHandlerWrap( css::uno::Reference< css::task::XStatusIndicator > xSI )
 : m_xStatusIndicator( xSI )
 {
 }
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index fa093d73ab70..53be9620b97f 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -114,10 +114,8 @@ OUString ConstructTempDir_Impl( const OUString* pParent )
     OUString aName;
     if ( pParent && !pParent->isEmpty() )
     {
-        com::sun::star::uno::Reference<
-            com::sun::star::ucb::XUniversalContentBroker > pBroker(
-                com::sun::star::ucb::UniversalContentBroker::create(
-                    comphelper::getProcessComponentContext() ) );
+        css::uno::Reference< css::ucb::XUniversalContentBroker > pBroker(
+                css::ucb::UniversalContentBroker::create( comphelper::getProcessComponentContext() ) );
 
         // test for valid filename
         OUString aRet;
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index 11b7867478b6..5519419f90a9 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -85,11 +85,8 @@ std::vector<OUString> getContents(OUString const & url) {
         std::vector<OUString> cs;
         ucbhelper::Content c(content(url));
         css::uno::Sequence<OUString> args { "Title" };
-        css::uno::Reference<css::sdbc::XResultSet> res(
-            c.createCursor(args),
-            css::uno::UNO_SET_THROW);
-        css::uno::Reference<com::sun::star::ucb::XContentAccess> acc(
-            res, css::uno::UNO_QUERY_THROW);
+        css::uno::Reference<css::sdbc::XResultSet> res( c.createCursor(args), css::uno::UNO_SET_THROW);
+        css::uno::Reference<css::ucb::XContentAccess> acc( res, css::uno::UNO_QUERY_THROW);
         while (res->next()) {
             cs.push_back(acc->queryContentIdentifierString());
         }
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 6c825bd1f86c..107aa83fa336 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -1209,7 +1209,7 @@ ErrCode UcbLockBytes::ReadAt(sal_uInt64 const nPos,
     {
         return ERRCODE_IO_CANTSEEK;
     }
-    catch (const com::sun::star::lang::IllegalArgumentException&)
+    catch (const css::lang::IllegalArgumentException&)
     {
         return ERRCODE_IO_CANTSEEK;
     }
diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx
index 00805d1c7a46..cf1636eb093b 100644
--- a/unotools/source/ucbhelper/ucblockbytes.hxx
+++ b/unotools/source/ucbhelper/ucblockbytes.hxx
@@ -86,9 +86,9 @@ class UcbLockBytes : public virtual SvLockBytes
     OUString                m_aRealURL;
     DateTime                m_aExpireDate;
 
-    ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >  m_xInputStream;
-    ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > m_xOutputStream;
-    ::com::sun::star::uno::Reference < ::com::sun::star::io::XSeekable >     m_xSeekable;
+    css::uno::Reference < css::io::XInputStream >  m_xInputStream;
+    css::uno::Reference < css::io::XOutputStream > m_xOutputStream;
+    css::uno::Reference < css::io::XSeekable >     m_xSeekable;
     UcbLockBytesHandlerRef  m_xHandler;
 
     ErrCode                 m_nError;
@@ -103,14 +103,14 @@ protected:
 
 public:
                             // properties: Referer, PostMimeType
-    static UcbLockBytesRef  CreateLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::ucb::XContent >& xContent,
-                                            const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rProps,
+    static UcbLockBytesRef  CreateLockBytes( const css::uno::Reference < css::ucb::XContent >& xContent,
+                                            const css::uno::Sequence < css::beans::PropertyValue >& rProps,
                                             StreamMode eMode,
-                                            const ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler >& xInter,
+                                            const css::uno::Reference < css::task::XInteractionHandler >& xInter,
                                             UcbLockBytesHandler* pHandler=nullptr );
 
-    static UcbLockBytesRef  CreateInputLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >& xContent );
-    static UcbLockBytesRef  CreateLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream >& xContent );
+    static UcbLockBytesRef  CreateInputLockBytes( const css::uno::Reference < css::io::XInputStream >& xContent );
+    static UcbLockBytesRef  CreateLockBytes( const css::uno::Reference < css::io::XStream >& xContent );
 
     // SvLockBytes
     virtual void            SetSynchronMode (bool bSynchron) override;
@@ -127,26 +127,26 @@ public:
                             { return m_nError; }
 
     // calling this method delegates the responsibility to call closeinput to the caller!
-    ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > getInputStream();
+    css::uno::Reference < css::io::XInputStream > getInputStream();
 
-    bool                    setInputStream_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > &rxInputStream,
+    bool                    setInputStream_Impl( const css::uno::Reference < css::io::XInputStream > &rxInputStream,
                                                  bool bSetXSeekable = true );
-    bool                    setStream_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > &rxStream );
+    bool                    setStream_Impl( const css::uno::Reference < css::io::XStream > &rxStream );
     void                    terminate_Impl();
 
-    ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > getInputStream_Impl() const
+    css::uno::Reference < css::io::XInputStream > getInputStream_Impl() const
                             {
                                 osl::MutexGuard aGuard( (const_cast< UcbLockBytes* >(this))->m_aMutex );
                                 return m_xInputStream;
                             }
 
-    ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > getOutputStream_Impl() const
+    css::uno::Reference < css::io::XOutputStream > getOutputStream_Impl() const
                             {
                                 osl::MutexGuard aGuard( (const_cast< UcbLockBytes* >(this))->m_aMutex );
                                 return m_xOutputStream;
                             }
 
-    ::com::sun::star::uno::Reference < ::com::sun::star::io::XSeekable > getSeekable_Impl() const
+    css::uno::Reference < css::io::XSeekable > getSeekable_Impl() const
                             {
                                 osl::MutexGuard aGuard( (const_cast< UcbLockBytes* >(this))->m_aMutex );
                                 return m_xSeekable;
diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx
index 8a9f952b2785..888ee864c850 100644
--- a/unotools/source/ucbhelper/xtempfile.cxx
+++ b/unotools/source/ucbhelper/xtempfile.cxx
@@ -30,7 +30,7 @@ OTempFileService::OTempFileService(css::uno::Reference< css::uno::XComponentCont
 : ::cppu::PropertySetMixin< css::io::XTempFile >(
     context
     , static_cast< Implements >( IMPLEMENTS_PROPERTY_SET | IMPLEMENTS_FAST_PROPERTY_SET | IMPLEMENTS_PROPERTY_ACCESS )
-    , com::sun::star::uno::Sequence< OUString >() )
+    , css::uno::Sequence< OUString >() )
 , mpStream( nullptr )
 , mbRemoveFile( true )
 , mbInClosed( false )