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

Change-Id: I30016977f1be8fb53dd239367d043de92a9467d9

41 files changed, 477 insertions, 477 deletions

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 );