com::sun::star->css in sw/source/core

Change-Id: I30016977f1be8fb53dd239367d043de92a9467d9

122 files changed, 801 insertions, 801 deletions

diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
index b6747379c4bb..1a1123dcb458 100644
--- a/sw/source/uibase/app/appopt.cxx
+++ b/sw/source/uibase/app/appopt.cxx
@@ -68,8 +68,8 @@
 
 #include <unomid.h>
 
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
+using namespace css::uno;
+using namespace css::lang;
 
 SfxItemSet*  SwModule::CreateItemSet( sal_uInt16 nId )
 {
@@ -148,10 +148,10 @@ SfxItemSet*  SwModule::CreateItemSet( sal_uInt16 nId )
     else
     {
         SvtLinguConfig aLinguCfg;
-        com::sun::star::lang::Locale aLocale;
+        css::lang::Locale aLocale;
         LanguageType nLang;
 
-        using namespace ::com::sun::star::i18n::ScriptType;
+        using namespace css::i18n::ScriptType;
 
         Any aLang = aLinguCfg.GetProperty(OUString("DefaultLocale"));
         aLang >>= aLocale;
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 37304d230101..5f2ccf464157 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -129,9 +129,9 @@
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::script;
-using namespace ::com::sun::star::container;
+using namespace css::uno;
+using namespace css::script;
+using namespace css::container;
 
 SFX_IMPL_SUPERCLASS_INTERFACE(SwDocShell, SfxObjectShell)
 
@@ -1217,7 +1217,7 @@ void SwDocShell::UpdateLinks()
 uno::Reference< frame::XController >
                                 SwDocShell::GetController()
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > aRet;
+    css::uno::Reference< css::frame::XController > aRet;
     // #i82346# No view in page preview
     if ( GetView() )
         aRet = GetView()->GetController();
@@ -1319,7 +1319,7 @@ bool SwDocShell::SetProtectionPassword( const OUString &rNewPassword )
     return bRes;
 }
 
-bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash )
+bool SwDocShell::GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > &rPasswordHash )
 {
     bool bRes = false;
 
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index dbe1d4f5df34..2b5bc210bf57 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -127,9 +127,9 @@
 
 #include <memory>
 
-using namespace ::com::sun::star::ui::dialogs;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::uno;
+using namespace css::ui::dialogs;
+using namespace css::lang;
+using namespace css::uno;
 using namespace ::com::sun::star;
 using namespace ::sfx2;
 
@@ -216,7 +216,7 @@ void SwDocShell::DoFlushDocInfo()
 
 static void lcl_processCompatibleSfxHint( const uno::Reference< script::vba::XVBAEventProcessor >& xVbaEvents, const SfxHint& rHint )
 {
-    using namespace com::sun::star::script::vba::VBAEventId;
+    using namespace css::script::vba::VBAEventId;
     if ( dynamic_cast<const SfxEventHint*>(&rHint) )
     {
         uno::Sequence< uno::Any > aArgs;
@@ -327,7 +327,7 @@ bool SwDocShell::PrepareClose( bool bUI )
             m_pDoc->GetVbaEventProcessor();
         if( xVbaEvents.is() )
         {
-            using namespace com::sun::star::script::vba::VBAEventId;
+            using namespace css::script::vba::VBAEventId;
             uno::Sequence< uno::Any > aArgs;
             xVbaEvents->processVbaEvent( DOCUMENT_CLOSE, aArgs );
         }
@@ -810,7 +810,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                     {
                         TransferDataContainer* pClipCntnr =
                                                     new TransferDataContainer;
-                        ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >
+                        css::uno::Reference< css::datatransfer::XTransferable >
                                                         xRef( pClipCntnr );
 
                         pClipCntnr->CopyAnyData( SotClipboardFormatId::RTF, static_cast<sal_Char const *>(
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index 4fb66e70cc49..677389288535 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -93,9 +93,9 @@
 #include <tgrditem.hxx>
 #include <memory>
 
-using namespace ::com::sun::star::i18n;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::uno;
+using namespace css::i18n;
+using namespace css::lang;
+using namespace css::uno;
 using namespace ::com::sun::star;
 
 // Load Document
@@ -658,9 +658,9 @@ void SwDocShell::SubInitNew()
     if (!utl::ConfigManager::IsAvoidConfig())
         SvtLinguConfig().GetOptions(aLinguOpt);
 
-    sal_Int16   nVal = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
-                eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
-                eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
+    sal_Int16   nVal = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, css::i18n::ScriptType::LATIN),
+                eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, css::i18n::ScriptType::ASIAN),
+                eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, css::i18n::ScriptType::COMPLEX);
     aDfltSet.Put( SvxLanguageItem( nVal, RES_CHRATR_LANGUAGE ) );
     aDfltSet.Put( SvxLanguageItem( eCJK, RES_CHRATR_CJK_LANGUAGE ) );
     aDfltSet.Put( SvxLanguageItem( eCTL, RES_CHRATR_CTL_LANGUAGE ) );
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index 7427473aa21d..88312cb6e270 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -62,11 +62,11 @@
 
 using namespace ::svx;
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::view;
-using namespace ::com::sun::star::lang;
+using namespace css::uno;
+using namespace css::beans;
+using namespace css::frame;
+using namespace css::view;
+using namespace css::lang;
 
 static void lcl_SetUIPrefs(const SwViewOption &rPref, SwView* pView, SwViewShell* pSh )
 {
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index d2d99939dd50..3f91a1dbcd32 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -140,7 +140,7 @@ using namespace com::sun::star;
 TYPEINIT1( SwModule, SfxModule );
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
 
 SwModule::SwModule( SfxObjectFactory* pWebFact,
                     SfxObjectFactory* pFact,
diff --git a/sw/source/uibase/config/barcfg.cxx b/sw/source/uibase/config/barcfg.cxx
index 35342855b683..d5e33f2294f1 100644
--- a/sw/source/uibase/config/barcfg.cxx
+++ b/sw/source/uibase/config/barcfg.cxx
@@ -26,7 +26,7 @@
 #include <unomid.h>
 
 using namespace utl;
-using namespace com::sun::star::uno;
+using namespace css::uno;
 
 #define SEL_TYPE_TABLE_TEXT     0
 #define SEL_TYPE_LIST_TEXT      1
@@ -122,6 +122,6 @@ void SwToolbarConfigItem::ImplCommit()
     PutProperties(aNames, aValues);
 }
 
-void SwToolbarConfigItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwToolbarConfigItem::Notify( const css::uno::Sequence< OUString >& ) {}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/config/dbconfig.cxx b/sw/source/uibase/config/dbconfig.cxx
index 054c06c9a564..29f0eeb9a290 100644
--- a/sw/source/uibase/config/dbconfig.cxx
+++ b/sw/source/uibase/config/dbconfig.cxx
@@ -26,7 +26,7 @@
 #include <unomid.h>
 
 using namespace utl;
-using namespace com::sun::star::uno;
+using namespace css::uno;
 
 const Sequence<OUString>& SwDBConfig::GetPropertyNames()
 {
@@ -111,6 +111,6 @@ const SwDBData& SwDBConfig::GetBibliographySource()
 }
 
 void SwDBConfig::ImplCommit() {}
-void SwDBConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwDBConfig::Notify( const css::uno::Sequence< OUString >& ) {}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/config/fontcfg.cxx b/sw/source/uibase/config/fontcfg.cxx
index dbf7478a74db..8e1b52a8d2e3 100644
--- a/sw/source/uibase/config/fontcfg.cxx
+++ b/sw/source/uibase/config/fontcfg.cxx
@@ -30,7 +30,7 @@
 #include <unomid.h>
 
 using namespace utl;
-using namespace com::sun::star::uno;
+using namespace css::uno;
 
 static inline LanguageType lcl_LanguageOfType(sal_Int16 nType, sal_Int16 eWestern, sal_Int16 eCJK, sal_Int16 eCTL)
 {
@@ -96,9 +96,9 @@ SwStdFontConfig::SwStdFontConfig() :
     if (!utl::ConfigManager::IsAvoidConfig())
         SvtLinguConfig().GetOptions( aLinguOpt );
 
-    sal_Int16   eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
-                eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
-                eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
+    sal_Int16   eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, css::i18n::ScriptType::LATIN),
+                eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, css::i18n::ScriptType::ASIAN),
+                eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, css::i18n::ScriptType::COMPLEX);
 
     for(sal_Int16 i = 0; i < DEF_FONT_COUNT; i++)
     {
@@ -142,9 +142,9 @@ void SwStdFontConfig::ImplCommit()
 
     SvtLinguConfig().GetOptions( aLinguOpt );
 
-    sal_Int16   eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
-                eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
-                eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
+    sal_Int16   eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, css::i18n::ScriptType::LATIN),
+                eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, css::i18n::ScriptType::ASIAN),
+                eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, css::i18n::ScriptType::COMPLEX);
 
     for(sal_uInt16 nProp = 0;
         nProp < sal::static_int_cast< sal_uInt16, sal_Int32 >( aNames.getLength() );
@@ -176,9 +176,9 @@ bool SwStdFontConfig::IsFontDefault(sal_uInt16 nFontType) const
     if (!utl::ConfigManager::IsAvoidConfig())
         SvtLinguConfig().GetOptions(aLinguOpt);
 
-    sal_Int16   eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
-                eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
-                eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
+    sal_Int16   eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, css::i18n::ScriptType::LATIN),
+                eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, css::i18n::ScriptType::ASIAN),
+                eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, css::i18n::ScriptType::COMPLEX);
 
     OUString sDefFont(GetDefaultFor(FONT_STANDARD, eWestern));
     OUString sDefFontCJK(GetDefaultFor(FONT_STANDARD_CJK, eCJK));
@@ -290,9 +290,9 @@ void SwStdFontConfig::ChangeInt( sal_uInt16 nFontType, sal_Int32 nHeight )
         if (!utl::ConfigManager::IsAvoidConfig())
             SvtLinguConfig().GetOptions( aLinguOpt );
 
-        sal_Int16 eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
-                  eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
-                  eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
+        sal_Int16 eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, css::i18n::ScriptType::LATIN),
+                  eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, css::i18n::ScriptType::ASIAN),
+                  eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, css::i18n::ScriptType::COMPLEX);
 
         // #i92090# default height value sets back to -1
         const sal_Int32 nDefaultHeight = GetDefaultHeightFor(nFontType, lcl_LanguageOfType(nFontType, eWestern, eCJK, eCTL));
@@ -319,6 +319,6 @@ sal_Int32 SwStdFontConfig::GetFontHeight( sal_uInt8 nFont, sal_uInt8 nScriptType
     return nRet;
 }
 
-void SwStdFontConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwStdFontConfig::Notify( const css::uno::Sequence< OUString >& ) {}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index eb03eaeddaf8..8d51c185891f 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -39,7 +39,7 @@
 #include <unomid.h>
 
 using namespace utl;
-using namespace com::sun::star::uno;
+using namespace css::uno;
 
 #define GLOB_NAME_CALC      0
 #define GLOB_NAME_IMPRESS   1
@@ -290,7 +290,7 @@ static sal_Int32 lcl_ConvertAttrToCfg(const AuthorCharAttr& rAttr)
     return nRet;
 }
 
-void SwRevisionConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwRevisionConfig::Notify( const css::uno::Sequence< OUString >& ) {}
 
 void SwRevisionConfig::ImplCommit()
 {
@@ -629,7 +629,7 @@ static void lcl_WriteOpt(const InsCaptionOpt& rOpt, Any* pValues, sal_Int32 nPro
     }
 }
 
-void SwInsertConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwInsertConfig::Notify( const css::uno::Sequence< OUString >& ) {}
 
 void SwInsertConfig::ImplCommit()
 {
@@ -1130,7 +1130,7 @@ SwTableConfig::~SwTableConfig()
 {
 }
 
-void SwTableConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwTableConfig::Notify( const css::uno::Sequence< OUString >& ) {}
 
 void SwTableConfig::ImplCommit()
 {
@@ -1229,7 +1229,7 @@ const Sequence<OUString>& SwMiscConfig::GetPropertyNames()
     return aNames;
 }
 
-void SwMiscConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwMiscConfig::Notify( const css::uno::Sequence< OUString >& ) {}
 
 void SwMiscConfig::ImplCommit()
 {
diff --git a/sw/source/uibase/config/prtopt.cxx b/sw/source/uibase/config/prtopt.cxx
index d772d5eeaaa8..e59d0ae56a1d 100644
--- a/sw/source/uibase/config/prtopt.cxx
+++ b/sw/source/uibase/config/prtopt.cxx
@@ -26,7 +26,7 @@
 #include <unomid.h>
 
 using namespace utl;
-using namespace com::sun::star::uno;
+using namespace css::uno;
 
 // Ctor
 Sequence<OUString> SwPrintOptions::GetPropertyNames()
@@ -125,7 +125,7 @@ SwPrintOptions::~SwPrintOptions()
 {
 }
 
-void SwPrintOptions::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwPrintOptions::Notify( const css::uno::Sequence< OUString >& ) {}
 
 void SwPrintOptions::ImplCommit()
 {
diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx
index 6ac62c6fc528..46ade91ccc99 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -36,7 +36,7 @@
 
 using namespace utl;
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
 
 void SwMasterUsrPref::SetUsrPref(const SwViewOption &rCopy)
 {
@@ -365,7 +365,7 @@ void SwLayoutViewConfig::Load()
     }
 }
 
-void SwLayoutViewConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwLayoutViewConfig::Notify( const css::uno::Sequence< OUString >& ) {}
 
 Sequence<OUString> SwGridConfig::GetPropertyNames()
 {
@@ -456,7 +456,7 @@ void SwGridConfig::Load()
     }
 }
 
-void SwGridConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwGridConfig::Notify( const css::uno::Sequence< OUString >& ) {}
 
 Sequence<OUString> SwCursorConfig::GetPropertyNames()
 {
@@ -538,7 +538,7 @@ void SwCursorConfig::Load()
     }
 }
 
-void SwCursorConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwCursorConfig::Notify( const css::uno::Sequence< OUString >& ) {}
 
 SwWebColorConfig::SwWebColorConfig(SwMasterUsrPref& rPar) :
     ConfigItem("Office.WriterWeb/Background",
@@ -567,7 +567,7 @@ void SwWebColorConfig::ImplCommit()
     PutProperties(aPropNames, aValues);
 }
 
-void SwWebColorConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwWebColorConfig::Notify( const css::uno::Sequence< OUString >& ) {}
 
 void SwWebColorConfig::Load()
 {
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 36c7a362c4c9..868bf061e7ba 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1703,7 +1703,7 @@ sal_uLong SwDBManager::GetColumnFormat( uno::Reference< sdbc::XDataSource> xSour
         uno::Reference< util::XNumberFormats > xDocNumberFormats = xDocNumFormatsSupplier->getNumberFormats();
         uno::Reference< util::XNumberFormatTypes > xDocNumberFormatTypes(xDocNumberFormats, uno::UNO_QUERY);
 
-        com::sun::star::lang::Locale aLocale( LanguageTag( (LanguageType)nLanguage ).getLocale());
+        css::lang::Locale aLocale( LanguageTag( (LanguageType)nLanguage ).getLocale());
 
         //get the number formatter of the data source
         uno::Reference<beans::XPropertySet> xSourceProps(xSource, uno::UNO_QUERY);
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 48f2ff993b28..fc62336780c3 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -52,14 +52,14 @@
 
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::task;
-using namespace ::com::sun::star::beans;
+using namespace css::uno;
+using namespace css::container;
+using namespace css::lang;
+using namespace css::sdb;
+using namespace css::sdbc;
+using namespace css::sdbcx;
+using namespace css::task;
+using namespace css::beans;
 
 struct SwConnectionData
 {
@@ -467,7 +467,7 @@ void SwDBTreeList::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ )
     if (!sDBName.isEmpty())
     {
         TransferDataContainer* pContainer = new TransferDataContainer;
-        ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRef( pContainer );
+        css::uno::Reference< css::datatransfer::XTransferable > xRef( pContainer );
         if( !sColumnName.isEmpty() )
         {
             // drag database field
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index 1b49433d0f4d..25fd69742397 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -43,11 +43,11 @@
 #include <dbui.hrc>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
+using namespace css::uno;
+using namespace css::container;
+using namespace css::sdb;
+using namespace css::sdbc;
+using namespace css::sdbcx;
 
 namespace SwMailMergeHelper
 {
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index eec12006e970..8efa47795e6d 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -50,12 +50,12 @@
 
 using namespace utl;
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::beans;
+using namespace css::sdb;
+using namespace css::sdbc;
+using namespace css::sdbcx;
 
 const char* cAddressDataAssignments     = "AddressDataAssignments";
 const char* cDBColumnAssignments        = "DBColumnAssignments";
@@ -160,7 +160,7 @@ public:
     SwMailMergeConfigItem_Impl();
     virtual ~SwMailMergeConfigItem_Impl();
 
-    virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
     const           Sequence< OUString>
                         GetAddressBlocks(bool bConvertToConfig = false) const;
     void                SetAddressBlocks(
@@ -492,7 +492,7 @@ const Sequence<OUString>& SwMailMergeConfigItem_Impl::GetPropertyNames()
     return aNames;
 }
 
-void SwMailMergeConfigItem_Impl::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwMailMergeConfigItem_Impl::Notify( const css::uno::Sequence< OUString >& ) {}
 
 void  SwMailMergeConfigItem_Impl::ImplCommit()
 {
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index 230202341a86..c4cbb3c99e61 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -52,10 +52,10 @@
 #include <cmdid.h>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::linguistic2;
-using namespace ::com::sun::star::beans;
+using namespace css::uno;
+using namespace css::text;
+using namespace css::linguistic2;
+using namespace css::beans;
 
 SFX_IMPL_CHILDWINDOW_WITHID(SwSpellDialogChildWindow, FN_SPELL_GRAMMAR_DIALOG)
 
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 43043942e6ab..c69c6b3fd067 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -145,8 +145,8 @@ extern bool g_bExecuteDrag;
 
 using namespace ::svx;
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::datatransfer;
+using namespace css::uno;
+using namespace css::datatransfer;
 using namespace nsTransferBufferType;
 
 #define DDE_TXT_ENCODING    osl_getThreadTextEncoding()
@@ -172,7 +172,7 @@ public:
     SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh );
 
     virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
-        const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override;
+        const OUString& rMimeType, const css::uno::Any & rValue ) override;
     virtual void Closed() override;
 
     bool WriteData( SvStream& rStrm );
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index 74a65c66f9a1..d2d021420763 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -1978,7 +1978,7 @@ sal_uInt16 SwPostItMgr::Replace(SvxSearchItem* pItem)
     return aResult;
 }
 
-sal_uInt16 SwPostItMgr::FinishSearchReplace(const ::com::sun::star::util::SearchOptions& rSearchOptions, bool bSrchForward)
+sal_uInt16 SwPostItMgr::FinishSearchReplace(const css::util::SearchOptions& rSearchOptions, bool bSrchForward)
 {
     SwSidebarWin* pWin = GetActiveSidebarWin();
     SvxSearchItem aItem(SID_SEARCH_ITEM );
@@ -1990,7 +1990,7 @@ sal_uInt16 SwPostItMgr::FinishSearchReplace(const ::com::sun::star::util::Search
     return aResult;
 }
 
-sal_uInt16 SwPostItMgr::SearchReplace(const SwFormatField &pField, const ::com::sun::star::util::SearchOptions& rSearchOptions, bool bSrchForward)
+sal_uInt16 SwPostItMgr::SearchReplace(const SwFormatField &pField, const css::util::SearchOptions& rSearchOptions, bool bSrchForward)
 {
     sal_uInt16 aResult = 0;
     SwSidebarWin* pWin = GetSidebarWin(&pField);
@@ -2158,6 +2158,6 @@ void SwPostItMgr::GetAllSidebarWinForFrm( const SwFrm& rFrm,
 }
 
 void SwNoteProps::ImplCommit() {}
-void SwNoteProps::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwNoteProps::Notify( const css::uno::Sequence< OUString >& ) {}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx
index d7a0130dfc50..3897182edebe 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.hxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx
@@ -66,7 +66,7 @@ class SidebarTextControl : public Control
 
         DECL_LINK_TYPED( OnlineSpellCallback, SpellCallbackInfo&, void );
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
 
         virtual void Draw(OutputDevice* pDev, const Point&, const Size&, DrawFlags) override;
         void PaintTile(vcl::RenderContext& rRenderContext, const Rectangle& rRect);
diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
index 87d29901c130..f75dafd17025 100644
--- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
@@ -132,21 +132,21 @@ class SidebarTextControlAccessibleContext : public VCLXAccessibleComponent
 
         virtual sal_Int32 SAL_CALL
                 getAccessibleChildCount()
-                throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL
+                throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
                 getAccessibleChild( sal_Int32 i )
-                throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+                throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL
                 addAccessibleEventListener (
-                    const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::accessibility::XAccessibleEventListener >& xListener)
-                throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+                    const css::uno::Reference<
+                        css::accessibility::XAccessibleEventListener >& xListener)
+                throw (css::uno::RuntimeException, std::exception) override;
         virtual void SAL_CALL
                 removeAccessibleEventListener (
-                    const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::accessibility::XAccessibleEventListener >& xListener)
-                throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+                    const css::uno::Reference<
+                        css::accessibility::XAccessibleEventListener >& xListener)
+                throw (css::uno::RuntimeException, std::exception) override;
 
     protected:
         virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
@@ -182,7 +182,7 @@ void SidebarTextControlAccessibleContext::defunc()
 }
 
 sal_Int32 SAL_CALL SidebarTextControlAccessibleContext::getAccessibleChildCount()
-    throw (::com::sun::star::uno::RuntimeException, std::exception)
+    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( maMutex );
 
diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
index 2c80887eaff6..e48caecc4591 100644
--- a/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
+++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
@@ -32,7 +32,7 @@ class SidebarTextControlAccessible : public VCLXWindow
         explicit SidebarTextControlAccessible( SidebarTextControl& rSidebarTextControl );
         virtual ~SidebarTextControlAccessible();
 
-        virtual com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessibleContext >
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext >
                 CreateAccessibleContext() override;
 
     private:
diff --git a/sw/source/uibase/docvw/SidebarWinAcc.hxx b/sw/source/uibase/docvw/SidebarWinAcc.hxx
index 321a9a14f63a..ed0a55402fff 100644
--- a/sw/source/uibase/docvw/SidebarWinAcc.hxx
+++ b/sw/source/uibase/docvw/SidebarWinAcc.hxx
@@ -38,7 +38,7 @@ class SidebarWinAccessible : public VCLXWindow
                                        const SwSidebarItem& rSidebarItem );
         virtual ~SidebarWinAccessible();
 
-        virtual com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessibleContext >
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext >
                 CreateAccessibleContext() override;
 
         void ChangeSidebarItem( const SwSidebarItem& rSidebarItem );
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index d1c9c6bc6bd1..83e022479370 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5831,13 +5831,13 @@ void SwEditWin::SetChainMode( bool bOn )
     m_rView.GetViewFrame()->GetBindings().Invalidate(aInva);
 }
 
-uno::Reference< ::com::sun::star::accessibility::XAccessible > SwEditWin::CreateAccessible()
+uno::Reference< css::accessibility::XAccessible > SwEditWin::CreateAccessible()
 {
     SolarMutexGuard aGuard;   // this should have happened already!!!
     SwWrtShell *pSh = m_rView.GetWrtShellPtr();
     OSL_ENSURE( pSh, "no writer shell, no accessible object" );
     uno::Reference<
-        ::com::sun::star::accessibility::XAccessible > xAcc;
+        css::accessibility::XAccessible > xAcc;
     if( pSh )
         xAcc = pSh->CreateAccessible();
 
diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx
index 0bdf4e47d2ad..20873b4d0400 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -46,8 +46,8 @@
 #include <helpid.h>
 #include <docvw.hrc>
 
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::uno;
+using namespace css::lang;
+using namespace css::uno;
 using namespace ::com::sun::star;
 using namespace ::sfx2;
 
@@ -339,7 +339,7 @@ void SwReadOnlyPopup::Execute( vcl::Window* pWin, sal_uInt16 nId )
 
     if( pClipCntnr )
     {
-        ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRef( pClipCntnr );
+        css::uno::Reference< css::datatransfer::XTransferable > xRef( pClipCntnr );
         if( pClipCntnr->HasAnyData() )
             pClipCntnr->CopyToClipboard( pWin );
     }
diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx
index 766c1556dbf0..d1ed4a6a9bdb 100644
--- a/sw/source/uibase/envelp/envimg.cxx
+++ b/sw/source/uibase/envelp/envimg.cxx
@@ -41,7 +41,7 @@
 #endif
 
 using namespace utl;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
 
 TYPEINIT1_AUTOFACTORY( SwEnvItem, SfxPoolItem );
 
@@ -264,7 +264,7 @@ void SwEnvCfgItem::ImplCommit()
     PutProperties(aNames, aValues);
 }
 
-void SwEnvCfgItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwEnvCfgItem::Notify( const css::uno::Sequence< OUString >& ) {}
 
 Sequence<OUString> SwEnvCfgItem::GetPropertyNames()
 {
diff --git a/sw/source/uibase/envelp/labelcfg.cxx b/sw/source/uibase/envelp/labelcfg.cxx
index a29ee6c4ce34..dcd1a4ac0532 100644
--- a/sw/source/uibase/envelp/labelcfg.cxx
+++ b/sw/source/uibase/envelp/labelcfg.cxx
@@ -30,8 +30,8 @@
 #include <unomid.h>
 
 using namespace utl;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
+using namespace css::uno;
+using namespace css::beans;
 
 static inline void lcl_assertEndingItem(xmlreader::XmlReader& reader)
 {
@@ -171,7 +171,7 @@ SwLabelConfig::~SwLabelConfig()
 // the config item is not writable ?:
 void SwLabelConfig::ImplCommit() {}
 
-void SwLabelConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwLabelConfig::Notify( const css::uno::Sequence< OUString >& ) {}
 
 static std::unique_ptr<SwLabRec> lcl_CreateSwLabRec(const OUString& rType, const OUString& rMeasure, const OUString& rManufacturer)
 {
diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx
index 1d8681966212..d893eb93f429 100644
--- a/sw/source/uibase/envelp/labimg.cxx
+++ b/sw/source/uibase/envelp/labimg.cxx
@@ -29,7 +29,7 @@
 #include <unomid.h>
 
 using namespace utl;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
 
 SwLabItem::SwLabItem() :
 
@@ -394,7 +394,7 @@ SwLabCfgItem::SwLabCfgItem(bool bLabel) :
     }
 }
 
-void SwLabCfgItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwLabCfgItem::Notify( const css::uno::Sequence< OUString >& ) {}
 
 void SwLabCfgItem::ImplCommit()
 {
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index fa6ecca7d6d8..230ea4eeabb4 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -80,13 +80,13 @@
 #include <cnttab.hxx>
 #include <unotools/useroptions.hxx>
 
-using namespace com::sun::star::uno;
-using namespace com::sun::star::container;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::beans;
-using namespace com::sun::star::text;
-using namespace com::sun::star::style;
-using namespace com::sun::star::sdbc;
+using namespace css::uno;
+using namespace css::container;
+using namespace css::lang;
+using namespace css::beans;
+using namespace css::text;
+using namespace css::style;
+using namespace css::sdbc;
 using namespace ::com::sun::star;
 using namespace nsSwDocInfoSubType;
 
diff --git a/sw/source/uibase/fldui/xfldui.cxx b/sw/source/uibase/fldui/xfldui.cxx
index c7164e5e771d..95d6ec51cbc5 100644
--- a/sw/source/uibase/fldui/xfldui.cxx
+++ b/sw/source/uibase/fldui/xfldui.cxx
@@ -33,13 +33,13 @@
 #include <view.hxx>
 #include <swmodule.hxx>
 
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::beans;
+using namespace css::uno;
+using namespace css::container;
+using namespace css::lang;
+using namespace css::sdb;
+using namespace css::sdbc;
+using namespace css::sdbcx;
+using namespace css::beans;
 
 // This file contains all routines of the fldui directory, which must compile
 // with exceptions. So we can reduce the code of the other files, which don't
diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx b/sw/source/uibase/inc/SwXFilterOptions.hxx
index 1e15c274b8dc..b76ecf5078b6 100644
--- a/sw/source/uibase/inc/SwXFilterOptions.hxx
+++ b/sw/source/uibase/inc/SwXFilterOptions.hxx
@@ -32,19 +32,19 @@ namespace com { namespace sun { namespace star { namespace io {
 } } } }
 
 class SwXFilterOptions : public ::cppu::WeakImplHelper<
-                            ::com::sun::star::beans::XPropertyAccess,
-                            ::com::sun::star::ui::dialogs::XExecutableDialog,
-                            ::com::sun::star::document::XImporter,
-                            ::com::sun::star::document::XExporter,
-                            ::com::sun::star::lang::XServiceInfo >
+                            css::beans::XPropertyAccess,
+                            css::ui::dialogs::XExecutableDialog,
+                            css::document::XImporter,
+                            css::document::XExporter,
+                            css::lang::XServiceInfo >
 {
     OUString     sFilterName;
     OUString     sFilterOptions;
 
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::io::XInputStream > xInputStream;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::lang::XComponent > xModel;
+    css::uno::Reference<
+        css::io::XInputStream > xInputStream;
+    css::uno::Reference<
+        css::lang::XComponent > xModel;
     bool            bExport;
 
 public:
@@ -52,40 +52,40 @@ public:
     virtual                 ~SwXFilterOptions();
 
                             // XPropertyAccess
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
-                            SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setPropertyValues( const ::com::sun::star::uno::Sequence<
-                                    ::com::sun::star::beans::PropertyValue >& aProps )
-                                throw (::com::sun::star::beans::UnknownPropertyException,
-                                        ::com::sun::star::beans::PropertyVetoException,
-                                        ::com::sun::star::lang::IllegalArgumentException,
-                                        ::com::sun::star::lang::WrappedTargetException,
-                                        ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue >
+                            SAL_CALL getPropertyValues() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   setPropertyValues( const css::uno::Sequence<
+                                    css::beans::PropertyValue >& aProps )
+                                throw (css::beans::UnknownPropertyException,
+                                        css::beans::PropertyVetoException,
+                                        css::lang::IllegalArgumentException,
+                                        css::lang::WrappedTargetException,
+                                        css::uno::RuntimeException, std::exception) override;
 
                             // XExecutableDialog
     virtual void SAL_CALL   setTitle( const OUString& aTitle )
-                                throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+                                throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException, std::exception) override;
 
                             // XImporter
-    virtual void SAL_CALL   setTargetDocument( const ::com::sun::star::uno::Reference<
-                                    ::com::sun::star::lang::XComponent >& xDoc )
-                                throw (::com::sun::star::lang::IllegalArgumentException,
-                                        ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   setTargetDocument( const css::uno::Reference<
+                                    css::lang::XComponent >& xDoc )
+                                throw (css::lang::IllegalArgumentException,
+                                        css::uno::RuntimeException, std::exception) override;
 
                             // XExporter
-    virtual void SAL_CALL   setSourceDocument( const ::com::sun::star::uno::Reference<
-                                    ::com::sun::star::lang::XComponent >& xDoc )
-                                throw (::com::sun::star::lang::IllegalArgumentException,
-                                        ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   setSourceDocument( const css::uno::Reference<
+                                    css::lang::XComponent >& xDoc )
+                                throw (css::lang::IllegalArgumentException,
+                                        css::uno::RuntimeException, std::exception) override;
 
                             // XServiceInfo
     virtual OUString SAL_CALL getImplementationName()
-                                throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+                                throw(css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+                                throw(css::uno::RuntimeException, std::exception) override;
 
 };
 
diff --git a/sw/source/uibase/inc/barcfg.hxx b/sw/source/uibase/inc/barcfg.hxx
index db8bb316cfd6..aaca51cbf44b 100644
--- a/sw/source/uibase/inc/barcfg.hxx
+++ b/sw/source/uibase/inc/barcfg.hxx
@@ -24,7 +24,7 @@ class SwToolbarConfigItem : public utl::ConfigItem
 {
     sal_Int32            aTbxIdArray[5];
 
-    static com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+    static css::uno::Sequence<OUString> GetPropertyNames();
 
     virtual void ImplCommit() override;
 
@@ -32,7 +32,7 @@ public:
     SwToolbarConfigItem( bool bWeb );
     virtual ~SwToolbarConfigItem();
 
-    virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
     void        SetTopToolbar( sal_Int32 nSelType, sal_Int32 nBarId );
 };
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index 7b9a2afdad98..0f6085c4d701 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -248,7 +248,7 @@ private:
     static const SfxObjectShell* pShowShell;
 
     void        InsertRegion( const SwGlblDocContent* _pContent,
-                              const com::sun::star::uno::Sequence< OUString >& _rFiles );
+                              const css::uno::Sequence< OUString >& _rFiles );
 
     DECL_LINK_TYPED(  DialogClosedHdl, sfx2::FileDialogHelper*, void );
 
diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx
index 53848f34cedb..7e9617c574c3 100644
--- a/sw/source/uibase/inc/cption.hxx
+++ b/sw/source/uibase/inc/cption.hxx
@@ -91,8 +91,8 @@ class SwCaptionDialog : public SvxStandardDialog
     bool         bCopyAttributes;
     bool        bOrderNumberingFirst; //#i61007# order of captions
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >    xNameAccess;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed >         xNamed;
+    css::uno::Reference< css::container::XNameAccess >    xNameAccess;
+    css::uno::Reference< css::container::XNamed >         xNamed;
 
     DECL_LINK_TYPED(SelectHdl, ComboBox&, void);
     DECL_LINK_TYPED(SelectListBoxHdl, ListBox&, void);
diff --git a/sw/source/uibase/inc/dbconfig.hxx b/sw/source/uibase/inc/dbconfig.hxx
index e67382dbf38f..c4c4c6e5e3f5 100644
--- a/sw/source/uibase/inc/dbconfig.hxx
+++ b/sw/source/uibase/inc/dbconfig.hxx
@@ -27,7 +27,7 @@ struct SwDBData;
 class SW_DLLPUBLIC SwDBConfig : public utl::ConfigItem
 {
 private:
-    SAL_DLLPRIVATE const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
+    SAL_DLLPRIVATE const css::uno::Sequence<OUString>& GetPropertyNames();
     virtual void ImplCommit() override;
 
     SwDBData*       pAdrImpl;
@@ -40,7 +40,7 @@ public:
     void                    Load();
     const SwDBData&         GetAddressSource();
     const SwDBData&         GetBibliographySource();
-    virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 };
 
 #endif
diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx
index 2bf535ef4dc1..59c1b5fd1561 100644
--- a/sw/source/uibase/inc/dbinsdlg.hxx
+++ b/sw/source/uibase/inc/dbinsdlg.hxx
@@ -147,7 +147,7 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
 
     bool SplitTextToColArr( const OUString& rText, DB_Columns& rColArr, bool bInsField );
         using SfxModalDialog::Notify;
-    virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
     virtual void            ImplCommit() override;
     void                    Load();
 
@@ -156,17 +156,17 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
 
 public:
     SwInsertDBColAutoPilot( SwView& rView,
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource,
-        com::sun::star::uno::Reference<com::sun::star::sdbcx::XColumnsSupplier>,
+        css::uno::Reference< css::sdbc::XDataSource> rxSource,
+        css::uno::Reference<css::sdbcx::XColumnsSupplier>,
         const SwDBData& rData  );
 
     virtual ~SwInsertDBColAutoPilot();
     virtual void dispose() override;
 
-    void DataToDoc( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection,
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource,
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection,
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet);
+    void DataToDoc( const css::uno::Sequence< css::uno::Any >& rSelection,
+        css::uno::Reference< css::sdbc::XDataSource> rxSource,
+        css::uno::Reference< css::sdbc::XConnection> xConnection,
+        css::uno::Reference< css::sdbc::XResultSet > xResultSet);
 
 };
 
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index fda3911a3c96..5e8f7571e06e 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -263,7 +263,7 @@ public:
     const SwView &GetView() const { return m_rView; }
           SwView &GetView()       { return m_rView; }
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
 
     static inline long GetDDStartPosX() { return m_nDDStartPosX; }
     static inline long GetDDStartPosY() { return m_nDDStartPosY; }
diff --git a/sw/source/uibase/inc/envimg.hxx b/sw/source/uibase/inc/envimg.hxx
index 9fea992adb2d..66fd1438e9fc 100644
--- a/sw/source/uibase/inc/envimg.hxx
+++ b/sw/source/uibase/inc/envimg.hxx
@@ -63,8 +63,8 @@ public:
     virtual bool operator ==(const SfxPoolItem& rItem) const override;
 
     virtual SfxPoolItem*     Clone(SfxItemPool* = 0) const override;
-    virtual bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
-    virtual bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+    virtual bool             QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+    virtual bool             PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 };
 
 class SwEnvCfgItem : public utl::ConfigItem
@@ -72,7 +72,7 @@ class SwEnvCfgItem : public utl::ConfigItem
 private:
     SwEnvItem aEnvItem;
 
-    static com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+    static css::uno::Sequence<OUString> GetPropertyNames();
 
     virtual void ImplCommit() override;
 
@@ -82,7 +82,7 @@ public:
 
     SwEnvItem& GetItem() {return aEnvItem;}
 
-    virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 };
 
 #endif
diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx
index fe4f06c90cb1..5beab7aac8cf 100644
--- a/sw/source/uibase/inc/fldmgr.hxx
+++ b/sw/source/uibase/inc/fldmgr.hxx
@@ -73,9 +73,9 @@ struct SwInsertField_Data
     SwWrtShell* m_pSh;
     sal_Unicode m_cSeparator;
     bool m_bIsAutomaticLanguage;
-    ::com::sun::star::uno::Any m_aDBDataSource;
-    ::com::sun::star::uno::Any m_aDBConnection;
-    ::com::sun::star::uno::Any m_aDBColumn;
+    css::uno::Any m_aDBDataSource;
+    css::uno::Any m_aDBConnection;
+    css::uno::Any m_aDBColumn;
     VclPtr<vcl::Window> m_pParent; // parent dialog used for SwWrtShell::StartInputFieldDlg()
 
     SwInsertField_Data(sal_uInt16 nType, sal_uInt16 nSub, const OUString& rPar1, const OUString& rPar2,
@@ -115,9 +115,9 @@ private:
 
     SAL_DLLPRIVATE sal_uInt16            GetCurrLanguage() const;
 
-    com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> xDBContext;
-    com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> xNumberingInfo;
-    SAL_DLLPRIVATE com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> GetNumberingInfo()const;
+    css::uno::Reference<css::container::XNameAccess> xDBContext;
+    css::uno::Reference<css::text::XNumberingTypeInfo> xNumberingInfo;
+    SAL_DLLPRIVATE css::uno::Reference<css::text::XNumberingTypeInfo> GetNumberingInfo()const;
 
 public:
     explicit SwFieldMgr(SwWrtShell* pSh = 0);
diff --git a/sw/source/uibase/inc/fontcfg.hxx b/sw/source/uibase/inc/fontcfg.hxx
index e9f47ebfd31f..cee5e671914f 100644
--- a/sw/source/uibase/inc/fontcfg.hxx
+++ b/sw/source/uibase/inc/fontcfg.hxx
@@ -58,7 +58,7 @@ class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem
     OUString    sDefaultFonts[DEF_FONT_COUNT];
     sal_Int32   nDefaultFontHeight[DEF_FONT_COUNT];
 
-    SAL_DLLPRIVATE com::sun::star::uno::Sequence<OUString>    GetPropertyNames();
+    SAL_DLLPRIVATE css::uno::Sequence<OUString>    GetPropertyNames();
 
     void ChangeString(sal_uInt16 nFontType, const OUString& rSet)
         {
@@ -77,7 +77,7 @@ public:
     SwStdFontConfig();
     virtual ~SwStdFontConfig();
 
-    virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
     const OUString&   GetFontStandard(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_STANDARD + FONT_PER_GROUP * nFontGroup];}
     const OUString&   GetFontOutline(sal_uInt8 nFontGroup)  const {return sDefaultFonts[FONT_OUTLINE + FONT_PER_GROUP * nFontGroup];}
diff --git a/sw/source/uibase/inc/glosdoc.hxx b/sw/source/uibase/inc/glosdoc.hxx
index a9cddb26d986..e460e81bb1d3 100644
--- a/sw/source/uibase/inc/glosdoc.hxx
+++ b/sw/source/uibase/inc/glosdoc.hxx
@@ -72,7 +72,7 @@ public:
         @param _bCreate
             if <TRUE/>, the group is created if it does not yet exist
     */
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextGroup >
+    css::uno::Reference< css::text::XAutoTextGroup >
                             GetAutoTextGroup(
                                 const OUString& _rGroupName,
                                 bool _bCreate = false
@@ -92,7 +92,7 @@ public:
         @param _bCreate
             if <TRUE/>, the entry is created if it does not yet exist
     */
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry >
+    css::uno::Reference< css::text::XAutoTextEntry >
                             GetAutoTextEntry(
                                 const OUString& _rCompleteGroupName,
                                 const OUString& _rGroupName,
diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx
index b41ae52c9be2..ccc9759274c7 100644
--- a/sw/source/uibase/inc/glossary.hxx
+++ b/sw/source/uibase/inc/glossary.hxx
@@ -104,7 +104,7 @@ class SwGlossaryDlg : public SvxStandardDialog
 
     OUString        sReadonlyPath;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextContainer2 > m_xAutoText;
+    css::uno::Reference< css::text::XAutoTextContainer2 > m_xAutoText;
     SwOneExampleFrame*  pExampleFrame;
 
     SwGlossaryHdl*  pGlossaryHdl;
diff --git a/sw/source/uibase/inc/hyp.hxx b/sw/source/uibase/inc/hyp.hxx
index 5af24755d0d8..8031e2203137 100644
--- a/sw/source/uibase/inc/hyp.hxx
+++ b/sw/source/uibase/inc/hyp.hxx
@@ -29,8 +29,8 @@ class SwView;
 class SwHyphWrapper : public SvxSpellWrapper {
 private:
     SwView* pView;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::linguistic2::XHyphenator >  xHyph;
+    css::uno::Reference<
+        css::linguistic2::XHyphenator >  xHyph;
     sal_uInt16          nPageCount;     // page count for progress view
     sal_uInt16          nPageStart;     // 1st checked page
     bool            bInSelection : 1; // separating selected text
@@ -46,8 +46,8 @@ protected:
 
 public:
     SwHyphWrapper( SwView* pVw,
-                   ::com::sun::star::uno::Reference<
-                        ::com::sun::star::linguistic2::XHyphenator >  &rxHyph,
+                   css::uno::Reference<
+                        css::linguistic2::XHyphenator >  &rxHyph,
                    bool bStart, bool bOther, bool bSelect );
     virtual ~SwHyphWrapper();
 };
diff --git a/sw/source/uibase/inc/imaildsplistener.hxx b/sw/source/uibase/inc/imaildsplistener.hxx
index 8c7f04c7c219..82bd2ddfaa7b 100644
--- a/sw/source/uibase/inc/imaildsplistener.hxx
+++ b/sw/source/uibase/inc/imaildsplistener.hxx
@@ -56,13 +56,13 @@ public:
         Called for every mail message that has been
         successfully delivered.
     */
-    virtual void mailDelivered(::rtl::Reference<MailDispatcher> xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage) = 0;
+    virtual void mailDelivered(::rtl::Reference<MailDispatcher> xMailDispatcher, css::uno::Reference< css::mail::XMailMessage> xMailMessage) = 0;
 
     /**
         Called for every mail message whose delivery
         failed.
     */
-    virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage, const OUString& sErrorMessage) = 0;
+    virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher, css::uno::Reference< css::mail::XMailMessage> xMailMessage, const OUString& sErrorMessage) = 0;
 };
 
 #endif // INCLUDED_IMAILDISPATCHERLISTENER_HXX
diff --git a/sw/source/uibase/inc/label.hxx b/sw/source/uibase/inc/label.hxx
index f8102bb3b9f8..193b8c89a077 100644
--- a/sw/source/uibase/inc/label.hxx
+++ b/sw/source/uibase/inc/label.hxx
@@ -73,7 +73,7 @@ public:
     Printer *GetPrt();
     inline void ReplaceGroup( const OUString &rMake );
     void UpdateGroup( const OUString &rMake ) {_ReplaceGroup( rMake );}
-    static void UpdateFieldInformation(::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& xModel,
+    static void UpdateFieldInformation(css::uno::Reference< css::frame::XModel>& xModel,
                                                                                 const SwLabItem& rItem);
     const OUString& GetBusinessCardStr() const {return m_sBusinessCardDlg;}
 
diff --git a/sw/source/uibase/inc/labelcfg.hxx b/sw/source/uibase/inc/labelcfg.hxx
index 783a9b105a33..504b15c24e12 100644
--- a/sw/source/uibase/inc/labelcfg.hxx
+++ b/sw/source/uibase/inc/labelcfg.hxx
@@ -44,7 +44,7 @@ public:
     SwLabelConfig();
     virtual ~SwLabelConfig();
 
-    virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
     void    FillLabels(const OUString& rManufacturer, SwLabRecs& rLabArr);
     const std::vector<OUString>& GetManufacturers() const {return m_aManufacturers;}
diff --git a/sw/source/uibase/inc/labimg.hxx b/sw/source/uibase/inc/labimg.hxx
index 43b6690d6169..4207c38b8b8e 100644
--- a/sw/source/uibase/inc/labimg.hxx
+++ b/sw/source/uibase/inc/labimg.hxx
@@ -109,7 +109,7 @@ private:
     SwLabItem   aItem;
     bool    bIsLabel;
 
-    com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+    css::uno::Sequence<OUString> GetPropertyNames();
 
     virtual void ImplCommit() override;
 
@@ -118,7 +118,7 @@ public:
 
     SwLabItem&              GetItem() {return aItem;}
 
-    virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 };
 
 #endif
diff --git a/sw/source/uibase/inc/maildispatcher.hxx b/sw/source/uibase/inc/maildispatcher.hxx
index 4a33570314ed..c0a6dec4f498 100644
--- a/sw/source/uibase/inc/maildispatcher.hxx
+++ b/sw/source/uibase/inc/maildispatcher.hxx
@@ -58,10 +58,10 @@ public:
         connected to the mail server otherwise errors occur
         during the delivery of mail messages.
 
-        @throws ::com::sun::star::uno::RuntimeException
+        @throws css::uno::RuntimeException
         on errors during construction of an instance of this class.
     */
-    MailDispatcher(::com::sun::star::uno::Reference< ::com::sun::star::mail::XSmtpService> xMailService);
+    MailDispatcher(css::uno::Reference< css::mail::XSmtpService> xMailService);
 
     /**
         Shutdown the mail dispatcher. Every mail messages
@@ -77,12 +77,12 @@ public:
         @param xMailMessage
         [in] a mail message that should be send.
     */
-    void enqueueMailMessage(::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage);
+    void enqueueMailMessage(css::uno::Reference< css::mail::XMailMessage> xMailMessage);
     /**
         Dequeues a mail message.
         This enables the caller to remove attachments when sending mails is to be cancelled.
     */
-    ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> dequeueMailMessage();
+    css::uno::Reference< css::mail::XMailMessage> dequeueMailMessage();
 
     /**
         Start sending mail messages asynchronously. A client may register
@@ -138,11 +138,11 @@ protected:
 
 private:
     std::list< ::rtl::Reference<IMailDispatcherListener> > cloneListener();
-    void sendMailMessageNotifyListener(::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> message);
+    void sendMailMessageNotifyListener(css::uno::Reference< css::mail::XMailMessage> message);
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::mail::XSmtpService> mailserver_;
-    ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage > > messages_;
+    css::uno::Reference< css::mail::XSmtpService> mailserver_;
+    ::std::list< css::uno::Reference< css::mail::XMailMessage > > messages_;
     ::std::list< ::rtl::Reference<IMailDispatcherListener> > listeners_;
     ::osl::Mutex message_container_mutex_;
     ::osl::Mutex listener_container_mutex_;
diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx
index fd5777a1a496..9132a282ca26 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/sw/source/uibase/inc/mailmrge.hxx
@@ -98,8 +98,8 @@ class SwMailMergeDlg : public SvxStandardDialog
     SwModuleOptions* pModOpt;
 
     DBManagerOptions nMergeType;
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >       m_aSelection;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 > m_xFrame;
+    css::uno::Sequence< css::uno::Any >       m_aSelection;
+    css::uno::Reference< css::frame::XFrame2 > m_xFrame;
 
     Size            m_aDialogSize;
     OUString m_sSaveFilter;
@@ -119,8 +119,8 @@ public:
         const OUString& rSourceName,
         const OUString& rTableName,
         sal_Int32 nCommandType,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0);
+        const css::uno::Reference< css::sdbc::XConnection>& xConnection,
+        css::uno::Sequence< css::uno::Any >* pSelection = 0);
     virtual ~SwMailMergeDlg();
     virtual void dispose() override;
 
@@ -132,8 +132,8 @@ public:
     OUString GetPath() const { return m_pPathED->GetText();}
 
     const OUString& GetSaveFilter() const {return m_sSaveFilter;}
-    inline const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const { return m_aSelection; }
-    ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const;
+    inline const css::uno::Sequence< css::uno::Any > GetSelection() const { return m_aSelection; }
+    css::uno::Reference< css::sdbc::XResultSet> GetResultSet() const;
 
 };
 
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx
index 1f7207cdcca1..4eb41f011511 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.hxx
@@ -49,7 +49,7 @@ struct SwDocMergeInfo
 
 class SW_DLLPUBLIC SwMailMergeConfigItem
 {
-//    com::sun::star::uno::Sequence< OUString>     m_aSavedDocuments;
+//    css::uno::Sequence< OUString>     m_aSavedDocuments;
     SwMailMergeConfigItem_Impl* m_pImpl;
     //session information - not stored in configuration
     bool m_bAddressInserted;
@@ -82,18 +82,18 @@ public:
     const ResStringArray& GetDefaultAddressHeaders() const;
 
     void SetCurrentConnection(
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource,
+        css::uno::Reference< css::sdbc::XDataSource> xSource,
         const SharedConnection& rConnection,
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> xColumnsSupplier,
+        css::uno::Reference< css::sdbcx::XColumnsSupplier> xColumnsSupplier,
         const SwDBData& rDBData);
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> GetSource();
+    css::uno::Reference< css::sdbc::XDataSource> GetSource();
 
     SharedConnection GetConnection();
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> GetColumnsSupplier();
+    css::uno::Reference< css::sdbcx::XColumnsSupplier> GetColumnsSupplier();
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const;
+    css::uno::Reference< css::sdbc::XResultSet> GetResultSet() const;
 
     void DisposeResultSet();
 
@@ -112,7 +112,7 @@ public:
     void ExcludeRecord(sal_Int32 nRecord, bool bExclude);
     css::uno::Sequence< css::uno::Any> GetSelection() const;
 
-    const com::sun::star::uno::Sequence<OUString>& GetSavedDocuments() const;
+    const css::uno::Sequence<OUString>& GetSavedDocuments() const;
     void AddSavedDocument(const OUString& rName);
 
     bool IsOutputToLetter()const;
@@ -124,8 +124,8 @@ public:
     bool IsHideEmptyParagraphs() const;
     void SetHideEmptyParagraphs(bool bSet);
 
-    const com::sun::star::uno::Sequence<OUString> GetAddressBlocks() const;
-    void SetAddressBlocks(const com::sun::star::uno::Sequence< OUString>& rBlocks);
+    const css::uno::Sequence<OUString> GetAddressBlocks() const;
+    void SetAddressBlocks(const css::uno::Sequence< OUString>& rBlocks);
 
     void SetCurrentAddressBlockIndex( sal_Int32 nSet );
     sal_Int32 GetCurrentAddressBlockIndex() const;
@@ -140,8 +140,8 @@ public:
     bool IsGreetingLine(bool bInEMail) const;
     void SetGreetingLine(bool bSet, bool bInEMail);
 
-    const com::sun::star::uno::Sequence<OUString> GetGreetings(Gender eType) const;
-    void SetGreetings(Gender eType, const com::sun::star::uno::Sequence< OUString>& rBlocks);
+    const css::uno::Sequence<OUString> GetGreetings(Gender eType) const;
+    void SetGreetings(Gender eType, const css::uno::Sequence< OUString>& rBlocks);
 
     sal_Int32 GetCurrentGreeting(Gender eType) const;
     void SetCurrentGreeting(Gender eType, sal_Int32 nIndex);
@@ -151,10 +151,10 @@ public:
     void SetFemaleGenderValue(const OUString& rValue);
 
     //returns the assignment in the order of the default headers (GetDefaultAddressHeaders())
-    com::sun::star::uno::Sequence<OUString> GetColumnAssignment( const SwDBData& rDBData ) const;
+    css::uno::Sequence<OUString> GetColumnAssignment( const SwDBData& rDBData ) const;
     void SetColumnAssignment(
         const SwDBData& rDBData,
-        const com::sun::star::uno::Sequence< OUString>& );
+        const css::uno::Sequence< OUString>& );
 
     bool IsAddressFieldsAssigned() const;
     bool IsGreetingFieldsAssigned() const;
diff --git a/sw/source/uibase/inc/navicfg.hxx b/sw/source/uibase/inc/navicfg.hxx
index 90fe6d348d6a..e0f77646b6be 100644
--- a/sw/source/uibase/inc/navicfg.hxx
+++ b/sw/source/uibase/inc/navicfg.hxx
@@ -34,7 +34,7 @@ class SwNavigationConfig : public utl::ConfigItem
     bool           bIsSmall;       //ShowListBox
     bool           bIsGlobalActive; //GlobalDocMode// global view for GlobalDoc valid?
 
-    static com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+    static css::uno::Sequence<OUString> GetPropertyNames();
 
     virtual void ImplCommit() override;
 
@@ -42,7 +42,7 @@ public:
     SwNavigationConfig();
     virtual ~SwNavigationConfig();
 
-    virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
     ContentTypeId GetRootType()const {return nRootType;}
     void        SetRootType(ContentTypeId nSet){
diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx
index d68e22140b1d..3e1324bb1bea 100644
--- a/sw/source/uibase/inc/olmenu.hxx
+++ b/sw/source/uibase/inc/olmenu.hxx
@@ -36,15 +36,15 @@ class SwWrtShell;
 class SW_DLLPUBLIC SwSpellPopup : public PopupMenu
 {
     SwWrtShell* m_pSh;
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
-        ::com::sun::star::linguistic2::XDictionary >  >     m_aDics;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::linguistic2::XSpellAlternatives > m_xSpellAlt;
+    css::uno::Sequence< css::uno::Reference<
+        css::linguistic2::XDictionary >  >     m_aDics;
+    css::uno::Reference<
+        css::linguistic2::XSpellAlternatives > m_xSpellAlt;
 
-    ::com::sun::star::linguistic2::ProofreadingResult m_xGrammarResult;
+    css::linguistic2::ProofreadingResult m_xGrammarResult;
     sal_Int32 m_nGrammarError;
 
-    ::com::sun::star::uno::Sequence< OUString >  m_aSuggestions;
+    css::uno::Sequence< OUString >  m_aSuggestions;
     OUString m_sExplanationLink;
 
     LanguageType                m_nCheckedLanguage;
@@ -61,7 +61,7 @@ class SW_DLLPUBLIC SwSpellPopup : public PopupMenu
     Image     m_aInfo16;
 
     static void fillLangPopupMenu( PopupMenu *pPopupMenu, sal_uInt16 nLangStart,
-            const ::com::sun::star::uno::Sequence< OUString >& aSeq, SwWrtShell* pWrtSh,
+            const css::uno::Sequence< OUString >& aSeq, SwWrtShell* pWrtSh,
             std::map< sal_Int16, OUString > &rLangTable );
 
     using PopupMenu::Execute;
@@ -71,14 +71,14 @@ class SW_DLLPUBLIC SwSpellPopup : public PopupMenu
 
 public:
     SwSpellPopup( SwWrtShell *pWrtSh,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::linguistic2::XSpellAlternatives >  &xAlt,
+            const css::uno::Reference<
+                css::linguistic2::XSpellAlternatives >  &xAlt,
             const OUString & rParaText );
 
     SwSpellPopup( SwWrtShell *pWrtSh,
-            const ::com::sun::star::linguistic2::ProofreadingResult &rResult,
+            const css::linguistic2::ProofreadingResult &rResult,
             sal_Int32 nErrorInResult,
-            const ::com::sun::star::uno::Sequence< OUString > &rSuggestions,
+            const css::uno::Sequence< OUString > &rSuggestions,
             const OUString & rParaText );
 
     sal_uInt16  Execute( const Rectangle& rPopupPos, vcl::Window* pWin );
diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx
index ab1cd78378b6..f615299e7285 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -166,7 +166,7 @@ class SwInsertSectionTabPage : public SfxTabPage
     OUString        m_sFilterName;
     OUString        m_sFilePasswd;
 
-    ::com::sun::star::uno::Sequence <sal_Int8 > m_aNewPasswd;
+    css::uno::Sequence <sal_Int8 > m_aNewPasswd;
     SwWrtShell*             m_pWrtSh;
     sfx2::DocumentInserter* m_pDocInserter;
     VclPtr<vcl::Window>     m_pOldDefDlgParent;
diff --git a/sw/source/uibase/inc/sharedconnection.hxx b/sw/source/uibase/inc/sharedconnection.hxx
index 48b23e4f7673..138cbf51e107 100644
--- a/sw/source/uibase/inc/sharedconnection.hxx
+++ b/sw/source/uibase/inc/sharedconnection.hxx
@@ -23,7 +23,7 @@
 #include <unotools/sharedunocomponent.hxx>
 #include <com/sun/star/sdbc/XConnection.hpp>
 
-typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection >   SharedConnection;
+typedef ::utl::SharedUNOComponent< css::sdbc::XConnection >   SharedConnection;
 
 #endif // INCLUDED_SW_SOURCE_UIBASE_INC_SHAREDCONNECTION_HXX
 
diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx
index e7cea26f9e10..d8d6d34be93a 100644
--- a/sw/source/uibase/inc/srcedtw.hxx
+++ b/sw/source/uibase/inc/srcedtw.hxx
@@ -77,7 +77,7 @@ private:
 
     rtl::Reference< ChangesListener > listener_;
     osl::Mutex mutex_;
-    com::sun::star::uno::Reference< com::sun::star::beans::XMultiPropertySet >
+    css::uno::Reference< css::beans::XMultiPropertySet >
         notifier_;
 
     long            nCurTextWidth;
diff --git a/sw/source/uibase/inc/stmenu.hxx b/sw/source/uibase/inc/stmenu.hxx
index 90876aa03a21..6c6073895ee0 100644
--- a/sw/source/uibase/inc/stmenu.hxx
+++ b/sw/source/uibase/inc/stmenu.hxx
@@ -42,15 +42,15 @@ class SwView;
 class SwSmartTagPopup : public PopupMenu
 {
     SwView*  mpSwView;
-    com::sun::star::uno::Reference< com::sun::star::text::XTextRange > mxTextRange;
+    css::uno::Reference< css::text::XTextRange > mxTextRange;
 
     struct InvokeAction
     {
-        com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > mxAction;
-        com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > mxSmartTagProperties;
+        css::uno::Reference< css::smarttags::XSmartTagAction > mxAction;
+        css::uno::Reference< css::container::XStringKeyMap > mxSmartTagProperties;
         sal_uInt32 mnActionID;
-        InvokeAction( com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > xAction,
-                      com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xSmartTagProperties,
+        InvokeAction( css::uno::Reference< css::smarttags::XSmartTagAction > xAction,
+                      css::uno::Reference< css::container::XStringKeyMap > xSmartTagProperties,
                       sal_uInt32 nActionID ) : mxAction( xAction ), mxSmartTagProperties( xSmartTagProperties ), mnActionID( nActionID ) {}
     };
 
@@ -60,9 +60,9 @@ class SwSmartTagPopup : public PopupMenu
 
 public:
     SwSmartTagPopup( SwView* _pSwView,
-                     ::com::sun::star::uno::Sequence< OUString >& rSmartTagTypes,
-                     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > >& rStringKeyMaps,
-                     ::com::sun::star::uno::Reference< com::sun::star::text::XTextRange > xTextRange );
+                     css::uno::Sequence< OUString >& rSmartTagTypes,
+                     css::uno::Sequence< css::uno::Reference< css::container::XStringKeyMap > >& rStringKeyMaps,
+                     css::uno::Reference< css::text::XTextRange > xTextRange );
 
     sal_uInt16  Execute( const Rectangle& rPopupPos, vcl::Window* pWin );
 };
diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx b/sw/source/uibase/inc/swrenamexnameddlg.hxx
index 87f3085043d5..88c9bce213e4 100644
--- a/sw/source/uibase/inc/swrenamexnameddlg.hxx
+++ b/sw/source/uibase/inc/swrenamexnameddlg.hxx
@@ -36,18 +36,18 @@ class SwRenameXNamedDlg : public ModalDialog
     TextFilter m_aTextFilter;
     VclPtr<OKButton> m_pOk;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > &   xNamed;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >   xSecondAccess;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >   xThirdAccess;
+    css::uno::Reference< css::container::XNamed > &   xNamed;
+    css::uno::Reference< css::container::XNameAccess > & xNameAccess;
+    css::uno::Reference< css::container::XNameAccess >   xSecondAccess;
+    css::uno::Reference< css::container::XNameAccess >   xThirdAccess;
 
     DECL_LINK_TYPED(OkHdl, Button*, void);
     DECL_LINK_TYPED(ModifyHdl, Edit&, void);
 
 public:
     SwRenameXNamedDlg( vcl::Window* pParent,
-                    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
-                    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess );
+                    css::uno::Reference< css::container::XNamed > & xNamed,
+                    css::uno::Reference< css::container::XNameAccess > & xNameAccess );
     virtual ~SwRenameXNamedDlg();
     virtual void dispose() override;
 
@@ -57,8 +57,8 @@ public:
     }
 
     void SetAlternativeAccess(
-            ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond,
-            ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird )
+            css::uno::Reference< css::container::XNameAccess > & xSecond,
+            css::uno::Reference< css::container::XNameAccess > & xThird )
     {
         xSecondAccess = xSecond;
         xThirdAccess = xThird;
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index 0a81436deeef..50847c0889ba 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -51,8 +51,8 @@ namespace com{namespace sun{namespace star{
 
 struct SwIndexSections_Impl
 {
-    com::sun::star::uno::Reference< com::sun::star::text::XTextSection >    xContainerSection;
-    com::sun::star::uno::Reference< com::sun::star::text::XDocumentIndex >    xDocumentIndex;
+    css::uno::Reference< css::text::XTextSection >    xContainerSection;
+    css::uno::Reference< css::text::XDocumentIndex >    xDocumentIndex;
 };
 
 class SwOneExampleFrame;
diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx
index 41ab57482e67..86bc063acd57 100644
--- a/sw/source/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/uibase/inc/swuiidxmrk.hxx
@@ -96,7 +96,7 @@ class SwIndexMarkPane
     bool            bPhoneticED2_ChangedByUser;
     LanguageType    nLangForPhoneticReading; //Language of current text used for phonetic reading proposal
     bool            bIsPhoneticReadingEnabled; //this value states whether phonetic reading is enabled in principle dependent of global cjk settings and language of current entry
-    com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedIndexEntrySupplier >
+    css::uno::Reference< css::i18n::XExtendedIndexEntrySupplier >
                     xExtendedIndexEntrySupplier;
 
     SwTOXMgr*       pTOXMgr;
@@ -206,7 +206,7 @@ class SwAuthorMarkPane
 
     OUString        m_sCreatedEntry[AUTH_FIELD_END];
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >    xBibAccess;
+    css::uno::Reference< css::container::XNameAccess >    xBibAccess;
 
     DECL_LINK_TYPED(InsertHdl, Button*, void);
     DECL_LINK_TYPED(CloseHdl, Button*, void);
diff --git a/sw/source/uibase/inc/tablemgr.hxx b/sw/source/uibase/inc/tablemgr.hxx
index bfb09c38d7b6..796b5c0dce5b 100644
--- a/sw/source/uibase/inc/tablemgr.hxx
+++ b/sw/source/uibase/inc/tablemgr.hxx
@@ -68,8 +68,8 @@ public:
     void UpdateChart();
 
     /// @return the XModel of the newly inserted chart if successful
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
-        InsertChart( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > &rxDataProvider, bool bFillWithData, const OUString &rCellRange, SwFlyFrameFormat** ppFlyFrameFormat = 0 );
+    css::uno::Reference< css::frame::XModel >
+        InsertChart( css::uno::Reference< css::chart2::data::XDataProvider > &rxDataProvider, bool bFillWithData, const OUString &rCellRange, SwFlyFrameFormat** ppFlyFrameFormat = 0 );
 };
 
 inline SwTableFUNC::SwTableFUNC(SwFrameFormat &rFormat) :
diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx
index 3b23ac631bf1..1e573e915344 100644
--- a/sw/source/uibase/inc/uiitems.hxx
+++ b/sw/source/uibase/inc/uiitems.hxx
@@ -47,8 +47,8 @@ public:
                                     OUString &rText,
                                     const IntlWrapper*    pIntl = 0 ) const override;
 
-    virtual bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
-    virtual bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+    virtual bool             QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+    virtual bool             PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     SwPageFootnoteInfo& GetPageFootnoteInfo()             { return aFootnoteInfo; }
     const SwPageFootnoteInfo& GetPageFootnoteInfo() const { return aFootnoteInfo; }
@@ -80,8 +80,8 @@ public:
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const override;
     virtual bool            operator==( const SfxPoolItem& ) const override;
 
-    virtual bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
-    virtual bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+    virtual bool             QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+    virtual bool             PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     const SwNumRule* GetNumRule() const         { return pRule; }
           SwNumRule* GetNumRule()               { return pRule; }
diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx
index 94c1401a44e2..b95cb12f6d80 100644
--- a/sw/source/uibase/inc/uivwimp.hxx
+++ b/sw/source/uibase/inc/uivwimp.hxx
@@ -46,7 +46,7 @@ namespace com{ namespace sun{ namespace star {
 }}}
 
 class SwScannerEventListener : public ::cppu::WeakImplHelper<
-    ::com::sun::star::lang::XEventListener >
+    css::lang::XEventListener >
 {
     SwView* pView;
 
@@ -57,24 +57,24 @@ public:
 
     // XEventListener
     virtual void SAL_CALL disposing(
-                    const ::com::sun::star::lang::EventObject& rEventObject ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+                    const css::lang::EventObject& rEventObject ) throw(css::uno::RuntimeException, std::exception) override;
 
     void ViewDestroyed() { pView = 0; }
 };
 
 // Clipboard EventListener
 class SwClipboardChangeListener : public ::cppu::WeakImplHelper<
-    ::com::sun::star::datatransfer::clipboard::XClipboardListener >
+    css::datatransfer::clipboard::XClipboardListener >
 {
     SwView* pView;
 
     // XEventListener
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObject )
-        throw ( com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObject )
+        throw ( css::uno::RuntimeException, std::exception ) override;
 
     // XClipboardListener
-    virtual void SAL_CALL changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& rEventObject )
-        throw (com::sun::star::uno::RuntimeException,
+    virtual void SAL_CALL changedContents( const css::datatransfer::clipboard::ClipboardEvent& rEventObject )
+        throw (css::uno::RuntimeException,
                std::exception) override;
 
 public:
@@ -90,11 +90,11 @@ class SwMailMergeConfigItem;
 
 class SwView_Impl
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >  xScanEvtLstnr;
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >  xClipEvtLstnr;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >   xDisProvInterceptor;
-    ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier >              mxXTextView;       // UNO object
-    com::sun::star::uno::WeakReference< com::sun::star::lang::XUnoTunnel > xTransferable;
+    css::uno::Reference< css::lang::XEventListener >  xScanEvtLstnr;
+    css::uno::Reference< css::lang::XEventListener >  xClipEvtLstnr;
+    css::uno::Reference< css::frame::XDispatchProviderInterceptor >   xDisProvInterceptor;
+    css::uno::Reference< css::view::XSelectionSupplier >              mxXTextView;       // UNO object
+    css::uno::WeakReference< css::lang::XUnoTunnel > xTransferable;
 
     // temporary document for printing text of selection / multi selection
     // in PDF export.
@@ -125,7 +125,7 @@ public:
 
     void                            SetShellMode(ShellModes eSet);
 
-    ::com::sun::star::view::XSelectionSupplier* GetUNOObject();
+    css::view::XSelectionSupplier* GetUNOObject();
     SwXTextView*                    GetUNOObject_Impl();
     void                            Invalidate();
 
diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx
index acaa4033b36a..b8c57ad10c9a 100644
--- a/sw/source/uibase/inc/unoatxt.hxx
+++ b/sw/source/uibase/inc/unoatxt.hxx
@@ -45,14 +45,14 @@ class SwXBodyText;
 typedef tools::SvRef<SwDocShell> SwDocShellRef;
 #endif
 
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
+css::uno::Reference< css::uno::XInterface >
     SAL_CALL SwXAutoTextContainer_createInstance(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ) throw ( ::com::sun::star::uno::Exception );
+        const css::uno::Reference< css::lang::XMultiServiceFactory > & ) throw ( css::uno::Exception );
 
 class SwXAutoTextContainer : public cppu::WeakImplHelper
 <
-    ::com::sun::star::text::XAutoTextContainer2,
-    ::com::sun::star::lang::XServiceInfo
+    css::text::XAutoTextContainer2,
+    css::lang::XServiceInfo
 >
 {
     SwGlossaries *pGlossaries;
@@ -64,37 +64,37 @@ public:
     SwXAutoTextContainer();
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
 
     //XNameAccess
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name)  throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getByName(const OUString& Name)  throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override;
 
     //XElementAccess
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
 
     //XAutoTextContainer
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextGroup >  SAL_CALL insertNewByName(const OUString& aGroupName) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeByName(const OUString& aGroupName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::text::XAutoTextGroup >  SAL_CALL insertNewByName(const OUString& aGroupName) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL removeByName(const OUString& aGroupName) throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
 
 };
 
 class SwXAutoTextGroup : public cppu::WeakImplHelper
 <
-    ::com::sun::star::text::XAutoTextGroup,
-    ::com::sun::star::beans::XPropertySet,
-    ::com::sun::star::lang::XServiceInfo,
-    ::com::sun::star::container::XIndexAccess,
-    ::com::sun::star::container::XNamed,
-    ::com::sun::star::lang::XUnoTunnel
+    css::text::XAutoTextGroup,
+    css::beans::XPropertySet,
+    css::lang::XServiceInfo,
+    css::container::XIndexAccess,
+    css::container::XNamed,
+    css::lang::XUnoTunnel
 >
 {
     const SfxItemPropertySet* pPropSet;
@@ -108,47 +108,47 @@ protected:
 public:
         SwXAutoTextGroup(const OUString& rName, SwGlossaries* pGloss);
 
-    static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
+    static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
 
     //XAutoTextGroup
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTitles() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry >  SAL_CALL insertNewByName(const OUString& aName, const OUString& aTitle, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeByName(const OUString& aEntryName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getTitles() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::io::IOException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::text::XAutoTextEntry >  SAL_CALL insertNewByName(const OUString& aName, const OUString& aTitle, const css::uno::Reference< css::text::XTextRange > & xTextRange) throw( css::container::ElementExistException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL removeByName(const OUString& aEntryName) throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception ) override;
 
     //XNamed
-    virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getName() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setName(const OUString& Name_) throw( css::uno::RuntimeException, std::exception ) override;
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
 
     //XNameAccess
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name)  throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getByName(const OUString& Name)  throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override;
 
     //XElementAccess
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
 
     //XPropertySet
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
     void    Invalidate();
 };
@@ -157,11 +157,11 @@ class SwXAutoTextEntry
         :public SfxListener
         ,public cppu::WeakImplHelper
         <
-            ::com::sun::star::text::XAutoTextEntry,
-            ::com::sun::star::lang::XServiceInfo,
-            ::com::sun::star::lang::XUnoTunnel,
-            ::com::sun::star::text::XText,
-            ::com::sun::star::document::XEventsSupplier
+            css::text::XAutoTextEntry,
+            css::lang::XServiceInfo,
+            css::lang::XUnoTunnel,
+            css::text::XText,
+            css::document::XEventsSupplier
         >
 {
     SwGlossaries*   pGlossaries;
@@ -169,7 +169,7 @@ class SwXAutoTextEntry
     OUString        sEntryName;
     SwDocShellRef   xDocSh;
     SwXBodyText*    pBodyText;
-    com::sun::star::uno::Reference < com::sun::star::lang::XServiceInfo> xBodyText;
+    css::uno::Reference < css::lang::XServiceInfo> xBodyText;
 
     void EnsureBodyText ()
     {
@@ -201,36 +201,36 @@ protected:
 public:
     SwXAutoTextEntry(SwGlossaries* , const OUString& rGroupName, const OUString& rEntryName);
 
-    static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
+    static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
 
     //XText
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor >  SAL_CALL createTextCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor >  SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL insertString(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL insertControlCharacter(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL insertTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursor() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL insertString(const css::uno::Reference< css::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL insertControlCharacter(const css::uno::Reference< css::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL insertTextContent(const css::uno::Reference< css::text::XTextRange > & xRange, const css::uno::Reference< css::text::XTextContent > & xContent, sal_Bool bAbsorb) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL removeTextContent(const css::uno::Reference< css::text::XTextContent > & xContent) throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
 
     //XTextRange
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >  SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL  getStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL   getEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL  getString() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL  setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::text::XText >  SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL  getStart() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL   getEnd() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL  getString() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL  setString(const OUString& aString) throw( css::uno::RuntimeException, std::exception ) override;
 
     //XAutoTextEntry
-    virtual void    SAL_CALL applyTo(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange)throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void    SAL_CALL applyTo(const css::uno::Reference< css::text::XTextRange > & xRange)throw( css::uno::RuntimeException, std::exception ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
 
     // XEventsSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents(  ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents(  ) throw( css::uno::RuntimeException, std::exception ) override;
 
     void    Invalidate() {pGlossaries = 0;}
     const SwGlossaries* GetGlossaries() { return pGlossaries; }
@@ -254,7 +254,7 @@ public:
     virtual ~SwAutoTextEventDescriptor();
 
     virtual OUString SAL_CALL getImplementationName()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        throw( css::uno::RuntimeException, std::exception ) override;
 
 protected:
 
@@ -262,18 +262,18 @@ protected:
         const sal_uInt16 nEvent,        /// item ID of event
         const SvxMacro& rMacro)     /// event (will be copied)
             throw(
-                ::com::sun::star::lang::IllegalArgumentException,
-                ::com::sun::star::container::NoSuchElementException,
-                ::com::sun::star::lang::WrappedTargetException,
-                ::com::sun::star::uno::RuntimeException) override;
+                css::lang::IllegalArgumentException,
+                css::container::NoSuchElementException,
+                css::lang::WrappedTargetException,
+                css::uno::RuntimeException) override;
 
     virtual void getByName(
         SvxMacro& rMacro,           /// macro to be filled
         const sal_uInt16 nEvent )       /// item ID of event
             throw(
-                ::com::sun::star::container::NoSuchElementException,
-                ::com::sun::star::lang::WrappedTargetException,
-                ::com::sun::star::uno::RuntimeException) override;
+                css::container::NoSuchElementException,
+                css::lang::WrappedTargetException,
+                css::uno::RuntimeException) override;
 };
 
 #endif
diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx
index 51088a65c8c5..2889116c0200 100644
--- a/sw/source/uibase/inc/unodispatch.hxx
+++ b/sw/source/uibase/inc/unodispatch.hxx
@@ -33,9 +33,9 @@ class SwView;
 
 class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper
 <
-    ::com::sun::star::frame::XDispatchProviderInterceptor,
-    ::com::sun::star::lang::XEventListener,
-    ::com::sun::star::lang::XUnoTunnel
+    css::frame::XDispatchProviderInterceptor,
+    css::lang::XEventListener,
+    css::lang::XUnoTunnel
 >
 {
     class DispatchMutexLock_Impl
@@ -52,13 +52,13 @@ class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper
 //    ::osl::Mutex                     m_aMutex;#102295# solar mutex has to be used currently
 
     // the component which's dispatches we're intercepting
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception>   m_xIntercepted;
+    css::uno::Reference< css::frame::XDispatchProviderInterception>   m_xIntercepted;
 
     // chaining
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider>           m_xSlaveDispatcher;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider>           m_xMasterDispatcher;
+    css::uno::Reference< css::frame::XDispatchProvider>           m_xSlaveDispatcher;
+    css::uno::Reference< css::frame::XDispatchProvider>           m_xMasterDispatcher;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch>                   m_xDispatch;
+    css::uno::Reference< css::frame::XDispatch>                   m_xDispatch;
 
     SwView* m_pView;
 
@@ -67,21 +67,21 @@ public:
     virtual ~SwXDispatchProviderInterceptor();
 
     //XDispatchProvider
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw(css::uno::RuntimeException, std::exception) override;
 
     //XDispatchProviderInterceptor
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewDispatchProvider ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSupplier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSlaveDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewDispatchProvider ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setMasterDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewSupplier ) throw(css::uno::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;
 
     //XUnoTunnel
-    static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
 
     // view destroyed
     void    Invalidate();
@@ -89,14 +89,14 @@ public:
 
 struct StatusStruct_Impl
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener> xListener;
-    ::com::sun::star::util::URL                                                 aURL;
+    css::uno::Reference< css::frame::XStatusListener> xListener;
+    css::util::URL                                                 aURL;
 };
 typedef std::list< StatusStruct_Impl > StatusListenerList;
 class SwXDispatch : public cppu::WeakImplHelper
 <
-    ::com::sun::star::frame::XDispatch,
-    ::com::sun::star::view::XSelectionChangeListener
+    css::frame::XDispatch,
+    css::view::XSelectionChangeListener
 >
 {
     SwView*             m_pView;
@@ -107,17 +107,17 @@ public:
     SwXDispatch(SwView& rView);
     virtual ~SwXDispatch();
 
-    virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs )
-        throw (::com::sun::star::uno::RuntimeException,
+    virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs )
+        throw (css::uno::RuntimeException,
                std::exception) override;
-    virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) override;
 
     //XSelectionChangeListener
-    virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) throw(css::uno::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;
 
     static const sal_Char* GetDBChangeURL();
 };
diff --git a/sw/source/uibase/inc/unomailmerge.hxx b/sw/source/uibase/inc/unomailmerge.hxx
index 6aa7e6786330..59bceace1160 100644
--- a/sw/source/uibase/inc/unomailmerge.hxx
+++ b/sw/source/uibase/inc/unomailmerge.hxx
@@ -65,12 +65,12 @@ class MailMergeExecuteFinalizer;
 class SwXMailMerge :
     public cppu::WeakImplHelper
     <
-        com::sun::star::task::XJob,
-        com::sun::star::util::XCancellable,
-        com::sun::star::beans::XPropertySet,
-        com::sun::star::text::XMailMergeBroadcaster,
-        com::sun::star::lang::XComponent,
-        com::sun::star::lang::XServiceInfo
+        css::task::XJob,
+        css::util::XCancellable,
+        css::beans::XPropertySet,
+        css::text::XMailMergeBroadcaster,
+        css::lang::XComponent,
+        css::lang::XServiceInfo
     >
 {
     friend class MailMergeExecuteFinalizer;
@@ -86,10 +86,10 @@ class SwXMailMerge :
     OUString        m_aTmpFileName;
 
     // properties of mail merge service
-    com::sun::star::uno::Sequence< com::sun::star::uno::Any >           m_aSelection;
-    com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet >  m_xResultSet;
-    com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > m_xConnection;
-    com::sun::star::uno::Reference< com::sun::star::frame::XModel >     m_xModel;
+    css::uno::Sequence< css::uno::Any >           m_aSelection;
+    css::uno::Reference< css::sdbc::XResultSet >  m_xResultSet;
+    css::uno::Reference< css::sdbc::XConnection > m_xConnection;
+    css::uno::Reference< css::frame::XModel >     m_xModel;
     OUString   m_aDataSourceName;
     OUString   m_aDataCommand;
     OUString   m_aFilter;
@@ -109,22 +109,22 @@ class SwXMailMerge :
     OUString                                         m_sMailBody;
     OUString                                         m_sAttachmentName;
     OUString                                         m_sAttachmentFilter;
-    com::sun::star::uno::Sequence< OUString >        m_aCopiesTo;
-    com::sun::star::uno::Sequence< OUString >        m_aBlindCopiesTo;
-    bool                                                m_bSendAsHTML;
-    bool                                                m_bSendAsAttachment;
+    css::uno::Sequence< OUString >                   m_aCopiesTo;
+    css::uno::Sequence< OUString >                   m_aBlindCopiesTo;
+    bool                                             m_bSendAsHTML;
+    bool                                             m_bSendAsAttachment;
 
-    com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aPrintSettings;
+    css::uno::Sequence< css::beans::PropertyValue >  m_aPrintSettings;
 
-    bool                                                m_bSaveAsSingleFile;
+    bool                                             m_bSaveAsSingleFile;
     OUString                                         m_sSaveFilter;
     OUString                                         m_sSaveFilterOptions;
-    com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aSaveFilterData;
+    css::uno::Sequence< css::beans::PropertyValue >  m_aSaveFilterData;
 
     bool        m_bDisposing;
     SwDBManager     *m_pMgr;
 
-    void    launchEvent( const com::sun::star::beans::PropertyChangeEvent &rEvt ) const;
+    void    launchEvent( const css::beans::PropertyChangeEvent &rEvt ) const;
 
     SwXMailMerge( const SwXMailMerge & ) = delete;
     SwXMailMerge & operator = ( const SwXMailMerge & ) = delete;
@@ -133,40 +133,40 @@ protected:
 public:
     SwXMailMerge();
 
-    void LaunchMailMergeEvent( const com::sun::star::text::MailMergeEvent &rData ) const;
+    void LaunchMailMergeEvent( const css::text::MailMergeEvent &rData ) const;
 
     // XJob
-    virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::uno::Exception,
-               ::com::sun::star::uno::RuntimeException,
+    virtual css::uno::Any SAL_CALL execute( const css::uno::Sequence< css::beans::NamedValue >& Arguments )
+        throw (css::lang::IllegalArgumentException,
+               css::uno::Exception,
+               css::uno::RuntimeException,
                std::exception) override;
 
     // XCancellable
-    virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL cancel() throw (css::uno::RuntimeException, std::exception) override;
 
     // XPropertySet
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
     // XMailMergeBroadcaster
-    virtual void SAL_CALL addMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addMailMergeEventListener( const css::uno::Reference< css::text::XMailMergeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeMailMergeEventListener( const css::uno::Reference< css::text::XMailMergeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
 };
 
 #endif
diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx
index 70877da36abb..630f40c463b9 100644
--- a/sw/source/uibase/inc/unomod.hxx
+++ b/sw/source/uibase/inc/unomod.hxx
@@ -34,18 +34,18 @@ class SwViewOption;
 class SwPrintData;
 class SwDoc;
 
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL SwXModule_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & );
+css::uno::Reference< css::uno::XInterface >  SAL_CALL SwXModule_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & );
 
 class SwXModule : public cppu::WeakImplHelper
 <
-    ::com::sun::star::view::XViewSettingsSupplier,
-    ::com::sun::star::view::XPrintSettingsSupplier,
-    ::com::sun::star::lang::XServiceInfo
+    css::view::XViewSettingsSupplier,
+    css::view::XPrintSettingsSupplier,
+    css::lang::XServiceInfo
 >
 {
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >     mxViewSettings;
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >     mxPrintSettings;
+    css::uno::Reference< css::beans::XPropertySet >     mxViewSettings;
+    css::uno::Reference< css::beans::XPropertySet >     mxPrintSettings;
 
 protected:
     virtual ~SwXModule();
@@ -53,20 +53,20 @@ public:
     SwXModule();
 
     //XViewSettings
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  SAL_CALL getViewSettings()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::beans::XPropertySet >  SAL_CALL getViewSettings()
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     //XPrintSettings
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  SAL_CALL getPrintSettings()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::beans::XPropertySet >  SAL_CALL getPrintSettings()
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     //XServiceInfo
     virtual OUString SAL_CALL getImplementationName()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        throw( css::uno::RuntimeException, std::exception ) override;
     virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+        throw( css::uno::RuntimeException, std::exception ) override;
 };
 
 enum SwXPrintSettingsType
@@ -90,8 +90,8 @@ protected:
                css::lang::IllegalArgumentException,
                css::lang::WrappedTargetException,
                css::uno::RuntimeException) override;
-    virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue )
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override;
+    virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue )
+        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
     virtual void _postSetValues ()
         throw (css::beans::UnknownPropertyException,
                css::beans::PropertyVetoException,
@@ -106,10 +106,10 @@ protected:
                css::lang::WrappedTargetException,
                css::uno::RuntimeException) override;
 
-    virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue )
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) override;
+    virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue )
+        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException ) override;
     virtual void _postGetValues ()
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override;
+        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
 
     virtual ~SwXPrintSettings()
         throw();
@@ -118,11 +118,11 @@ public:
 
     //XServiceInfo
     virtual OUString SAL_CALL getImplementationName()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        throw( css::uno::RuntimeException, std::exception ) override;
     virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+        throw( css::uno::RuntimeException, std::exception ) override;
 };
 
 class SwXViewSettings : public comphelper::ChainableHelperNoState
@@ -146,7 +146,7 @@ protected:
                css::lang::IllegalArgumentException,
                css::lang::WrappedTargetException,
                css::uno::RuntimeException) override;
-    virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue )
+    virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue )
         throw (css::beans::UnknownPropertyException,
                css::beans::PropertyVetoException,
                css::lang::IllegalArgumentException,
@@ -166,12 +166,12 @@ protected:
                css::lang::IllegalArgumentException,
                css::lang::WrappedTargetException,
                css::uno::RuntimeException) override;
-    virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue )
+    virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue )
         throw (css::beans::UnknownPropertyException,
                css::lang::WrappedTargetException,
                css::uno::RuntimeException) override;
     virtual void _postGetValues ()
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override;
+        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
 
     virtual ~SwXViewSettings()
         throw();
@@ -179,9 +179,9 @@ public:
     SwXViewSettings(bool bWeb, SwView*  pView);
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
 
     bool    IsValid() const {return bObjectValid;}
     void    Invalidate() {bObjectValid = false;}
diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx
index fbb9fabf9f05..5e37a4ce2f96 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.hxx
@@ -68,10 +68,10 @@ class SwView;
 
 class SW_DLLPUBLIC SwOneExampleFrame
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >         _xControl;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >         _xModel;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >    _xController;
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor >     _xCursor;
+    css::uno::Reference< css::awt::XControl >         _xControl;
+    css::uno::Reference< css::frame::XModel >         _xModel;
+    css::uno::Reference< css::frame::XController >    _xController;
+    css::uno::Reference< css::text::XTextCursor >     _xCursor;
 
     VclPtr<SwFrmCtrlWindow> aTopWindow;
     Idle            aLoadedIdle;
@@ -102,9 +102,9 @@ public:
                     const OUString* pURL = 0);
     ~SwOneExampleFrame();
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > &       GetModel()      {return _xModel;}
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > &  GetController() {return _xController;}
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > &   GetTextCursor() {return _xCursor;}
+    css::uno::Reference< css::frame::XModel > &       GetModel()      {return _xModel;}
+    css::uno::Reference< css::frame::XController > &  GetController() {return _xController;}
+    css::uno::Reference< css::text::XTextCursor > &   GetTextCursor() {return _xCursor;}
 
     void ClearDocument( bool bStartTimer = false );
 
diff --git a/sw/source/uibase/inc/unotxvw.hxx b/sw/source/uibase/inc/unotxvw.hxx
index dfa6721a7796..e6d9b4b51e04 100644
--- a/sw/source/uibase/inc/unotxvw.hxx
+++ b/sw/source/uibase/inc/unotxvw.hxx
@@ -48,14 +48,14 @@ class SdrObject;
 class SwView;
 
 class SwXTextView :
-    public ::com::sun::star::view::XSelectionSupplier,
-    public ::com::sun::star::lang::XServiceInfo,
-    public ::com::sun::star::view::XFormLayerAccess,
-    public ::com::sun::star::text::XTextViewCursorSupplier,
-    public ::com::sun::star::text::XRubySelection,
-    public ::com::sun::star::view::XViewSettingsSupplier,
-    public ::com::sun::star::beans::XPropertySet,
-    public ::com::sun::star::datatransfer::XTransferableSupplier,
+    public css::view::XSelectionSupplier,
+    public css::lang::XServiceInfo,
+    public css::view::XFormLayerAccess,
+    public css::text::XTextViewCursorSupplier,
+    public css::text::XRubySelection,
+    public css::view::XViewSettingsSupplier,
+    public css::beans::XPropertySet,
+    public css::datatransfer::XTransferableSupplier,
     public SfxBaseController
 {
     ::cppu::OInterfaceContainerHelper m_SelChangedListeners;
@@ -64,88 +64,88 @@ class SwXTextView :
     const SfxItemPropertySet*   m_pPropSet;   // property map for SwXTextView properties
                                         // (not related to mxViewSettings!)
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >     mxViewSettings;
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor >   mxTextViewCursor;
+    css::uno::Reference< css::beans::XPropertySet >     mxViewSettings;
+    css::uno::Reference< css::text::XTextViewCursor >   mxTextViewCursor;
 
     SdrObject* GetControl(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & Model,
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& xToFill  );
+        const css::uno::Reference< css::awt::XControlModel > & Model,
+        css::uno::Reference< css::awt::XControl >& xToFill  );
 
 protected:
     virtual ~SwXTextView();
 public:
     SwXTextView(SwView* pSwView);
 
-    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;
 
     //XSelectionSupplier
-    virtual ::com::sun::star::uno::Any SAL_CALL getSelection()
-        throw (::com::sun::star::uno::RuntimeException,
+    virtual css::uno::Any SAL_CALL getSelection()
+        throw (css::uno::RuntimeException,
                std::exception) override;
-    virtual sal_Bool SAL_CALL select(const ::com::sun::star::uno::Any& rInterface)
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::uno::RuntimeException,
+    virtual sal_Bool SAL_CALL select(const css::uno::Any& rInterface)
+        throw (css::lang::IllegalArgumentException,
+               css::uno::RuntimeException,
                std::exception) override;
-    virtual void SAL_CALL addSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL addSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener > & xListener) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL removeSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener > & xListener) throw( css::uno::RuntimeException, std::exception ) override;
 
     // XFormLayerAccess
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isFormDesignMode(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFormDesignMode( sal_Bool DesignMode ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::form::runtime::XFormController > SAL_CALL getFormController( const css::uno::Reference< css::form::XForm >& Form ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isFormDesignMode(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setFormDesignMode( sal_Bool DesignMode ) throw (css::uno::RuntimeException, std::exception) override;
 
     // XControlAccess
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >  SAL_CALL getControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & Model) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::awt::XControl >  SAL_CALL getControl(const css::uno::Reference< css::awt::XControlModel > & Model) throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception ) override;
 
     //XTextViewCursorSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor >  SAL_CALL getViewCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::text::XTextViewCursor >  SAL_CALL getViewCursor() throw( css::uno::RuntimeException, std::exception ) override;
 
     //XViewSettings
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  SAL_CALL getViewSettings() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::beans::XPropertySet >  SAL_CALL getViewSettings() throw( css::uno::RuntimeException, std::exception ) override;
 
     //XRubySelection
-    virtual ::com::sun::star::uno::Sequence<
-            ::com::sun::star::uno::Sequence<
-            ::com::sun::star::beans::PropertyValue > > SAL_CALL getRubyList( sal_Bool bAutomatic )
-                throw (::com::sun::star::uno::RuntimeException,
+    virtual css::uno::Sequence<
+            css::uno::Sequence<
+            css::beans::PropertyValue > > SAL_CALL getRubyList( sal_Bool bAutomatic )
+                throw (css::uno::RuntimeException,
                        std::exception) override;
 
     virtual void SAL_CALL setRubyList(
-        const ::com::sun::star::uno::Sequence<
-        ::com::sun::star::uno::Sequence<
-        ::com::sun::star::beans::PropertyValue > >& RubyList, sal_Bool bAutomatic )
-            throw (::com::sun::star::uno::RuntimeException,
+        const css::uno::Sequence<
+        css::uno::Sequence<
+        css::beans::PropertyValue > >& RubyList, sal_Bool bAutomatic )
+            throw (css::uno::RuntimeException,
                    std::exception) override;
 
     //XPropertySet
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
+        throw (css::beans::UnknownPropertyException,
+               css::lang::WrappedTargetException,
+               css::uno::RuntimeException,
+               std::exception) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
 
     //XTransferableSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getTransferable(  )
-        throw (::com::sun::star::uno::RuntimeException,
+    virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getTransferable(  )
+        throw (css::uno::RuntimeException,
                std::exception) override;
-    virtual void SAL_CALL insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertTransferable( const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) throw (css::datatransfer::UnsupportedFlavorException, css::uno::RuntimeException, std::exception) override;
 
     void                    NotifySelChanged();
     void                    NotifyDBChanged();
@@ -158,14 +158,14 @@ public:
 };
 
 typedef cppu::WeakImplHelper<
-                            ::com::sun::star::text::XTextViewCursor,
-                            ::com::sun::star::lang::XServiceInfo,
-                            ::com::sun::star::text::XPageCursor,
-                            ::com::sun::star::view::XScreenCursor,
-                            ::com::sun::star::view::XViewCursor,
-                            ::com::sun::star::view::XLineCursor,
-                            ::com::sun::star::beans::XPropertySet,
-                            ::com::sun::star::beans::XPropertyState
+                            css::text::XTextViewCursor,
+                            css::lang::XServiceInfo,
+                            css::text::XPageCursor,
+                            css::view::XScreenCursor,
+                            css::view::XViewCursor,
+                            css::view::XLineCursor,
+                            css::beans::XPropertySet,
+                            css::beans::XPropertyState
                             > SwXTextViewCursor_Base;
 
 class SwXTextViewCursor : public SwXTextViewCursor_Base,
@@ -183,146 +183,146 @@ public:
     DECLARE_XINTERFACE()
 
     //XTextViewCursor
-    virtual sal_Bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setVisible(sal_Bool bVisible) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isVisible() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setVisible(sal_Bool bVisible) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Point SAL_CALL getPosition() throw( css::uno::RuntimeException, std::exception ) override;
 
     //XTextCursor - neu
     virtual void SAL_CALL collapseToStart()
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
     virtual void SAL_CALL collapseToEnd()
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
     virtual sal_Bool SAL_CALL isCollapsed()
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
     virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand )
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
     virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand )
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
     virtual void SAL_CALL gotoStart( sal_Bool bExpand )
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
     virtual void SAL_CALL gotoEnd( sal_Bool bExpand )
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
-    virtual void SAL_CALL gotoRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Bool bExpand )
-        throw (::com::sun::star::uno::RuntimeException,
+    virtual void SAL_CALL gotoRange( const css::uno::Reference< css::text::XTextRange >& xRange, sal_Bool bExpand )
+        throw (css::uno::RuntimeException,
                std::exception) override;
 
     //XPageCursor
     virtual sal_Bool SAL_CALL jumpToFirstPage()
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
     virtual sal_Bool SAL_CALL jumpToLastPage()
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
-    virtual sal_Bool SAL_CALL jumpToPage(sal_Int16 nPage) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL jumpToNextPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL jumpToPreviousPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL jumpToEndOfPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL jumpToStartOfPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL jumpToPage(sal_Int16 nPage) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL jumpToNextPage() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL jumpToPreviousPage() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL jumpToEndOfPage() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL jumpToStartOfPage() throw( css::uno::RuntimeException, std::exception ) override;
     virtual sal_Int16 SAL_CALL getPage()
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
 
     //XTextRange
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >  SAL_CALL getText()
-        throw (::com::sun::star::uno::RuntimeException,
+    virtual css::uno::Reference< css::text::XText >  SAL_CALL getText()
+        throw (css::uno::RuntimeException,
                std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL  getStart()
-        throw (::com::sun::star::uno::RuntimeException,
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL  getStart()
+        throw (css::uno::RuntimeException,
                std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL   getEnd()
-        throw (::com::sun::star::uno::RuntimeException,
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL   getEnd()
+        throw (css::uno::RuntimeException,
                std::exception) override;
     virtual OUString SAL_CALL  getString()
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
     virtual void SAL_CALL  setString(const OUString& aString)
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
 
     //XScreenCursor
     virtual sal_Bool SAL_CALL screenDown()
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
     virtual sal_Bool SAL_CALL screenUp()
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
 
     //XViewCursor
     virtual sal_Bool SAL_CALL goDown(sal_Int16 nCount, sal_Bool bExpand)
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
     virtual sal_Bool SAL_CALL goUp(sal_Int16 nCount, sal_Bool bExpand)
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
 
     //XLineCursor
     virtual sal_Bool SAL_CALL isAtStartOfLine()
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
     virtual sal_Bool SAL_CALL isAtEndOfLine()
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
     virtual void SAL_CALL gotoEndOfLine(sal_Bool bExpand)
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
     virtual void SAL_CALL gotoStartOfLine(sal_Bool bExpand)
-        throw (::com::sun::star::uno::RuntimeException,
+        throw (css::uno::RuntimeException,
                std::exception) override;
 
     //XPropertySet
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::beans::PropertyVetoException,
-               ::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException,
-               std::exception) override;
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue )
+        throw (css::beans::UnknownPropertyException,
+               css::beans::PropertyVetoException,
+               css::lang::IllegalArgumentException,
+               css::lang::WrappedTargetException,
+               css::uno::RuntimeException,
+               std::exception) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
+        throw (css::beans::UnknownPropertyException,
+               css::lang::WrappedTargetException,
+               css::uno::RuntimeException,
+               std::exception) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
     //XPropertyState
-    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName )
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::uno::RuntimeException,
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName )
+        throw (css::beans::UnknownPropertyException,
+               css::uno::RuntimeException,
                std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName )
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::uno::RuntimeException,
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName )
+        throw (css::beans::UnknownPropertyException,
+               css::uno::RuntimeException,
                std::exception) override;
     virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName )
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::uno::RuntimeException,
+        throw (css::beans::UnknownPropertyException,
+               css::uno::RuntimeException,
                std::exception) override;
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName )
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException,
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName )
+        throw (css::beans::UnknownPropertyException,
+               css::lang::WrappedTargetException,
+               css::uno::RuntimeException,
                std::exception) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
 
-    static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
+    static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
 
     void    Invalidate(){m_pView = 0;}
 
diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx
index 865aadf7daec..299dbb0777f9 100644
--- a/sw/source/uibase/inc/usrpref.hxx
+++ b/sw/source/uibase/inc/usrpref.hxx
@@ -32,7 +32,7 @@ private:
     SwMasterUsrPref&        rParent;
     bool                    bWeb;
 
-    com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+    css::uno::Sequence<OUString> GetPropertyNames();
 
     virtual void    ImplCommit() override;
 
@@ -41,7 +41,7 @@ public:
     virtual ~SwContentViewConfig();
 
     // utl::ConfigItem
-    virtual void    Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) override;
+    virtual void    Notify( const css::uno::Sequence< OUString > &rPropertyNames ) override;
 
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
@@ -53,7 +53,7 @@ private:
     SwMasterUsrPref&    rParent;
     bool                bWeb;
 
-    com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+    css::uno::Sequence<OUString> GetPropertyNames();
 
     virtual void        ImplCommit() override;
 
@@ -61,7 +61,7 @@ public:
     SwLayoutViewConfig(bool bWeb, SwMasterUsrPref& rParent);
     virtual ~SwLayoutViewConfig();
 
-    virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
 };
@@ -71,7 +71,7 @@ class SwGridConfig : public utl::ConfigItem
 private:
     SwMasterUsrPref&    rParent;
 
-    static com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+    static css::uno::Sequence<OUString> GetPropertyNames();
 
     virtual void ImplCommit() override;
 
@@ -79,7 +79,7 @@ public:
     SwGridConfig(bool bWeb, SwMasterUsrPref& rParent);
     virtual ~SwGridConfig();
 
-    virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
 };
@@ -89,7 +89,7 @@ class SwCursorConfig : public utl::ConfigItem
 private:
     SwMasterUsrPref&    rParent;
 
-    static com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+    static css::uno::Sequence<OUString> GetPropertyNames();
 
     virtual void ImplCommit() override;
 
@@ -97,7 +97,7 @@ public:
     SwCursorConfig(SwMasterUsrPref& rParent);
     virtual ~SwCursorConfig();
 
-    virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
 };
@@ -106,7 +106,7 @@ class SwWebColorConfig : public utl::ConfigItem
 {
 private:
     SwMasterUsrPref&        rParent;
-    com::sun::star::uno::Sequence<OUString> aPropNames;
+    css::uno::Sequence<OUString> aPropNames;
 
     virtual void ImplCommit() override;
 
@@ -114,7 +114,7 @@ public:
     SwWebColorConfig(SwMasterUsrPref& rParent);
     virtual ~SwWebColorConfig();
 
-    virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
 };
diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx
index 9a13873c0e7d..b2e220eabf26 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -121,7 +121,7 @@ protected:
         virtual void        DataChanged( const DataChangedEvent& rDCEvt ) override;
 
 public:
-        SwScrollNaviPopup( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window *pParent );
+        SwScrollNaviPopup( sal_uInt16 nId, const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window *pParent );
         virtual ~SwScrollNaviPopup();
     virtual void dispose() override;
 
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index b640061efdc4..ef2f1c934be2 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -362,7 +362,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
     void    GetDoStrings( DoType eDoType, SfxStringListItem& rStrLstItem ) const;
 
     // search and replace
-    sal_uLong SearchPattern(const com::sun::star::util::SearchOptions& rSearchOpt,
+    sal_uLong SearchPattern(const css::util::SearchOptions& rSearchOpt,
                          bool bSearchInNotes,
                          SwDocPositions eStart, SwDocPositions eEnd,
                          FindRanges eFlags = FND_IN_BODY,
@@ -377,7 +377,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
                          bool bNoColls,
                          SwDocPositions eStart, SwDocPositions eEnd,
                          FindRanges eFlags = FND_IN_BODY,
-                         const com::sun::star::util::SearchOptions* pSearchOpt = 0,
+                         const css::util::SearchOptions* pSearchOpt = 0,
                          const SfxItemSet* pReplaceSet = 0);
 
     void AutoCorrect( SvxAutoCorrect& rACorr, sal_Unicode cChar );
diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx
index d4c2479c564b..889541a777ab 100644
--- a/sw/source/uibase/lingu/hhcwrp.cxx
+++ b/sw/source/uibase/lingu/hhcwrp.cxx
@@ -50,10 +50,10 @@
 #include <unomid.h>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::linguistic2;
-using namespace ::com::sun::star::i18n;
+using namespace css::text;
+using namespace css::uno;
+using namespace css::linguistic2;
+using namespace css::i18n;
 
 //     Description: Turn off frame/object shell if applicable
 
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index 46f0039016f2..aa95a1763234 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -165,8 +165,8 @@ void SwSpellPopup::fillLangPopupMenu(
     }
 
     //6--all languages used in current document
-    uno::Reference< com::sun::star::frame::XModel > xModel;
-    uno::Reference< com::sun::star::frame::XController > xController( pWrtSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface()->getController(), uno::UNO_QUERY );
+    uno::Reference< css::frame::XModel > xModel;
+    uno::Reference< css::frame::XController > xController( pWrtSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface()->getController(), uno::UNO_QUERY );
     if ( xController.is() )
         xModel = xController->getModel();
     uno::Reference< document::XDocumentLanguages > xDocumentLanguages( xModel, uno::UNO_QUERY );
@@ -798,10 +798,10 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
     {
         try
         {
-            uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
-                com::sun::star::system::SystemShellExecute::create( ::comphelper::getProcessComponentContext() ) );
+            uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute(
+                css::system::SystemShellExecute::create( ::comphelper::getProcessComponentContext() ) );
             xSystemShellExecute->execute( m_sExplanationLink, OUString(),
-                    com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
+                    css::system::SystemShellExecuteFlags::URIS_ONLY );
         }
         catch (const uno::Exception&)
         {
diff --git a/sw/source/uibase/misc/glosdoc.cxx b/sw/source/uibase/misc/glosdoc.cxx
index 6b147080a178..e3a485794b67 100644
--- a/sw/source/uibase/misc/glosdoc.cxx
+++ b/sw/source/uibase/misc/glosdoc.cxx
@@ -44,7 +44,7 @@
 #include <memory>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
 
 namespace
 {
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 9b8276d6bd2c..10a2e227455d 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -60,9 +60,9 @@
 #define ZOOM_ENTRIES 9
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::frame;
+using namespace css::uno;
+using namespace css::beans;
+using namespace css::frame;
 
 SFX_IMPL_TOOLBOX_CONTROL( SwTbxAutoTextCtrl, SfxVoidItem );
 SFX_IMPL_TOOLBOX_CONTROL( SwTbxFieldCtrl, SfxBoolItem );
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 5f68f0c57b73..d3ebe91d5e56 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -126,9 +126,9 @@
 #include <memory>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::i18n;
+using namespace css::uno;
+using namespace css::beans;
+using namespace css::i18n;
 
 #define SwAnnotationShell
 
@@ -1401,7 +1401,7 @@ void SwAnnotationShell::ExecTransliteration(SfxRequest &rReq)
     if (!pOLV)
         return;
 
-    using namespace ::com::sun::star::i18n;
+    using namespace css::i18n;
 
     sal_uInt32 nMode = 0;
 
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 58921faec742..3aa8c419d035 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -149,9 +149,9 @@ namespace
 }
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::lang;
+using namespace css::uno;
+using namespace css::frame;
+using namespace css::lang;
 
 SFX_IMPL_SUPERCLASS_INTERFACE(SwBaseShell, SfxShell)
 
@@ -716,7 +716,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
             sal_Int8 nGalleryItemType( pGalleryItem->GetType() );
 
             if ( (!rSh.IsSelFrmMode() || nSelType & nsSelectionType::SEL_GRF) &&
-                nGalleryItemType == com::sun::star::gallery::GalleryItemType::GRAPHIC )
+                nGalleryItemType == css::gallery::GalleryItemType::GRAPHIC )
             {
                 SwWait aWait( *rView.GetDocShell(), true );
 
@@ -731,7 +731,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                 GetView().GetEditWin().GrabFocus();
             }
             else if(!rSh.IsSelFrmMode() &&
-                nGalleryItemType == com::sun::star::gallery::GalleryItemType::MEDIA  )
+                nGalleryItemType == css::gallery::GalleryItemType::MEDIA  )
             {
                 const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, pGalleryItem->GetURL() );
                 GetView().GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SfxCallMode::SYNCHRON, &aMediaURLItem, 0L );
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index 86df26664185..21440386efdc 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -67,7 +67,7 @@
 #include "misc.hrc"
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
 
 SFX_IMPL_INTERFACE(SwDrawShell, SwDrawBaseShell)
 
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index ff2c67e550c7..98b77ecb8e55 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -77,9 +77,9 @@
 #include <memory>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::i18n;
+using namespace css::uno;
+using namespace css::beans;
+using namespace css::i18n;
 
 SFX_IMPL_INTERFACE(SwDrawTextShell, SfxShell)
 
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index 0872981aa2be..1e065af9f124 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -85,7 +85,7 @@
 
 using ::editeng::SvxBorderLine;
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
 
 // Prototypes
 static void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBorderLine);
diff --git a/sw/source/uibase/shells/grfshex.cxx b/sw/source/uibase/shells/grfshex.cxx
index 69a18da6a07b..4910b7a5f13b 100644
--- a/sw/source/uibase/shells/grfshex.cxx
+++ b/sw/source/uibase/shells/grfshex.cxx
@@ -57,8 +57,8 @@
 // <- #111827#
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::ui::dialogs;
+using namespace css::uno;
+using namespace css::ui::dialogs;
 using namespace ::sfx2;
 
 bool SwTextShell::InsertMediaDlg( SfxRequest& rReq )
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 8c65f71359fd..807db4339bbd 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -876,7 +876,7 @@ void  SwTextShell::ExecDelete(SfxRequest &rReq)
 
 void SwTextShell::ExecTransliteration( SfxRequest & rReq )
 {
-    using namespace ::com::sun::star::i18n;
+    using namespace css::i18n;
     sal_uInt32 nMode = 0;
 
     switch( rReq.GetSlot() )
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index c57ede29641b..94f95fe0bd53 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1229,7 +1229,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 if( SfxItemState::SET == aCoreSet.GetItemState( RES_CHRATR_GRABBAG, false, &pTmpItem ) )
                 {
                     SfxGrabBagItem aGrabBag(*static_cast<const SfxGrabBagItem*>(pTmpItem));
-                    std::map<OUString, com::sun::star::uno::Any>& rMap = aGrabBag.GetGrabBag();
+                    std::map<OUString, css::uno::Any>& rMap = aGrabBag.GetGrabBag();
                     auto aIterator = rMap.find("CharShadingMarker");
                     if( aIterator != rMap.end() )
                     {
@@ -1283,7 +1283,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                     if( SfxItemState::SET == aCoreSet.GetItemState( RES_CHRATR_GRABBAG, false, &pTmpItem ) )
                     {
                         SfxGrabBagItem aGrabBag(*static_cast<const SfxGrabBagItem*>(pTmpItem));
-                        std::map<OUString, com::sun::star::uno::Any>& rMap = aGrabBag.GetGrabBag();
+                        std::map<OUString, css::uno::Any>& rMap = aGrabBag.GetGrabBag();
                         auto aIterator = rMap.find("CharShadingMarker");
                         if( aIterator != rMap.end() )
                         {
diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx
index fddb21522455..19a578974e8b 100644
--- a/sw/source/uibase/shells/textsh2.cxx
+++ b/sw/source/uibase/shells/textsh2.cxx
@@ -66,14 +66,14 @@
 
 using namespace ::svx;
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::frame;
+using namespace css::uno;
+using namespace css::container;
+using namespace css::lang;
+using namespace css::sdb;
+using namespace css::sdbc;
+using namespace css::sdbcx;
+using namespace css::beans;
+using namespace css::frame;
 
 struct DBTextStruct_Impl
 {
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 069f3cf1ed72..6f4b82e18467 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -434,7 +434,7 @@ bool PageMarginControl::GetUserCustomValues()
     SvtViewOptions aWinOpt( E_WINDOW, SWPAGE_LEFT_GVALUE );
     if ( aWinOpt.Exists() )
     {
-        ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = aWinOpt.GetUserData();
+        css::uno::Sequence < css::beans::NamedValue > aSeq = aWinOpt.GetUserData();
         OUString aTmp;
         if ( aSeq.getLength())
             aSeq[0].Value >>= aTmp;
@@ -446,7 +446,7 @@ bool PageMarginControl::GetUserCustomValues()
     SvtViewOptions aWinOpt2( E_WINDOW, SWPAGE_RIGHT_GVALUE );
     if ( aWinOpt2.Exists() )
     {
-        ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = aWinOpt2.GetUserData();
+        css::uno::Sequence < css::beans::NamedValue > aSeq = aWinOpt2.GetUserData();
         OUString aTmp;
         if ( aSeq.getLength())
             aSeq[0].Value >>= aTmp;
@@ -458,7 +458,7 @@ bool PageMarginControl::GetUserCustomValues()
     SvtViewOptions aWinOpt3( E_WINDOW, SWPAGE_TOP_GVALUE );
     if ( aWinOpt3.Exists() )
     {
-        ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = aWinOpt3.GetUserData();
+        css::uno::Sequence < css::beans::NamedValue > aSeq = aWinOpt3.GetUserData();
         OUString aTmp;
         if ( aSeq.getLength())
             aSeq[0].Value >>= aTmp;
@@ -470,7 +470,7 @@ bool PageMarginControl::GetUserCustomValues()
     SvtViewOptions aWinOpt4( E_WINDOW, SWPAGE_DOWN_GVALUE );
     if ( aWinOpt4.Exists() )
     {
-        ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = aWinOpt4.GetUserData();
+        css::uno::Sequence < css::beans::NamedValue > aSeq = aWinOpt4.GetUserData();
         OUString aTmp;
         if ( aSeq.getLength())
             aSeq[0].Value >>= aTmp;
@@ -482,7 +482,7 @@ bool PageMarginControl::GetUserCustomValues()
     SvtViewOptions aWinOpt5( E_WINDOW, SWPAGE_MIRROR_GVALUE );
     if ( aWinOpt5.Exists() )
     {
-        ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = aWinOpt5.GetUserData();
+        css::uno::Sequence < css::beans::NamedValue > aSeq = aWinOpt5.GetUserData();
         OUString aTmp;
         if ( aSeq.getLength())
             aSeq[0].Value >>= aTmp;
@@ -501,7 +501,7 @@ void PageMarginControl::StoreUserCustomValues()
         return;
     }
 
-    ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1);
+    css::uno::Sequence < css::beans::NamedValue > aSeq(1);
     SvtViewOptions aWinOpt( E_WINDOW, SWPAGE_LEFT_GVALUE );
 
     aSeq[0].Name = "mnPageLeftMargin";
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
index a869b44e3f49..8ac1f6939617 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
@@ -83,15 +83,15 @@ namespace sw { namespace sidebar {
 
 VclPtr<vcl::Window> PagePropertyPanel::Create (
     vcl::Window* pParent,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame,
+    const css::uno::Reference< css::frame::XFrame>& rxFrame,
     SfxBindings* pBindings)
 {
     if (pParent == NULL)
-        throw ::com::sun::star::lang::IllegalArgumentException("no parent Window given to PagePropertyPanel::Create", NULL, 0);
+        throw css::lang::IllegalArgumentException("no parent Window given to PagePropertyPanel::Create", NULL, 0);
     if ( ! rxFrame.is())
-        throw ::com::sun::star::lang::IllegalArgumentException("no XFrame given to PagePropertyPanel::Create", NULL, 1);
+        throw css::lang::IllegalArgumentException("no XFrame given to PagePropertyPanel::Create", NULL, 1);
     if (pBindings == NULL)
-        throw ::com::sun::star::lang::IllegalArgumentException("no SfxBindings given to PagePropertyPanel::Create", NULL, 2);
+        throw css::lang::IllegalArgumentException("no SfxBindings given to PagePropertyPanel::Create", NULL, 2);
 
     return VclPtr<PagePropertyPanel>::Create( pParent,
                                               rxFrame,
@@ -100,7 +100,7 @@ VclPtr<vcl::Window> PagePropertyPanel::Create (
 
 PagePropertyPanel::PagePropertyPanel(
             vcl::Window* pParent,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame,
+            const css::uno::Reference< css::frame::XFrame>& rxFrame,
             SfxBindings* pBindings)
     : PanelLayout(pParent, "PagePropertyPanel", "modules/swriter/ui/sidebarpage.ui", rxFrame)
     , mpBindings(pBindings)
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
index a575e8eb3840..b1456a9540fa 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
@@ -56,7 +56,7 @@ namespace sw { namespace sidebar {
     public:
         static VclPtr<vcl::Window> Create(
             vcl::Window* pParent,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame,
+            const css::uno::Reference< css::frame::XFrame>& rxFrame,
             SfxBindings* pBindings );
 
         // interface of ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
@@ -98,7 +98,7 @@ namespace sw { namespace sidebar {
 
         PagePropertyPanel(
             vcl::Window* pParent,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame,
+            const css::uno::Reference< css::frame::XFrame>& rxFrame,
             SfxBindings* pBindings );
     private:
         virtual ~PagePropertyPanel();
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index d341db8649b9..1e6708bf4ec4 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -47,15 +47,15 @@ namespace sw { namespace sidebar {
 
 VclPtr<vcl::Window> WrapPropertyPanel::Create (
     vcl::Window* pParent,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame,
+    const css::uno::Reference< css::frame::XFrame >& rxFrame,
     SfxBindings* pBindings)
 {
     if (pParent == NULL)
-        throw ::com::sun::star::lang::IllegalArgumentException("no parent Window given to WrapPropertyPanel::Create", NULL, 0);
+        throw css::lang::IllegalArgumentException("no parent Window given to WrapPropertyPanel::Create", NULL, 0);
     if ( ! rxFrame.is())
-        throw ::com::sun::star::lang::IllegalArgumentException("no XFrame given to WrapPropertyPanel::Create", NULL, 1);
+        throw css::lang::IllegalArgumentException("no XFrame given to WrapPropertyPanel::Create", NULL, 1);
     if (pBindings == NULL)
-        throw ::com::sun::star::lang::IllegalArgumentException("no SfxBindings given to WrapPropertyPanel::Create", NULL, 2);
+        throw css::lang::IllegalArgumentException("no SfxBindings given to WrapPropertyPanel::Create", NULL, 2);
 
     return VclPtr<WrapPropertyPanel>::Create(
                         pParent,
@@ -65,7 +65,7 @@ VclPtr<vcl::Window> WrapPropertyPanel::Create (
 
 WrapPropertyPanel::WrapPropertyPanel(
     vcl::Window* pParent,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame,
+    const css::uno::Reference< css::frame::XFrame >& rxFrame,
     SfxBindings* pBindings )
     : PanelLayout(pParent, "WrapPropertyPanel", "modules/swriter/ui/sidebarwrap.ui", rxFrame)
     , mxFrame( rxFrame )
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
index 38230b51fac9..5dd4caa5ff09 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
@@ -36,7 +36,7 @@ namespace sw { namespace sidebar {
     public:
         static VclPtr<vcl::Window> Create(
             vcl::Window* pParent,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame,
+            const css::uno::Reference< css::frame::XFrame>& rxFrame,
             SfxBindings* pBindings );
 
         // interface of ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
@@ -51,10 +51,10 @@ namespace sw { namespace sidebar {
 
         WrapPropertyPanel(
             vcl::Window* pParent,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame,
+            const css::uno::Reference< css::frame::XFrame >& rxFrame,
             SfxBindings* pBindings );
     private:
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
+        css::uno::Reference< css::frame::XFrame > mxFrame;
         SfxBindings* mpBindings;
 
         VclPtr<RadioButton> mpRBNoWrap;
diff --git a/sw/source/uibase/smartmenu/stmenu.cxx b/sw/source/uibase/smartmenu/stmenu.cxx
index 42751cfc507d..9d45454ab0d0 100644
--- a/sw/source/uibase/smartmenu/stmenu.cxx
+++ b/sw/source/uibase/smartmenu/stmenu.cxx
@@ -29,7 +29,7 @@
 #include <breakit.hxx>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
 
 SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView,
                                   Sequence< OUString >& rSmartTagTypes,
diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx
index c28c18675c45..7f54cf505442 100644
--- a/sw/source/uibase/table/chartins.cxx
+++ b/sw/source/uibase/table/chartins.cxx
@@ -59,7 +59,7 @@
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
 
 Point SwGetChartDialogPos( const vcl::Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart )
 {
diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx
index 90b707c1a369..e0a9894b7d51 100644
--- a/sw/source/uibase/table/tablemgr.cxx
+++ b/sw/source/uibase/table/tablemgr.cxx
@@ -225,7 +225,7 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
     uno::Reference < embed::XEmbeddedObject > xObj =
         aCnt.CreateEmbeddedObject( SvGlobalName( SO3_SCH_CLASSID ).GetByteSequence(), aObjName );
 
-    ::svt::EmbeddedObjectRef aEmbObjRef( xObj, ::com::sun::star::embed::Aspects::MSOLE_CONTENT );
+    ::svt::EmbeddedObjectRef aEmbObjRef( xObj, css::embed::Aspects::MSOLE_CONTENT );
     if ( xObj.is() )
     {
 
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 7535940181ea..3efbd57b9b7e 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -1844,20 +1844,20 @@ bool SwPagePreview::HandleWheelCommands( const CommandEvent& rCEvt )
     return bOk;
 }
 
-uno::Reference< ::com::sun::star::accessibility::XAccessible >
+uno::Reference< css::accessibility::XAccessible >
     SwPagePreviewWin::CreateAccessible()
 {
     SolarMutexGuard aGuard; // this should have happened already!!!
 
     OSL_ENSURE( GetViewShell() != NULL, "We need a view shell" );
-    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible( false );
+    css::uno::Reference< css::accessibility::XAccessible > xAcc = GetAccessible( false );
     if (xAcc.is())
     {
         return xAcc;
     }
     if (mpViewShell)
     {
-        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccPreview = mpViewShell->CreateAccessiblePreview();
+        css::uno::Reference< css::accessibility::XAccessible > xAccPreview = mpViewShell->CreateAccessiblePreview();
         SetAccessible(xAccPreview);
     }
     return GetAccessible( false );
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index eb66d8ac5fa5..80a6c849ce61 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -91,12 +91,12 @@
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::i18n;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::ui::dialogs;
+using namespace css::i18n;
+using namespace css::lang;
+using namespace css::uno;
+using namespace css::ui::dialogs;
 using namespace ::sfx2;
-using ::com::sun::star::util::SearchOptions;
+using css::util::SearchOptions;
 
 #define SWSRCVIEWFLAGS ( SfxViewShellFlags::CAN_PRINT | SfxViewShellFlags::NO_NEWWINDOW )
 
diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx
index 23ec3205ab97..b1f792bff4c3 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -49,10 +49,10 @@
 #include <view.hrc>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::scanner;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::datatransfer::clipboard;
+using namespace css::uno;
+using namespace css::scanner;
+using namespace css::lang;
+using namespace css::datatransfer::clipboard;
 
 SwView_Impl::SwView_Impl(SwView* pShell)
     : mxXTextView()
@@ -278,7 +278,7 @@ void SAL_CALL SwClipboardChangeListener::disposing( const EventObject& /*rEventO
 {
 }
 
-void SAL_CALL SwClipboardChangeListener::changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& rEventObject )
+void SAL_CALL SwClipboardChangeListener::changedContents( const css::datatransfer::clipboard::ClipboardEvent& rEventObject )
     throw (RuntimeException, std::exception)
 
 {
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 7dd9064caad0..4cb1d172d216 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -114,9 +114,9 @@
 #include <svl/cjkoptions.hxx>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::scanner;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::scanner;
 
 extern bool g_bNoInterrupt;       // in swmodule.cxx
 
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 7c528dc42a31..b506d5505c9f 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -153,15 +153,15 @@ const char sStatusComma[] = " , ";
 
 using namespace sfx2;
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::i18n;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::scanner;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::ui::dialogs;
+using namespace css::i18n;
+using namespace css::util;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::scanner;
+using namespace css::beans;
+using namespace css::container;
+using namespace css::sdb;
+using namespace css::ui::dialogs;
 
 static void lcl_SetAllTextToDefaultLanguage( SwWrtShell &rWrtSh, sal_uInt16 nWhichId )
 {
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index 25a626d99c38..7e83a86dd620 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -90,10 +90,10 @@
 
 using namespace sw::mark;
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::linguistic2;
-using namespace ::com::sun::star::smarttags;
+using namespace css::beans;
+using namespace css::uno;
+using namespace css::linguistic2;
+using namespace css::smarttags;
 
 // Lingu-Dispatcher
 
@@ -741,7 +741,7 @@ bool SwView::ExecSpellPopup(const Point& rPt)
                             uno::Reference< frame::XFrame > xFrame;
                             if ( pSfxViewFrame )
                                 xFrame = pSfxViewFrame->GetFrame().GetFrameInterface();
-                            com::sun::star::util::URL aURL;
+                            css::util::URL aURL;
                             uno::Reference< frame::XDispatchProvider > xDispatchProvider( xFrame, UNO_QUERY );
 
                             try
diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index a722622493fd..58fc72667fd1 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -56,8 +56,8 @@
 sal_uInt16  SwView::m_nMoveType = NID_PGE;
 sal_Int32 SwView::m_nActMark = 0;
 
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::frame;
+using namespace css::uno;
+using namespace css::frame;
 
 void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, bool bViewOnly )
 {
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index 92d907694970..f37acaeda850 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -69,9 +69,9 @@
 #include "PostItMgr.hxx"
 
 using namespace com::sun::star;
-using namespace ::com::sun::star::i18n;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::util;
+using namespace css::i18n;
+using namespace css::lang;
+using namespace css::util;
 
 //Search Parameter
 
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index a48e970561ed..3aefd4f83588 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -50,10 +50,10 @@
 
 using namespace comphelper;
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::i18n;
+using namespace css::uno;
+using namespace css::beans;
+using namespace css::lang;
+using namespace css::i18n;
 
 enum SwDocumentSettingsPropertyHandles
 {
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.hxx b/sw/source/uibase/uno/SwXDocumentSettings.hxx
index edd0c703ca81..131991312fec 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.hxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.hxx
@@ -33,12 +33,12 @@ class SfxPrinter;
 
 class SwXDocumentSettings :
         public comphelper::MasterPropertySet,
-        public com::sun::star::lang::XServiceInfo,
-        public com::sun::star::lang::XTypeProvider,
+        public css::lang::XServiceInfo,
+        public css::lang::XTypeProvider,
         public cppu::OWeakObject
 {
 protected:
-    com::sun::star::uno::Reference< com::sun::star::text::XTextDocument >       mxModel;
+    css::uno::Reference< css::text::XTextDocument >       mxModel;
     SwXTextDocument*        mpModel;
     SwDocShell*             mpDocSh;
     SwDoc*                  mpDoc;
@@ -49,22 +49,22 @@ protected:
     VclPtr<SfxPrinter>      mpPrinter;
 
     virtual void _preSetValues ()
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override;
-    virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue )
+        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
+    virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue )
         throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
                css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
                css::uno::RuntimeException, std::exception) override;
     virtual void _postSetValues ()
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override;
+        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
 
     virtual void _preGetValues ()
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override;
-    virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue )
+        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
+    virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue )
         throw (css::beans::UnknownPropertyException,
                css::lang::WrappedTargetException,
                css::uno::RuntimeException) override;
     virtual void _postGetValues ()
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override;
+        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
 protected:
     virtual ~SwXDocumentSettings()
         throw();
@@ -72,8 +72,8 @@ public:
     SwXDocumentSettings( SwXTextDocument* pModel );
 
     // 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(  )
@@ -81,15 +81,15 @@ public:
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName(  )
-        throw(com::sun::star::uno::RuntimeException, std::exception) override;
+        throw(css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(com::sun::star::uno::RuntimeException, std::exception) override;
+        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
+        throw(css::uno::RuntimeException, std::exception) override;
 
     // 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;
 };
 #endif
 
diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx
index 74de4115911f..003cc4bac491 100644
--- a/sw/source/uibase/uno/SwXFilterOptions.cxx
+++ b/sw/source/uibase/uno/SwXFilterOptions.cxx
@@ -35,9 +35,9 @@
 #include <memory>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::ui::dialogs;
-using namespace ::com::sun::star::document;
-using namespace ::com::sun::star::lang;
+using namespace css::ui::dialogs;
+using namespace css::document;
+using namespace css::lang;
 
 #define FILTER_OPTIONS_NAME             "FilterOptions"
 
@@ -155,9 +155,9 @@ uno::Sequence< OUString > SwXFilterOptions::getSupportedServiceNames()
     return uno::Sequence< OUString> (&sService, 1);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_FilterOptionsDialog_get_implementation(::com::sun::star::uno::XComponentContext*,
-                                ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_FilterOptionsDialog_get_implementation(css::uno::XComponentContext*,
+                                css::uno::Sequence<css::uno::Any> const &)
 {
     SolarMutexGuard aGuard;
 
diff --git a/sw/source/uibase/uno/dlelstnr.cxx b/sw/source/uibase/uno/dlelstnr.cxx
index b3c7ba28cd02..98c5f8bb1038 100644
--- a/sw/source/uibase/uno/dlelstnr.cxx
+++ b/sw/source/uibase/uno/dlelstnr.cxx
@@ -37,11 +37,11 @@
 #include <view.hxx>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::linguistic2;
-using namespace ::com::sun::star::linguistic2::LinguServiceEventFlags;
+using namespace css::lang;
+using namespace css::frame;
+using namespace css::uno;
+using namespace css::linguistic2;
+using namespace css::linguistic2::LinguServiceEventFlags;
 
 SwLinguServiceEventListener::SwLinguServiceEventListener()
 {
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index 428b6c92f109..f42b4b5ba50e 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -1091,9 +1091,9 @@ void SwAutoTextEventDescriptor::getByName(
     }
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-SwXAutoTextContainer_get_implementation(::com::sun::star::uno::XComponentContext*,
-        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+SwXAutoTextContainer_get_implementation(css::uno::XComponentContext*,
+        css::uno::Sequence<css::uno::Any> const &)
 {
     //the module may not be loaded
     SolarMutexGuard aGuard;
diff --git a/sw/source/uibase/uno/unodoc.cxx b/sw/source/uibase/uno/unodoc.cxx
index bfa5ce5b4c6e..80f3ca86e80a 100644
--- a/sw/source/uibase/uno/unodoc.cxx
+++ b/sw/source/uibase/uno/unodoc.cxx
@@ -57,9 +57,9 @@ uno::Reference< uno::XInterface > SAL_CALL SwTextDocument_createInstance(
     return uno::Reference< uno::XInterface >( pShell->GetModel() );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_WebDocument_get_implementation(::com::sun::star::uno::XComponentContext*,
-                                                        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_WebDocument_get_implementation(css::uno::XComponentContext*,
+                                                        css::uno::Sequence<css::uno::Any> const &)
 {
     SolarMutexGuard aGuard;
     SwGlobals::ensure();
@@ -70,9 +70,9 @@ com_sun_star_comp_Writer_WebDocument_get_implementation(::com::sun::star::uno::X
 }
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_GlobalDocument_get_implementation(::com::sun::star::uno::XComponentContext*,
-                                                           ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_GlobalDocument_get_implementation(css::uno::XComponentContext*,
+                                                           css::uno::Sequence<css::uno::Any> const &)
 {
     SolarMutexGuard aGuard;
     SwGlobals::ensure();
diff --git a/sw/source/uibase/uno/unofreg.cxx b/sw/source/uibase/uno/unofreg.cxx
index 9b455f335fcf..a3671cf390ab 100644
--- a/sw/source/uibase/uno/unofreg.cxx
+++ b/sw/source/uibase/uno/unofreg.cxx
@@ -32,7 +32,7 @@
 #include <string.h>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::lang;
+using namespace css::lang;
 
 // #i73788#
 #include <cppuhelper/implementationentry.hxx>
@@ -83,9 +83,9 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sw_component_getFactory(
 
 } // extern "C"
 
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-SwXMailMerge_get_implementation(::com::sun::star::uno::XComponentContext*,
-                                ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+SwXMailMerge_get_implementation(css::uno::XComponentContext*,
+                                css::uno::Sequence<css::uno::Any> const &)
 {
 #if HAVE_FEATURE_DBCONNECTIVITY
     SolarMutexGuard aGuard;
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index 2dde9d41362b..5d83796a5208 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -74,11 +74,11 @@
 #include <memory>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::text;
+using namespace css::frame;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::beans;
+using namespace css::text;
 using namespace SWUnoHelper;
 
 typedef ::utl::SharedUNOComponent< XInterface > SharedComponent;
@@ -832,7 +832,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
         return makeAny( true );
 }
 
-void SAL_CALL SwXMailMerge::cancel() throw (com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL SwXMailMerge::cancel() throw (css::uno::RuntimeException, std::exception)
 {
     // Cancel may be called from a second thread, so this protects from m_pMgr
     /// cleanup in the execute function.
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 2971c05d25c4..a87741b45302 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -42,9 +42,9 @@
 #include <rtl/ustrbuf.hxx>
 #include <tools/urlobj.hxx>
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::lang;
+using namespace css::uno;
+using namespace css::beans;
+using namespace css::lang;
 using namespace ::comphelper;
 
 enum SwViewSettingsPropertyHandles
@@ -1005,9 +1005,9 @@ Sequence< OUString > SwXViewSettings::getSupportedServiceNames() throw( RuntimeE
     return aRet;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-SwXModule_get_implementation(::com::sun::star::uno::XComponentContext*,
-        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+SwXModule_get_implementation(css::uno::XComponentContext*,
+        css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new SwXModule());
 }
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 4c54dc9fb4f5..5244f007b166 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -152,13 +152,13 @@
 #include <memory>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::i18n;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::document;
+using namespace css::text;
+using namespace css::i18n;
+using namespace css::uno;
+using namespace css::beans;
+using namespace css::lang;
+using namespace css::container;
+using namespace css::document;
 using ::osl::FileBase;
 
 #define SW_CREATE_DASH_TABLE            0x01
@@ -301,12 +301,12 @@ Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType ) throw(Run
     }
 
     if ( !aRet.hasValue()
-        && rType != cppu::UnoType<com::sun::star::document::XDocumentEventBroadcaster>::get()
-        && rType != cppu::UnoType<com::sun::star::frame::XController>::get()
-        && rType != cppu::UnoType<com::sun::star::frame::XFrame>::get()
-        && rType != cppu::UnoType<com::sun::star::script::XInvocation>::get()
-        && rType != cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get()
-        && rType != cppu::UnoType<com::sun::star::awt::XWindow>::get())
+        && rType != cppu::UnoType<css::document::XDocumentEventBroadcaster>::get()
+        && rType != cppu::UnoType<css::frame::XController>::get()
+        && rType != cppu::UnoType<css::frame::XFrame>::get()
+        && rType != cppu::UnoType<css::script::XInvocation>::get()
+        && rType != cppu::UnoType<css::beans::XFastPropertySet>::get()
+        && rType != cppu::UnoType<css::awt::XWindow>::get())
     {
         GetNumberFormatter();
         if(xNumFormatAgg.is())
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index dc012f1a0183..fce18a5a9620 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -77,14 +77,14 @@
 #include <cppuhelper/supportsservice.hxx>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::view;
-using namespace ::com::sun::star::frame;
-
-using ::com::sun::star::util::URL;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::beans;
+using namespace css::text;
+using namespace css::view;
+using namespace css::frame;
+
+using css::util::URL;
 using comphelper::HelperBaseNoState;
 
 SwXTextView::SwXTextView(SwView* pSwView) :
diff --git a/sw/source/uibase/utlui/condedit.cxx b/sw/source/uibase/utlui/condedit.cxx
index fd11e8a5b8a0..b67e203fb607 100644
--- a/sw/source/uibase/utlui/condedit.cxx
+++ b/sw/source/uibase/utlui/condedit.cxx
@@ -24,7 +24,7 @@
 #include <vcl/builderfactory.hxx>
 
 using namespace ::svx;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
 
 ConditionEdit::ConditionEdit(vcl::Window* pParent, WinBits nStyle)
     : Edit(pParent, nStyle)
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 338198eb9e5b..822284f74f3e 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -101,9 +101,9 @@
 
 using namespace ::std;
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::container;
+using namespace css::text;
+using namespace css::uno;
+using namespace css::container;
 
 #define NAVI_BOOKMARK_DELIM     (sal_Unicode)1
 
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 1c43dd420de4..5882387ef719 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -60,7 +60,7 @@
 #include "swabstdlg.hxx"
 #include <memory>
 
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
 
 // Context menu for GlobalTree
 #define CTX_INSERT_ANY_INDEX 10
diff --git a/sw/source/uibase/utlui/navicfg.cxx b/sw/source/uibase/utlui/navicfg.cxx
index 4c60c27d4b46..0732fed68add 100644
--- a/sw/source/uibase/utlui/navicfg.cxx
+++ b/sw/source/uibase/utlui/navicfg.cxx
@@ -27,7 +27,7 @@
 #include <unomid.h>
 
 using namespace ::utl;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
 
 Sequence<OUString> SwNavigationConfig::GetPropertyNames()
 {
@@ -124,6 +124,6 @@ void SwNavigationConfig::ImplCommit()
     PutProperties(aNames, aValues);
 }
 
-void SwNavigationConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwNavigationConfig::Notify( const css::uno::Sequence< OUString >& ) {}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index b4997d00096a..fd048d49073b 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -57,8 +57,8 @@
 #include <unomid.h>
 #include <memory>
 
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::frame;
+using namespace css::uno;
+using namespace css::frame;
 
 SFX_IMPL_CHILDWINDOW_CONTEXT( SwNavigationChild, SID_NAVIGATOR, SwView )
 
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx
index 90a8154c82fe..ddeb44c6188b 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -44,8 +44,8 @@
 #include <sfx2/viewfrm.hxx>
 #include <memory>
 
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
+using namespace css::uno;
+using namespace css::lang;
 
 // STATIC DATA
 
diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx
index 16823c94e688..dee8d90482ee 100644
--- a/sw/source/uibase/utlui/uiitems.cxx
+++ b/sw/source/uibase/utlui/uiitems.cxx
@@ -30,7 +30,7 @@
 #include <numrule.hxx>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
 
 SwPageFootnoteInfoItem::SwPageFootnoteInfoItem( const sal_uInt16 nId, SwPageFootnoteInfo& rInfo) :
     SfxPoolItem( nId ),
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx
index 6ed9aea5d9e0..c2165ccc2674 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -178,7 +178,7 @@ void ConvertAttrGenToChar(SfxItemSet& rSet, const SfxItemSet& rOrigSet, const sa
             if( SfxItemState::SET == rOrigSet.GetItemState( RES_CHRATR_GRABBAG, false, &pTmpItem ) )
             {
                 SfxGrabBagItem aGrabBag(*static_cast<const SfxGrabBagItem*>(pTmpItem));
-                std::map<OUString, com::sun::star::uno::Any>& rMap = aGrabBag.GetGrabBag();
+                std::map<OUString, css::uno::Any>& rMap = aGrabBag.GetGrabBag();
                 auto aIterator = rMap.find("CharShadingMarker");
                 if( aIterator != rMap.end() )
                 {
diff --git a/sw/source/uibase/utlui/viewlayoutctrl.cxx b/sw/source/uibase/utlui/viewlayoutctrl.cxx
index 22b3f48fb180..8e4b24e04a62 100644
--- a/sw/source/uibase/utlui/viewlayoutctrl.cxx
+++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx
@@ -178,10 +178,10 @@ bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt )
     // commit state change
     SvxViewLayoutItem aViewLayout( nColumns, bBookMode );
 
-    ::com::sun::star::uno::Any a;
+    css::uno::Any a;
     aViewLayout.QueryValue( a );
 
-    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 );
+    css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 );
     aArgs[0].Name = "ViewLayout";
     aArgs[0].Value = a;
 
diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx
index e7a3806b95e2..342123150f12 100644
--- a/sw/source/uibase/wrtsh/select.cxx
+++ b/sw/source/uibase/wrtsh/select.cxx
@@ -45,7 +45,7 @@ namespace com { namespace sun { namespace star { namespace util {
     struct SearchOptions;
 } } } }
 
-using namespace ::com::sun::star::util;
+using namespace css::util;
 
 static long nStartDragX = 0, nStartDragY = 0;
 static bool  bStartDrag = false;
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index de8d83e695e2..922b06b7404d 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -594,8 +594,8 @@ void SwWrtShell::MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point&
     try
     {
         sal_Int32 nState = xObj->getCurrentState();
-        if ( nState == ::com::sun::star::embed::EmbedStates::INPLACE_ACTIVE
-          || nState == ::com::sun::star::embed::EmbedStates::UI_ACTIVE )
+        if ( nState == css::embed::EmbedStates::INPLACE_ACTIVE
+          || nState == css::embed::EmbedStates::UI_ACTIVE )
         {
             SfxInPlaceClient* pCli =
                 GetView().FindIPClient( xObj.GetObject(), &(GetView().GetEditWin()) );