com::sun::star->css in include/sot to include/typelib

Change-Id: I9cd92b53370a6b6018d2f7c648890f9c014a27de

52 files changed, 539 insertions, 559 deletions

diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx
index d2aa02aaa101..d7b02e73de76 100644
--- a/include/svtools/DocumentInfoPreview.hxx
+++ b/include/svtools/DocumentInfoPreview.hxx
@@ -50,8 +50,7 @@ public:
     void clear();
 
     void fill(
-        com::sun::star::uno::Reference<
-            com::sun::star::document::XDocumentProperties > const & xDocProps,
+        css::uno::Reference< css::document::XDocumentProperties > const & xDocProps,
         OUString const & rURL);
 
 private:
@@ -63,7 +62,7 @@ private:
 
     void insertNonempty(long id, OUString const & value);
 
-    void insertDateTime(long id, com::sun::star::util::DateTime const & value);
+    void insertDateTime(long id, css::util::DateTime const & value);
 };
 
 }
diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx
index 3e71209d77e4..b86a23d52ecb 100644
--- a/include/svtools/ServerDetailsControls.hxx
+++ b/include/svtools/ServerDetailsControls.hxx
@@ -126,7 +126,7 @@ class CmisDetailsContainer : public DetailsContainer
     private:
         OUString m_sUsername;
         OUString m_sPassword;
-        com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xCmdEnv;
+        css::uno::Reference< css::ucb::XCommandEnvironment > m_xCmdEnv;
         std::vector< OUString > m_aRepoIds;
         OUString m_sRepoId;
         OUString m_sBinding;
diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx
index a4ef5d568b32..8736506eaaf4 100644
--- a/include/svtools/acceleratorexecute.hxx
+++ b/include/svtools/acceleratorexecute.hxx
@@ -171,7 +171,7 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit
         * @param aKey The key event
         * @return The command or an empty string if the key event could not be found.
         */
-        OUString  findCommand(const ::com::sun::star::awt::KeyEvent& aKey);
+        OUString  findCommand(const css::awt::KeyEvent& aKey);
 
         /** TODO document me */
         static css::awt::KeyEvent st_VCLKey2AWTKey(const vcl::KeyCode&       aKey);
diff --git a/include/svtools/accessiblefactory.hxx b/include/svtools/accessiblefactory.hxx
index 21ba910b8d94..6327c9735c3f 100644
--- a/include/svtools/accessiblefactory.hxx
+++ b/include/svtools/accessiblefactory.hxx
@@ -76,98 +76,98 @@ namespace svt
     public:
         virtual IAccessibleTabListBox*
             createAccessibleTabListBox(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
+                const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
                 SvHeaderTabListBox& rBox
             ) const = 0;
 
         virtual IAccessibleBrowseBox*
             createAccessibleBrowseBox(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+                const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
                 IAccessibleTableProvider& _rBrowseBox
             ) const = 0;
         virtual table::IAccessibleTableControl*
             createAccessibleTableControl(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+                const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
                 table::IAccessibleTable& _rTable
             ) const = 0;
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        virtual css::uno::Reference< css::accessibility::XAccessible >
             createAccessibleIconChoiceCtrl(
                 SvtIconChoiceCtrl& _rIconCtrl,
-                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent
+                const css::uno::Reference< css::accessibility::XAccessible >& _xParent
             ) const = 0;
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        virtual css::uno::Reference< css::accessibility::XAccessible >
             createAccessibleTabBar(
                 TabBar& _rTabBar
             ) const = 0;
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext >
             createAccessibleTextWindowContext(
                 VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView
             ) const = 0;
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        virtual css::uno::Reference< css::accessibility::XAccessible >
             createAccessibleTreeListBox(
                 SvTreeListBox& _rListBox,
-                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent
+                const css::uno::Reference< css::accessibility::XAccessible >& _xParent
             ) const = 0;
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        virtual css::uno::Reference< css::accessibility::XAccessible >
             createAccessibleBrowseBoxHeaderBar(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
+                const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
                 IAccessibleTableProvider& _rOwningTable,
                 AccessibleBrowseBoxObjType _eObjType
             ) const = 0;
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        virtual css::uno::Reference< css::accessibility::XAccessible >
             createAccessibleBrowseBoxTableCell(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+                const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
                 IAccessibleTableProvider& _rBrowseBox,
-                const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+                const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
                 sal_Int32 _nRowId,
                 sal_uInt16 _nColId,
                 sal_Int32 _nOffset
             ) const = 0;
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        virtual css::uno::Reference< css::accessibility::XAccessible >
             createAccessibleBrowseBoxHeaderCell(
                 sal_Int32 _nColumnRowId,
-                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
+                const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
                 IAccessibleTableProvider& _rBrowseBox,
-                const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+                const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
                 AccessibleBrowseBoxObjType  _eObjType
             ) const = 0;
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        virtual css::uno::Reference< css::accessibility::XAccessible >
             createAccessibleCheckBoxCell(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+                const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
                 IAccessibleTableProvider& _rBrowseBox,
-                const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+                const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
                 sal_Int32 _nRowPos,
                 sal_uInt16 _nColPos,
                 const TriState& _eState,
                 bool _bIsTriState
             ) const = 0;
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        virtual css::uno::Reference< css::accessibility::XAccessible >
             createEditBrowseBoxTableCellAccess(
-                const ::com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessible >& _rxParent,
-                const ::com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessible >& _rxControlAccessible,
-                const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _rxFocusWindow,
+                const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
+                const css::uno::Reference< css::accessibility::XAccessible >& _rxControlAccessible,
+                const css::uno::Reference< css::awt::XWindow >& _rxFocusWindow,
                 IAccessibleTableProvider& _rBrowseBox,
                 sal_Int32 _nRowPos,
                 sal_uInt16 _nColPos
             ) const = 0;
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext >
             createAccessibleToolPanelDeck(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rAccessibleParent,
+                const css::uno::Reference< css::accessibility::XAccessible >& i_rAccessibleParent,
                 ::svt::ToolPanelDeck& i_rPanelDeck
             ) = 0;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext >
             createAccessibleToolPanelTabBar(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rAccessibleParent,
+                const css::uno::Reference< css::accessibility::XAccessible >& i_rAccessibleParent,
                 ::svt::IToolPanelDeck& i_rPanelDeck,
                 ::svt::PanelTabBar& i_rTabBar
             ) = 0;
diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx
index b8918b8d28b6..f73d385faf47 100644
--- a/include/svtools/accessibleruler.hxx
+++ b/include/svtools/accessibleruler.hxx
@@ -53,11 +53,11 @@ namespace vcl { class Window; }
 
 
 typedef ::cppu::WeakAggComponentImplHelper5<
-            ::com::sun::star::accessibility::XAccessible,
-            ::com::sun::star::accessibility::XAccessibleComponent,
-            ::com::sun::star::accessibility::XAccessibleContext,
-            ::com::sun::star::accessibility::XAccessibleEventBroadcaster,
-            ::com::sun::star::lang::XServiceInfo >
+            css::accessibility::XAccessible,
+            css::accessibility::XAccessibleComponent,
+            css::accessibility::XAccessibleContext,
+            css::accessibility::XAccessibleEventBroadcaster,
+            css::lang::XServiceInfo >
             SvtRulerAccessible_Base;
 
 class SvtRulerAccessible : public ::comphelper::OBaseMutex, public SvtRulerAccessible_Base
@@ -65,112 +65,112 @@ class SvtRulerAccessible : public ::comphelper::OBaseMutex, public SvtRulerAcces
 public:
     //=====  internal  ========================================================
     SvtRulerAccessible(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, Ruler& rRepresentation, const ::rtl::OUString& rName );
+        const css::uno::Reference< css::accessibility::XAccessible>& rxParent, Ruler& rRepresentation, const ::rtl::OUString& rName );
 protected:
     virtual ~SvtRulerAccessible();
 public:
 
     bool SAL_CALL
-        isVisible() throw( ::com::sun::star::uno::RuntimeException );
+        isVisible() throw( css::uno::RuntimeException );
 
     //=====  XAccessible  =====================================================
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL
-        getAccessibleContext() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL
+        getAccessibleContext() throw( css::uno::RuntimeException, std::exception ) override;
 
     //=====  XAccessibleComponent  ============================================
 
     virtual sal_Bool SAL_CALL
-        containsPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        containsPoint( const css::awt::Point& rPoint ) throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL
-        getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+        getAccessibleAtPoint( const css::awt::Point& rPoint ) throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL
-        getBounds() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Rectangle SAL_CALL
+        getBounds() throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual ::com::sun::star::awt::Point SAL_CALL
-        getLocation() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Point SAL_CALL
+        getLocation() throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual ::com::sun::star::awt::Point SAL_CALL
-        getLocationOnScreen() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Point SAL_CALL
+        getLocationOnScreen() throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual ::com::sun::star::awt::Size SAL_CALL
-        getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Size SAL_CALL
+        getSize() throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL
-        grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        grabFocus() throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual sal_Int32 SAL_CALL
-        getForeground(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
     virtual sal_Int32 SAL_CALL
-        getBackground(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
 
     //=====  XAccessibleContext  ==============================================
 
     virtual sal_Int32 SAL_CALL
-        getAccessibleChildCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        getAccessibleChildCount() throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
+    virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
         getAccessibleChild( sal_Int32 nIndex )
-            throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) override;
+            throw( css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception ) override;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
-        getAccessibleParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
+        getAccessibleParent() throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual sal_Int32 SAL_CALL
-        getAccessibleIndexInParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        getAccessibleIndexInParent() throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual sal_Int16 SAL_CALL
-        getAccessibleRole() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        getAccessibleRole() throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual ::rtl::OUString SAL_CALL
-        getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override;
 
     virtual ::rtl::OUString SAL_CALL
-        getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        getAccessibleName() throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL
-        getAccessibleRelationSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL
+        getAccessibleRelationSet() throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL
-        getAccessibleStateSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
+        getAccessibleStateSet() throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual ::com::sun::star::lang::Locale SAL_CALL
+    virtual css::lang::Locale SAL_CALL
         getLocale()
-            throw(  ::com::sun::star::uno::RuntimeException,
-                    ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ) override;
+            throw(  css::uno::RuntimeException,
+                    css::accessibility::IllegalAccessibleComponentStateException, std::exception ) override;
     //=====  XAccessibleEventBroadcaster  =====================================
 
     virtual void SAL_CALL
-        addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+        addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL
-        removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+        removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
 
     //=====  XServiceInfo  ====================================================
 
     virtual ::rtl::OUString SAL_CALL
-        getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual sal_Bool SAL_CALL
-        supportsService( const ::rtl::OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        supportsService( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
-        getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< ::rtl::OUString> SAL_CALL
+        getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
 
     //=====  XTypeProvider  ===================================================
 
-    virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
-        getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL
+        getImplementationId() throw( css::uno::RuntimeException, std::exception ) override;
 
 protected:
 
     /// @Return the object's current bounding box relative to the desktop.
-    Rectangle GetBoundingBoxOnScreen() throw( ::com::sun::star::uno::RuntimeException );
+    Rectangle GetBoundingBoxOnScreen() throw( css::uno::RuntimeException );
 
     /// @Return the object's current bounding box relative to the parent object.
-    Rectangle GetBoundingBox() throw( ::com::sun::star::uno::RuntimeException );
+    Rectangle GetBoundingBox() throw( css::uno::RuntimeException );
 
 
     virtual void SAL_CALL disposing() override;
@@ -182,7 +182,7 @@ protected:
     inline bool IsNotAlive() const;
 
     /// throws the exception DisposedException if it's not alive
-    void ThrowExceptionIfNotAlive() throw( ::com::sun::star::lang::DisposedException );
+    void ThrowExceptionIfNotAlive() throw( css::lang::DisposedException );
 
 private:
     /** Description of this object.  This is not a constant because it can
@@ -195,7 +195,7 @@ private:
     ::rtl::OUString                     msName;
 
     /// Reference to the parent object.
-    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+    css::uno::Reference< css::accessibility::XAccessible >
                                         mxParent;
 
     /// pointer to internal representation
diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx
index 9f5bb48c7f63..da67bf0c884e 100644
--- a/include/svtools/addresstemplate.hxx
+++ b/include/svtools/addresstemplate.hxx
@@ -54,23 +54,23 @@ namespace svt
         VclPtr<ScrollBar>      m_pFieldScroller;
 
         // string to display for "no selection"
-        const OUString  m_sNoFieldSelection;
+        const OUString         m_sNoFieldSelection;
 
         /// the DatabaseContext for selecting data sources
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseContext >
-                        m_xDatabaseContext;
+        css::uno::Reference< css::sdb::XDatabaseContext >
+                               m_xDatabaseContext;
         // the ORB for creating objects
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
-                        m_xORB;
-        ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
-                        m_xCurrentDatasourceTables;
+        css::uno::Reference< css::uno::XComponentContext >
+                               m_xORB;
+        css::uno::Reference< css::container::XNameAccess >
+                               m_xCurrentDatasourceTables;
 
         AddressBookSourceDialogData*
-                        m_pImpl;
+                               m_pImpl;
 
     public:
         AddressBookSourceDialog( vcl::Window* _pParent,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB );
+            const css::uno::Reference< css::uno::XComponentContext >& _rxORB );
 
         /** if you use this ctor, the dialog
             <ul><li>will not store it's data in the configuration (nor initially retrieve it from there)</li>
@@ -92,11 +92,11 @@ namespace svt
                 obtained from <arg>_rxTransientDS</arg>
         */
         AddressBookSourceDialog( vcl::Window* _pParent,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource >& _rxTransientDS,
+            const css::uno::Reference< css::uno::XComponentContext >& _rxORB,
+            const css::uno::Reference< css::sdbc::XDataSource >& _rxTransientDS,
             const OUString& _rDataSourceName,
             const OUString& _rTable,
-            const ::com::sun::star::uno::Sequence< ::com::sun::star::util::AliasProgrammaticPair >& _rMapping
+            const css::uno::Sequence< css::util::AliasProgrammaticPair >& _rMapping
         );
 
         virtual ~AddressBookSourceDialog();
@@ -104,7 +104,7 @@ namespace svt
 
         // to be used if the object was constructed for editing a field mapping only
         void        getFieldMapping(
-            ::com::sun::star::uno::Sequence< ::com::sun::star::util::AliasProgrammaticPair >& _rMapping) const;
+            css::uno::Sequence< css::util::AliasProgrammaticPair >& _rMapping) const;
 
     protected:
         void    implConstruct();
diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx
index a7d7c97e01fd..3b9dd1d6d180 100644
--- a/include/svtools/apearcfg.hxx
+++ b/include/svtools/apearcfg.hxx
@@ -55,14 +55,14 @@ class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem
 
     static bool  bInitialized ;
 
-    SVT_DLLPRIVATE const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
+    SVT_DLLPRIVATE const css::uno::Sequence<OUString>& GetPropertyNames();
     virtual void    ImplCommit() override;
 
 public:
     SvtTabAppearanceCfg( );
     virtual ~SvtTabAppearanceCfg( );
 
-    virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) override;
+    virtual void Notify( const css::uno::Sequence< OUString >& _rPropertyNames) override;
 
     sal_uInt16  GetDragMode  () const { return nDragMode; }
 
diff --git a/include/svtools/bindablecontrolhelper.hxx b/include/svtools/bindablecontrolhelper.hxx
index 6ddaf5dc81d2..65ca905ab382 100644
--- a/include/svtools/bindablecontrolhelper.hxx
+++ b/include/svtools/bindablecontrolhelper.hxx
@@ -36,7 +36,7 @@ namespace svt
     */
     namespace BindableControlHelper
     {
-        SVT_DLLPUBLIC void ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const OUString& rsCtrlSource, const OUString& rsRowSource, sal_uInt16 nRefTab = 0 );
+        SVT_DLLPUBLIC void ApplyListSourceAndBindableData( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::uno::XInterface >& rObj, const OUString& rsCtrlSource, const OUString& rsRowSource, sal_uInt16 nRefTab = 0 );
     }
 
 
diff --git a/include/svtools/cliplistener.hxx b/include/svtools/cliplistener.hxx
index 1033b39d4be0..f0f5fe1b0af5 100644
--- a/include/svtools/cliplistener.hxx
+++ b/include/svtools/cliplistener.hxx
@@ -30,7 +30,7 @@ namespace vcl { class Window; }
 class TransferableDataHelper;
 
 class SVT_DLLPUBLIC TransferableClipboardListener : public ::cppu::WeakImplHelper1<
-                            ::com::sun::star::datatransfer::clipboard::XClipboardListener >
+                            css::datatransfer::clipboard::XClipboardListener >
 {
     Link<TransferableDataHelper*,void>  aLink;
 
@@ -43,11 +43,11 @@ public:
     void    ClearCallbackLink();
 
             // 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;
             // XClipboardListener
-    virtual void SAL_CALL changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& event )
-                                            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL changedContents( const css::datatransfer::clipboard::ClipboardEvent& event )
+                                            throw(css::uno::RuntimeException, std::exception) override;
 };
 
 #endif
diff --git a/include/svtools/contextmenuhelper.hxx b/include/svtools/contextmenuhelper.hxx
index 2e7d8c0dda72..b636fddf9519 100644
--- a/include/svtools/contextmenuhelper.hxx
+++ b/include/svtools/contextmenuhelper.hxx
@@ -53,13 +53,13 @@ class SVT_DLLPUBLIC ContextMenuHelper
         // create context menu helper
         // ARGS: xFrame = frame defines the context of the context menu
         //       bAutoRefresh = specifies that the context will be constant or not
-        ContextMenuHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, bool bAutoRefresh=true );
+        ContextMenuHelper( const css::uno::Reference< css::frame::XFrame >& xFrame, bool bAutoRefresh=true );
         ~ContextMenuHelper();
 
         // methods to complete a popup menu (set images, labels, enable/disable states)
         // ATTENTION: The item ID's must be unique for the whole popup (inclusive the sub menus!)
         void completeAndExecute( const Point& aPos, PopupMenu& aPopupMenu );
-        void completeAndExecute( const Point& aPos, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& xPopupMenu );
+        void completeAndExecute( const Point& aPos, const css::uno::Reference< css::awt::XPopupMenu >& xPopupMenu );
 
     private:
         // asynchronous link to prevent destruction while on stack
@@ -75,13 +75,13 @@ class SVT_DLLPUBLIC ContextMenuHelper
         void            completeMenuProperties( Menu* pMenu );
 
         // dispatch provided command
-        bool            dispatchCommand( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const OUString& aCommandURL );
+        bool            dispatchCommand( const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& aCommandURL );
 
 
         // methods to retrieve a single command URL dependent value from a
         // ui configuration manager
         Image           getImageFromCommandURL( const OUString& aCmdURL ) const;
-        OUString   getLabelFromCommandURL( const OUString& aCmdURL ) const;
+        OUString        getLabelFromCommandURL( const OUString& aCmdURL ) const;
 
         // creates an association between current module/controller bound to the
         // provided frame and their ui configuration managers.
@@ -97,15 +97,15 @@ class SVT_DLLPUBLIC ContextMenuHelper
                 m_bUICfgMgrAssociated = false;
         }
 
-        ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame >         m_xWeakFrame;
-        OUString                                                                 m_aSelf;
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >     m_xURLTransformer;
-        ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >       m_aDefaultArgs;
-        ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager >         m_xDocImageMgr;
-        ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager >         m_xModuleImageMgr;
-        ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >    m_xUICommandLabels;
-        bool                                                                            m_bAutoRefresh;
-        bool                                                                            m_bUICfgMgrAssociated;
+        css::uno::WeakReference< css::frame::XFrame >         m_xWeakFrame;
+        OUString                                              m_aSelf;
+        css::uno::Reference< css::util::XURLTransformer >     m_xURLTransformer;
+        css::uno::Sequence< css::beans::PropertyValue >       m_aDefaultArgs;
+        css::uno::Reference< css::ui::XImageManager >         m_xDocImageMgr;
+        css::uno::Reference< css::ui::XImageManager >         m_xModuleImageMgr;
+        css::uno::Reference< css::container::XNameAccess >    m_xUICommandLabels;
+        bool                                                  m_bAutoRefresh;
+        bool                                                  m_bUICfgMgrAssociated;
 };
 
 } // namespace svt
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index da969fc9de45..7c26d467168c 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -324,10 +324,10 @@ public:
                         ColorDistFunc pColorDistFn = &sameDistColor);
 
     using ListBox::GetEntryPos;
-    sal_Int32       GetEntryPos( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID ) const;
+    sal_Int32       GetEntryPos( sal_uInt16 nStyle = css::table::BorderLineStyle::SOLID ) const;
     sal_uInt16      GetEntryStyle( sal_Int32  nPos ) const;
 
-    void            SelectEntry( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID, bool bSelect = true );
+    void            SelectEntry( sal_uInt16 nStyle = css::table::BorderLineStyle::SOLID, bool bSelect = true );
     sal_uInt16      GetSelectEntryStyle( sal_Int32  nSelIndex = 0 ) const;
 
     inline void     SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; }
diff --git a/include/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx
index df75982afbbd..693f8bb7f451 100644
--- a/include/svtools/dialogclosedlistener.hxx
+++ b/include/svtools/dialogclosedlistener.hxx
@@ -34,10 +34,10 @@ namespace svt
     //= ODialogClosedListener
 
     /**
-        C++ class to implement a ::com::sun::star::ui::dialogs::XDialogClosedListener
+        C++ class to implement a css::ui::dialogs::XDialogClosedListener
     */
     class SVT_DLLPUBLIC DialogClosedListener :
-        public ::cppu::WeakImplHelper1< ::com::sun::star::ui::dialogs::XDialogClosedListener >
+        public ::cppu::WeakImplHelper1< css::ui::dialogs::XDialogClosedListener >
     {
     private:
         /**
@@ -51,10 +51,10 @@ namespace svt
         inline void SetDialogClosedLink( const Link<css::ui::dialogs::DialogClosedEvent*,void>& rLink ) { m_aDialogClosedLink = rLink; }
 
         // XDialogClosedListener methods
-        virtual void SAL_CALL   dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL   dialogClosed( const css::ui::dialogs::DialogClosedEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XEventListener methods
-        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;
     };
 
 
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index 532b47ed1ee4..9fdd5ec22b72 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -624,8 +624,7 @@ namespace svt
             The column ID of the cell.
         @return
             The XAccessible interface of the specified cell. */
-        virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::accessibility::XAccessible >
+        virtual css::uno::Reference< css::accessibility::XAccessible >
         CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnPos ) override;
 
         /** @return  The count of additional controls of the control area. */
@@ -636,8 +635,7 @@ namespace svt
                 The 0-based index of the control.
             @return
                 The XAccessible interface of the specified control. */
-        virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::accessibility::XAccessible >
+        virtual css::uno::Reference< css::accessibility::XAccessible >
         CreateAccessibleControl( sal_Int32 nIndex ) override;
 
         /** Creates the accessible object of a column header.
@@ -645,8 +643,7 @@ namespace svt
                 The column ID of the header.
             @return
                 The XAccessible interface of the specified column header. */
-        virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::accessibility::XAccessible >
+        virtual css::uno::Reference< css::accessibility::XAccessible >
         CreateAccessibleRowHeader( sal_Int32 _nRow ) override;
 
         /** Sets focus to current cell of the data table. */
@@ -655,8 +652,7 @@ namespace svt
         virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override;
         virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) override;
 
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::accessibility::XAccessible > CreateAccessibleCheckBoxCell(long _nRow, sal_uInt16 _nColumnPos,const TriState& eState);
+        css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCheckBoxCell(long _nRow, sal_uInt16 _nColumnPos,const TriState& eState);
     protected:
         // creates the accessible which wraps the active cell
         void    implCreateActiveAccessible( );
diff --git a/include/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx
index b1b33282f05d..aee98433402b 100644
--- a/include/svtools/embedhlp.hxx
+++ b/include/svtools/embedhlp.hxx
@@ -55,32 +55,32 @@ class SVT_DLLPUBLIC EmbeddedObjectRef
 public:
     static void DrawPaintReplacement( const Rectangle &rRect, const OUString &rText, OutputDevice *pOut );
     static void DrawShading( const Rectangle &rRect, OutputDevice *pOut );
-    static bool TryRunningState( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& );
+    static bool TryRunningState( const css::uno::Reference < css::embed::XEmbeddedObject >& );
     static void SetGraphicToContainer( const Graphic& rGraphic,
                                         comphelper::EmbeddedObjectContainer& aContainer,
                                         const OUString& aName,
                                         const OUString& aMediaType );
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetGraphicReplacementStream(
+    static css::uno::Reference< css::io::XInputStream > GetGraphicReplacementStream(
                                         sal_Int64 nViewAspect,
-                                        const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&,
+                                        const css::uno::Reference < css::embed::XEmbeddedObject >&,
                                         OUString* pMediaType )
                             throw();
 
-    static bool IsChart(const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj);
-    static bool IsGLChart(const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj);
+    static bool IsChart(const css::uno::Reference < css::embed::XEmbeddedObject >& xObj);
+    static bool IsGLChart(const css::uno::Reference < css::embed::XEmbeddedObject >& xObj);
 
-    const com::sun::star::uno::Reference <com::sun::star::embed::XEmbeddedObject>& operator->() const;
-    const com::sun::star::uno::Reference <com::sun::star::embed::XEmbeddedObject>& GetObject() const;
+    const css::uno::Reference <css::embed::XEmbeddedObject>& operator->() const;
+    const css::uno::Reference <css::embed::XEmbeddedObject>& GetObject() const;
 
     // default constructed object; needs further assignment before it can be used
     EmbeddedObjectRef();
 
     // assign a previously default constructed object
-    void Assign( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect );
+    void Assign( const css::uno::Reference < css::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect );
 
     // create object for a certain view aspect
-    EmbeddedObjectRef( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect );
+    EmbeddedObjectRef( const css::uno::Reference < css::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect );
 
     ~EmbeddedObjectRef();
     EmbeddedObjectRef( const EmbeddedObjectRef& );
@@ -99,7 +99,7 @@ public:
 
     void            SetGraphic( const Graphic& rGraphic, const OUString& rMediaType );
     void            SetGraphicStream(
-                        const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInGrStream,
+                        const css::uno::Reference< css::io::XInputStream >& xInGrStream,
                         const OUString& rMediaType );
 
     void            UpdateReplacement();
diff --git a/include/svtools/embedtransfer.hxx b/include/svtools/embedtransfer.hxx
index 18e27eec5b34..c76c5b4b9734 100644
--- a/include/svtools/embedtransfer.hxx
+++ b/include/svtools/embedtransfer.hxx
@@ -29,7 +29,7 @@ class SVT_DLLPUBLIC SvEmbedTransferHelper : public TransferableHelper
 {
 private:
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > m_xObj;
+    css::uno::Reference< css::embed::XEmbeddedObject > m_xObj;
     Graphic* m_pGraphic;
     sal_Int64 m_nAspect;
 
@@ -43,7 +43,7 @@ protected:
 
 public:
     // object, replacement image, and the aspect
-    SvEmbedTransferHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj,
+    SvEmbedTransferHelper( const css::uno::Reference< css::embed::XEmbeddedObject >& xObj,
                            const Graphic* pGraphic,
                             sal_Int64 nAspect );
     virtual ~SvEmbedTransferHelper();
@@ -51,7 +51,7 @@ public:
     void SetParentShellID( const OUString& rShellID );
 
     static void         FillTransferableObjectDescriptor( TransferableObjectDescriptor& rDesc,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj,
+                            const css::uno::Reference< css::embed::XEmbeddedObject >& xObj,
                             const Graphic* pGraphic,
                             sal_Int64 nAspect );
 };
diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx
index 582a39d0ecc2..b8552cce636b 100644
--- a/include/svtools/fileview.hxx
+++ b/include/svtools/fileview.hxx
@@ -64,10 +64,9 @@ struct FileViewAsyncAction
 class SVT_DLLPUBLIC SvtFileView : public Control
 {
 private:
-    SvtFileView_Impl*       mpImp;
-    bool                    bSortColumn;
-
-    ::com::sun::star::uno::Sequence< OUString > mpBlackList;
+    SvtFileView_Impl*              mpImp;
+    bool                           bSortColumn;
+    css::uno::Sequence< OUString > mpBlackList;
 
     DECL_DLLPRIVATE_LINK_TYPED( HeaderSelect_Impl, HeaderBar*, void );
     DECL_DLLPRIVATE_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar*, void );
@@ -109,12 +108,12 @@ public:
                                 const OUString& rFolderURL,
                                 const OUString& rFilter,
                                 const FileViewAsyncAction* pAsyncDescriptor,
-                                const ::com::sun::star::uno::Sequence< OUString >& rBlackList
+                                const css::uno::Sequence< OUString >& rBlackList
                             );
 
     /** initializes the view with the content of a folder given by an UCB content
     */
-    bool                    Initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent,
+    bool                    Initialize( const css::uno::Reference< css::ucb::XContent>& _xContent,
                                         const OUString& rFilter );
 
     /** reads the current content of the current folder again, and applies the given filter to it
diff --git a/include/svtools/foldertree.hxx b/include/svtools/foldertree.hxx
index eb07abd71e2b..23fc485965e9 100644
--- a/include/svtools/foldertree.hxx
+++ b/include/svtools/foldertree.hxx
@@ -52,7 +52,7 @@ public:
     void FillTreeEntry( SvTreeListEntry* pEntry );
     void FillTreeEntry( const OUString & rUrl, const ::std::vector< std::pair< OUString, OUString > >& rFolders );
     void SetTreePath( OUString const & sUrl );
-    void SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList );
+    void SetBlackList( const css::uno::Sequence< OUString >& rBlackList );
 };
 
 #endif
diff --git a/include/svtools/fontsubstconfig.hxx b/include/svtools/fontsubstconfig.hxx
index 9e58bc67ec21..15493ae45cab 100644
--- a/include/svtools/fontsubstconfig.hxx
+++ b/include/svtools/fontsubstconfig.hxx
@@ -45,7 +45,7 @@ public:
     SvtFontSubstConfig();
     virtual ~SvtFontSubstConfig();
 
-    virtual void                Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) override;
+    virtual void                Notify( const css::uno::Sequence< OUString >& _rPropertyNames) override;
 
     bool                        IsEnabled() const {return bIsEnabled;}
     void                        Enable(bool bSet)  {bIsEnabled = bSet; SetModified();}
diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx
index ae90bc4a1711..dbf22189a4cf 100644
--- a/include/svtools/framestatuslistener.hxx
+++ b/include/svtools/framestatuslistener.hxx
@@ -36,15 +36,15 @@
 namespace svt
 {
 
-class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatusListener,
-                            public ::com::sun::star::frame::XFrameActionListener,
-                            public ::com::sun::star::lang::XComponent,
+class SVT_DLLPUBLIC FrameStatusListener : public css::frame::XStatusListener,
+                            public css::frame::XFrameActionListener,
+                            public css::lang::XComponent,
                             public ::comphelper::OBaseMutex,
                             public ::cppu::OWeakObject
 {
     public:
-        FrameStatusListener( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
-                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame );
+        FrameStatusListener( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                             const css::uno::Reference< css::frame::XFrame >& xFrame );
         virtual ~FrameStatusListener();
 
         // methods to support status forwarder, known by the old sfx2 toolbox controller implementation
@@ -53,32 +53,32 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu
         void unbindListener();
 
         // XInterface
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
 
         // 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;
 
         // 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;
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override = 0;
 
         // XFrameActionListener
-        virtual void SAL_CALL frameAction( const com::sun::star::frame::FrameActionEvent& Action ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& Action ) throw ( css::uno::RuntimeException, std::exception ) override;
 
     protected:
         struct Listener
         {
-            Listener( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) :
+            Listener( const css::util::URL& rURL, const css::uno::Reference< css::frame::XDispatch >& rDispatch ) :
                 aURL( rURL ), xDispatch( rDispatch ) {}
 
-            ::com::sun::star::util::URL aURL;
-            ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
+            css::util::URL aURL;
+            css::uno::Reference< css::frame::XDispatch > xDispatch;
         };
 
         typedef std::unordered_map< OUString,
@@ -86,11 +86,11 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu
                                     OUStringHash,
                                     std::equal_to< OUString > > URLToDispatchMap;
 
-        bool                                                                                m_bInitialized : 1,
-                                                                                            m_bDisposed : 1;
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >                 m_xFrame;
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >        m_xContext;
-        URLToDispatchMap                                                                    m_aListenerMap;
+        bool                                                      m_bInitialized : 1,
+                                                                  m_bDisposed : 1;
+        css::uno::Reference< css::frame::XFrame >                 m_xFrame;
+        css::uno::Reference< css::uno::XComponentContext >        m_xContext;
+        URLToDispatchMap                                          m_aListenerMap;
 };
 
 }
diff --git a/include/svtools/generictoolboxcontroller.hxx b/include/svtools/generictoolboxcontroller.hxx
index 1bd2c6b1f0b0..65fb6619ec7c 100644
--- a/include/svtools/generictoolboxcontroller.hxx
+++ b/include/svtools/generictoolboxcontroller.hxx
@@ -31,21 +31,21 @@ struct ExecuteInfo;
 class SVT_DLLPUBLIC GenericToolboxController : public svt::ToolboxController
 {
     public:
-        GenericToolboxController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
-                                  const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
+        GenericToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                                  const css::uno::Reference< css::frame::XFrame >& rFrame,
                                   ToolBox* pToolBox,
                                   sal_uInt16   nID,
                                   const OUString& aCommand );
         virtual ~GenericToolboxController();
 
         // XComponent
-        virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
 
         // XToolbarController
-        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
 
          DECL_STATIC_LINK_TYPED( GenericToolboxController, ExecuteHdl_Impl, void*, void );
 
diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx
index 9b0afa500eea..3ba669fef55e 100644
--- a/include/svtools/genericunodialog.hxx
+++ b/include/svtools/genericunodialog.hxx
@@ -58,9 +58,9 @@ namespace svt
 
 
 
-    typedef ::cppu::WeakImplHelper3 <   com::sun::star::ui::dialogs::XExecutableDialog
-                                    ,   com::sun::star::lang::XServiceInfo
-                                    ,   com::sun::star::lang::XInitialization
+    typedef ::cppu::WeakImplHelper3 <   css::ui::dialogs::XExecutableDialog
+                                    ,   css::lang::XServiceInfo
+                                    ,   css::lang::XInitialization
                                     >   OGenericUnoDialogBase;
 
     /** abstract base class for implementing UNO objects representing dialogs (com.sun.star.awt::XDialog)
@@ -82,43 +82,43 @@ namespace svt
         bool                        m_bNeedInitialization : 1;  /// do we need to be initialized before any other API call is allowed?
 
         // <properties>
-        OUString                                                 m_sTitle;   /// title of the dialog
-        com::sun::star::uno::Reference<com::sun::star::awt::XWindow>    m_xParent;  /// parent window
+        OUString                                         m_sTitle;   /// title of the dialog
+        css::uno::Reference<css::awt::XWindow>           m_xParent;  /// parent window
         // </properties>
 
-        com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> m_aContext;
+        css::uno::Reference<css::uno::XComponentContext> m_aContext;
 
     public:
         inline bool needInitialization() const { return m_bNeedInitialization && !m_bInitialized; }
 
     protected:
-        OGenericUnoDialog(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& _rxContext);
+        OGenericUnoDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxContext);
         virtual ~OGenericUnoDialog();
 
     public:
         // UNO
         DECLARE_UNO3_DEFAULTS(OGenericUnoDialog, OGenericUnoDialogBase)
-        virtual com::sun::star::uno::Any SAL_CALL queryInterface(const com::sun::star::uno::Type& _rType) throw (com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override;
 
         // XTypeProvider
-        virtual com::sun::star::uno::Sequence<com::sun::star::uno::Type> SAL_CALL getTypes(  ) throw(com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(com::sun::star::uno::RuntimeException, std::exception) override = 0;
+        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 = 0;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) override = 0;
-        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) override = 0;
+        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override = 0;
+        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 = 0;
 
         // OPropertySetHelper
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue ) throw(com::sun::star::uno::Exception, std::exception) override;
-        virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& rConvertedValue, com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const com::sun::star::uno::Any& rValue) throw(com::sun::star::lang::IllegalArgumentException) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw(css::uno::Exception, std::exception) override;
+        virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue) throw(css::lang::IllegalArgumentException) 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;
+        virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int16 SAL_CALL execute(  ) throw(css::uno::RuntimeException, std::exception) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) throw(com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
     protected:
         /** create the concret dialog instance. note that m_aMutex is not locked when this method get's called,
@@ -141,7 +141,7 @@ namespace svt
             tries to extract an com.sun.star.beans::PropertyValue from the value an pass it to the
             com.sun.star.beans::XPropertySet interface of the object.
         */
-        virtual void implInitialize(const com::sun::star::uno::Any& _rValue);
+        virtual void implInitialize(const css::uno::Any& _rValue);
 
     private:
         DECL_LINK_TYPED( OnDialogDying, VclWindowEvent&, void );
@@ -170,7 +170,7 @@ namespace svt
             :m_aGuard( _rDialog.GetMutex() )
         {
             if ( _rDialog.needInitialization() )
-                throw ::com::sun::star::lang::NotInitializedException();
+                throw css::lang::NotInitializedException();
         }
 
     private:
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index c3e01ddb7df6..ccb489e0ce64 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -492,7 +492,7 @@ public:
     // properties and return these in a vector. Note: this implementation
     // will cater for XNameContainer objects and deepinspect any containees
     // if they exist
-    static void InspectForGraphicObjectImageURL( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIf, std::vector< OUString >& rvEmbedImgUrls );
+    static void InspectForGraphicObjectImageURL( const css::uno::Reference< css::uno::XInterface >& rxIf, std::vector< OUString >& rvEmbedImgUrls );
 
     // create CropScaling information
     // fWidth, fHeight: object size
diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx
index 7474270e77b4..edbba5d95452 100644
--- a/include/svtools/headbar.hxx
+++ b/include/svtools/headbar.hxx
@@ -259,8 +259,7 @@ private:
     VCLXHeaderBar*      m_pVCLXHeaderBar;
 
 
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible >
+    css::uno::Reference< css::accessibility::XAccessible >
                         mxAccessible;
 
     using Window::ImplInit;
@@ -349,10 +348,9 @@ public:
     inline bool         IsDragable() const                          { return mbDragable; }
 
     /** Creates and returns the accessible object of the header bar. */
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible >  CreateAccessible() override;
-    void SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface( bool bCreate ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible >  CreateAccessible() override;
+    void SetAccessible( css::uno::Reference< css::accessibility::XAccessible > );
+    virtual css::uno::Reference< css::awt::XWindowPeer > GetComponentInterface( bool bCreate ) override;
 
 };
 
diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx
index a8bb1f3093a0..9a84eb86519c 100644
--- a/include/svtools/htmlcfg.hxx
+++ b/include/svtools/htmlcfg.hxx
@@ -37,8 +37,8 @@ struct HtmlOptions_Impl;
 class SVT_DLLPUBLIC SvxHtmlOptions : public utl::ConfigItem
 {
     HtmlOptions_Impl*pImp;
-    static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
-    void Load( const com::sun::star::uno::Sequence< OUString >& rPropertyNames );
+    static const css::uno::Sequence<OUString>& GetPropertyNames();
+    void Load( const css::uno::Sequence< OUString >& rPropertyNames );
 
     virtual void    ImplCommit() override;
 
@@ -46,7 +46,7 @@ public:
     SvxHtmlOptions();
     virtual ~SvxHtmlOptions();
 
-    virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) override;
+    virtual void Notify( const css::uno::Sequence< OUString >& _rPropertyNames) override;
 
     sal_uInt16      GetFontSize(sal_uInt16 nPos) const;
     void        SetFontSize(sal_uInt16 nPos, sal_uInt16 nSize);
diff --git a/include/svtools/imageresourceaccess.hxx b/include/svtools/imageresourceaccess.hxx
index fbfbeb0bdc42..845bc43f0380 100644
--- a/include/svtools/imageresourceaccess.hxx
+++ b/include/svtools/imageresourceaccess.hxx
@@ -48,22 +48,22 @@ namespace svt
             an SvStream for this image.
 
             This method works for arbitrary URLs denoting an image, since the
-            com::sun::star::graphics::GraphicsProvider service is used
+            css::graphics::GraphicsProvider service is used
             to resolve the URL. However, obtaining the stream is expensive (since
             the image must be copied), so you are strongly encouraged to only use it
             when you know that the image is small enough.
         */
         SVT_DLLPUBLIC SvStream*   getImageStream(
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
+                    const css::uno::Reference< css::uno::XComponentContext >& _rxContext,
                     const OUString& _rImageResourceURL
                 );
 
         /** for a given URL of an image within a resource ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ), this method retrieves
-            an com::sun::star::io::XInputStream for this image.
+            an css::io::XInputStream for this image.
         */
-        SVT_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+        SVT_DLLPUBLIC css::uno::Reference< css::io::XInputStream >
                 getImageXStream(
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
+                    const css::uno::Reference< css::uno::XComponentContext >& _rxContext,
                     const OUString& _rImageResourceURL
                 );
     }
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index 8433d8f02d46..9e4c4bc3ab84 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -316,8 +316,7 @@ public:
     // ACCESSIBILITY ==========================================================
 
     /** Creates and returns the accessible object of the Box. */
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible > CreateAccessible() override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
 };
 
 #endif // INCLUDED_SVTOOLS_IVCTRL_HXX
diff --git a/include/svtools/javacontext.hxx b/include/svtools/javacontext.hxx
index 818806a52e06..dc16ac764c4f 100644
--- a/include/svtools/javacontext.hxx
+++ b/include/svtools/javacontext.hxx
@@ -34,7 +34,7 @@ namespace svt
 //generated class. This conflicts with other libraries if they use the same inline
 //class.
     class SVT_DLLPUBLIC JavaContext :
-        public com::sun::star::uno::XCurrentContext
+        public css::uno::XCurrentContext
     {
 
     public:
@@ -44,35 +44,31 @@ namespace svt
             particular Request then the message box is shown. Afterwards
             nothing happens.
          */
-        JavaContext( const com::sun::star::uno::Reference<
-                     com::sun::star::uno::XCurrentContext> & ctx,
+        JavaContext( const css::uno::Reference< css::uno::XCurrentContext> & ctx,
                      bool bReportErrorOnce = true );
         virtual ~JavaContext();
 
         // XInterface
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-            const ::com::sun::star::uno::Type& aType )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface(
+            const css::uno::Type& aType )
+            throw (css::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL acquire() throw () override;
 
         virtual void SAL_CALL release() throw () override;
 
         // XCurrentContext
-        virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name )
-            throw (com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getValueByName( const OUString& Name )
+            throw (css::uno::RuntimeException, std::exception) override;
 
     private:
         JavaContext(JavaContext&) = delete;
         JavaContext& operator = (JavaContext&) = delete;
 
-        oslInterlockedCount m_aRefCount;
-
-        com::sun::star::uno::Reference<
-            com::sun::star::uno::XCurrentContext > m_xNextContext;
-        com::sun::star::uno::Reference<
-            com::sun::star::task::XInteractionHandler> m_xHandler;
-        bool m_bShowErrorsOnce;
+        oslInterlockedCount                                  m_aRefCount;
+        css::uno::Reference< css::uno::XCurrentContext >     m_xNextContext;
+        css::uno::Reference< css::task::XInteractionHandler> m_xHandler;
+        bool                                                 m_bShowErrorsOnce;
     };
 }
 
diff --git a/include/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx
index 7d598ff0e4ea..cb6cfa9bed24 100644
--- a/include/svtools/javainteractionhandler.hxx
+++ b/include/svtools/javainteractionhandler.hxx
@@ -36,24 +36,23 @@ namespace svt
 //class.
 
 class SVT_DLLPUBLIC JavaInteractionHandler:
-        public com::sun::star::task::XInteractionHandler
+        public css::task::XInteractionHandler
 {
 public:
     JavaInteractionHandler(bool bReportErrorOnce = true);
 
     // XInterface
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-        const ::com::sun::star::uno::Type& aType )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface(
+        const css::uno::Type& aType )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL acquire() throw() override;
 
     virtual void SAL_CALL release() throw() override;
 
     // XCurrentContext
-    virtual void SAL_CALL handle( const com::sun::star::uno::Reference<
-                                  com::sun::star::task::XInteractionRequest >& Request )
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& Request )
+        throw (css::uno::RuntimeException, std::exception) override;
 
 private:
     oslInterlockedCount m_aRefCount;
diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx
index 4b906aee5a7b..d88b6d63ae97 100644
--- a/include/svtools/openfiledroptargetlistener.hxx
+++ b/include/svtools/openfiledroptargetlistener.hxx
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace uno {
 
 /** DropTargetListener that takes care of opening a file when it is dropped in the frame.
 */
-class SVT_DLLPUBLIC OpenFileDropTargetListener : public ::cppu::WeakImplHelper1< ::com::sun::star::datatransfer::dnd::XDropTargetListener >
+class SVT_DLLPUBLIC OpenFileDropTargetListener : public ::cppu::WeakImplHelper1< css::datatransfer::dnd::XDropTargetListener >
 {
     private:
         /// uno service manager to create necessary services
diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx
index a03ca8f34fc3..f9faa180c436 100644
--- a/include/svtools/parhtml.hxx
+++ b/include/svtools/parhtml.hxx
@@ -220,16 +220,14 @@ protected:
 
 private:
     /// parse meta options into XDocumentProperties and encoding
-    bool ParseMetaOptionsImpl( const ::com::sun::star::uno::Reference<
-                ::com::sun::star::document::XDocumentProperties>&,
+    bool ParseMetaOptionsImpl( const css::uno::Reference< css::document::XDocumentProperties>&,
             SvKeyValueIterator*,
             const HTMLOptions&,
             rtl_TextEncoding& rEnc );
 
 public:
     /// overriding method must call this implementation!
-    virtual bool ParseMetaOptions( const ::com::sun::star::uno::Reference<
-                ::com::sun::star::document::XDocumentProperties>&,
+    virtual bool ParseMetaOptions( const css::uno::Reference< css::document::XDocumentProperties>&,
             SvKeyValueIterator* );
 
     bool ParseScriptOptions( OUString& rLangString, const OUString&, HTMLScriptLanguage& rLang,
diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx
index 8efd1ed82dc0..b065c50eea9f 100644
--- a/include/svtools/popupmenucontrollerbase.hxx
+++ b/include/svtools/popupmenucontrollerbase.hxx
@@ -47,58 +47,58 @@ namespace svt
     struct PopupMenuControllerBaseDispatchInfo;
 
     typedef ::cppu::WeakComponentImplHelper7<
-                        com::sun::star::lang::XServiceInfo            ,
-                        com::sun::star::frame::XPopupMenuController ,
-                        com::sun::star::lang::XInitialization         ,
-                        com::sun::star::frame::XStatusListener        ,
-                        com::sun::star::awt::XMenuListener            ,
-                        com::sun::star::frame::XDispatchProvider      ,
-                        com::sun::star::frame::XDispatch > PopupMenuControllerBaseType;
+                        css::lang::XServiceInfo            ,
+                        css::frame::XPopupMenuController ,
+                        css::lang::XInitialization         ,
+                        css::frame::XStatusListener        ,
+                        css::awt::XMenuListener            ,
+                        css::frame::XDispatchProvider      ,
+                        css::frame::XDispatch > PopupMenuControllerBaseType;
 
     class SVT_DLLPUBLIC PopupMenuControllerBase : protected ::comphelper::OBaseMutex,   // Struct for right initalization of mutex member! Must be first of baseclasses.
                                                   public PopupMenuControllerBaseType
     {
         public:
-            PopupMenuControllerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
+            PopupMenuControllerBase( const css::uno::Reference< css::uno::XComponentContext >& xContext );
             virtual ~PopupMenuControllerBase();
 
             // XServiceInfo
-            virtual OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0;
-            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 = 0;
+            virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override = 0;
+            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 = 0;
 
             // XPopupMenuController
-            virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL updatePopupMenu() throw (css::uno::RuntimeException, std::exception) override;
 
             // XInitialization
-            virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
             // XStatusListener
-            virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0;
+            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override = 0;
 
             // XMenuListener
-            virtual void SAL_CALL itemHighlighted( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL itemDeactivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL itemHighlighted( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL itemDeactivated( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
 
             // XDispatchProvider
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) 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 >& lDescriptor ) 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& sTarget, sal_Int32 nFlags ) 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 >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) override;
 
             // XDispatch
-            virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& seqProperties ) throw( ::com::sun::star::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 dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& seqProperties ) throw( css::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;
 
             // 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;
 
-            void dispatchCommand( const OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs );
+            void dispatchCommand( const OUString& sCommandURL, const css::uno::Sequence< css::beans::PropertyValue >& rArgs );
 
     protected:
-            void throwIfDisposed() throw ( ::com::sun::star::uno::RuntimeException );
+            void throwIfDisposed() throw ( css::uno::RuntimeException );
 
             /** helper method to cause statusChanged is called once for the given command url */
             void SAL_CALL updateCommand( const OUString& rCommandURL );
@@ -107,21 +107,21 @@ namespace svt
             */
             virtual void SAL_CALL disposing() override;
 
-            static void resetPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
+            static void resetPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
             virtual void impl_setPopupMenu();
             static OUString determineBaseURL( const OUString& aURL );
 
             DECL_STATIC_LINK_TYPED( PopupMenuControllerBase, ExecuteHdl_Impl, void*, void );
 
 
-            bool                                                                             m_bInitialized;
-            OUString                                                                    m_aCommandURL;
-            OUString                                                                    m_aBaseURL;
-            OUString                                                                    m_aModuleName;
-            ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >           m_xDispatch;
-            ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >              m_xFrame;
-            ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >      m_xURLTransformer;
-            ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >            m_xPopupMenu;
+            bool                                                   m_bInitialized;
+            OUString                                               m_aCommandURL;
+            OUString                                               m_aBaseURL;
+            OUString                                               m_aModuleName;
+            css::uno::Reference< css::frame::XDispatch >           m_xDispatch;
+            css::uno::Reference< css::frame::XFrame >              m_xFrame;
+            css::uno::Reference< css::util::XURLTransformer >      m_xURLTransformer;
+            css::uno::Reference< css::awt::XPopupMenu >            m_xPopupMenu;
     };
 }
 
diff --git a/include/svtools/popupwindowcontroller.hxx b/include/svtools/popupwindowcontroller.hxx
index 68f057a93d7a..73475c43c5f0 100644
--- a/include/svtools/popupwindowcontroller.hxx
+++ b/include/svtools/popupwindowcontroller.hxx
@@ -33,41 +33,41 @@ namespace svt
 {
 class PopupWindowControllerImpl;
 
-class SVT_DLLPUBLIC PopupWindowController : public svt::ToolboxController, public ::com::sun::star::lang::XServiceInfo
+class SVT_DLLPUBLIC PopupWindowController : public svt::ToolboxController, public css::lang::XServiceInfo
 {
 public:
-    PopupWindowController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
-                           const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
+    PopupWindowController( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                           const css::uno::Reference< css::frame::XFrame >& xFrame,
                            const OUString& aCommandURL );
     virtual ~PopupWindowController();
 
     virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) = 0;
 
     // XInterface
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0;
-    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 = 0;
+    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override = 0;
+    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 = 0;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, 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 dispose() throw (css::uno::RuntimeException, std::exception) override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
 
     // XToolbarController
-    virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL click() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL doubleClick() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override;
 private:
     std::unique_ptr< PopupWindowControllerImpl >  mxImpl;
 };
diff --git a/include/svtools/restartdialog.hxx b/include/svtools/restartdialog.hxx
index bede9ed58fbe..e1ca07d34479 100644
--- a/include/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
@@ -39,8 +39,7 @@ enum RestartReason {
 
 // Must be called with the solar mutex locked:
 SVT_DLLPUBLIC void executeRestartDialog(
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
-        const & context,
+    css::uno::Reference< css::uno::XComponentContext > const & context,
     vcl::Window * parent, RestartReason reason);
 
 }
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 1c606f8ce400..a5d38f05bbb9 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -796,7 +796,7 @@ public:
 
     void            DrawTicks();
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
 };
 
 #endif // INCLUDED_SVTOOLS_RULER_HXX
diff --git a/include/svtools/scriptedtext.hxx b/include/svtools/scriptedtext.hxx
index af3b82634e12..5ddb37bd8daf 100644
--- a/include/svtools/scriptedtext.hxx
+++ b/include/svtools/scriptedtext.hxx
@@ -75,7 +75,7 @@ public:
                                     The break iterator for iterating through the script portions. */
     void                        SetText(
                                     const OUString& _rText,
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& _xBreakIter );
+                                    const css::uno::Reference< css::i18n::XBreakIterator >& _xBreakIter );
 
                                 /** Returns a size struct containing the width and height of the text in the current output device.
                                     @return  A size struct with the text dimensions. */
diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx
index db58d6867cd1..2ae4481f0899 100644
--- a/include/svtools/statusbarcontroller.hxx
+++ b/include/svtools/statusbarcontroller.hxx
@@ -38,67 +38,67 @@ namespace svt
 {
 
 class SVT_DLLPUBLIC StatusbarController :
-                            public ::com::sun::star::frame::XStatusbarController,
+                            public css::frame::XStatusbarController,
                             public ::comphelper::OBaseMutex,
                             public ::cppu::OWeakObject
 {
     public:
-        StatusbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
-                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
+        StatusbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                             const css::uno::Reference< css::frame::XFrame >& xFrame,
                              const OUString& aCommandURL,
                              unsigned short       nID );
         StatusbarController();
         virtual ~StatusbarController();
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getFrameInterface() const;
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > getURLTransformer() const;
+        css::uno::Reference< css::frame::XFrame > getFrameInterface() const;
+        css::uno::Reference< css::util::XURLTransformer > getURLTransformer() const;
 
         ::Rectangle getControlRect() const;
 
         // XInterface
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
         // XUpdatable
-        virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL update() 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;
 
         // 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;
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
 
         // XStatusbarController
-        virtual sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos,
+        virtual sal_Bool SAL_CALL mouseButtonDown( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL mouseMove( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL mouseButtonUp( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL command( const css::awt::Point& aPos,
                                        ::sal_Int32 nCommand,
                                        sal_Bool bMouseEvent,
-                                       const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics,
-                                     const ::com::sun::star::awt::Rectangle& rOutputRectangle,
-                                     ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL click( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL doubleClick( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+                                       const css::uno::Any& aData ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL paint( const css::uno::Reference< css::awt::XGraphics >& xGraphics,
+                                     const css::awt::Rectangle& rOutputRectangle,
+                                     ::sal_Int32 nStyle ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL click( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL doubleClick( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception) override;
 
     protected:
         struct Listener
         {
-            Listener( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) :
+            Listener( const css::util::URL& rURL, const css::uno::Reference< css::frame::XDispatch >& rDispatch ) :
                 aURL( rURL ), xDispatch( rDispatch ) {}
 
-            ::com::sun::star::util::URL aURL;
-            ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
+            css::util::URL                               aURL;
+            css::uno::Reference< css::frame::XDispatch > xDispatch;
         };
 
         typedef std::unordered_map< OUString,
@@ -112,20 +112,20 @@ class SVT_DLLPUBLIC StatusbarController :
 
         // execute methods
         // execute bound status bar controller command/execute various commands
-        void execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs );
-        void execute( const OUString& aCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs );
-
-        bool                                                                                m_bInitialized : 1,
-                                                                                            m_bDisposed : 1;
-        unsigned short                                                                      m_nID;
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >                 m_xFrame;
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >                  m_xParentWindow;
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >        m_xContext;
-        OUString                                                                       m_aCommandURL;
-        URLToDispatchMap                                                                    m_aListenerMap;
-        ::cppu::OMultiTypeInterfaceContainerHelper                                          m_aListenerContainer;   /// container for ALL Listener
-        mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer;
-        ::com::sun::star::uno::Reference< ::com::sun::star::ui::XStatusbarItem >           m_xStatusbarItem;
+        void execute( const css::uno::Sequence< css::beans::PropertyValue >& aArgs );
+        void execute( const OUString& aCommand, const css::uno::Sequence< css::beans::PropertyValue >& aArgs );
+
+        bool                                                      m_bInitialized : 1,
+                                                                  m_bDisposed : 1;
+        unsigned short                                            m_nID;
+        css::uno::Reference< css::frame::XFrame >                 m_xFrame;
+        css::uno::Reference< css::awt::XWindow >                  m_xParentWindow;
+        css::uno::Reference< css::uno::XComponentContext >        m_xContext;
+        OUString                                                  m_aCommandURL;
+        URLToDispatchMap                                          m_aListenerMap;
+        ::cppu::OMultiTypeInterfaceContainerHelper                m_aListenerContainer;   /// container for ALL Listener
+        mutable css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer;
+        css::uno::Reference< css::ui::XStatusbarItem >            m_xStatusbarItem;
 };
 
 }
diff --git a/include/svtools/svmedit.hxx b/include/svtools/svmedit.hxx
index 07f6510f50f3..3b86f8fbc9fd 100644
--- a/include/svtools/svmedit.hxx
+++ b/include/svtools/svmedit.hxx
@@ -32,8 +32,7 @@ class SVT_DLLPUBLIC MultiLineEdit : public VclMultiLineEdit
 public:
     MultiLineEdit( vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
-    GetComponentInterface(bool bCreate = true) override;
+    virtual css::uno::Reference< css::awt::XWindowPeer > GetComponentInterface(bool bCreate = true) override;
 };
 
 
diff --git a/include/svtools/table/tablemodel.hxx b/include/svtools/table/tablemodel.hxx
index 94265a8ed02e..a134575cba56 100644
--- a/include/svtools/table/tablemodel.hxx
+++ b/include/svtools/table/tablemodel.hxx
@@ -225,7 +225,7 @@ namespace svt { namespace table
 
         /** retrieves the horizontal alignment to be used for content in this cell
         */
-        virtual ::com::sun::star::style::HorizontalAlignment getHorizontalAlign() = 0;
+        virtual css::style::HorizontalAlignment getHorizontalAlign() = 0;
 
         /// deletes the column model instance
         virtual ~IColumnModel() { }
@@ -336,7 +336,7 @@ namespace svt { namespace table
 
         /** retrieves the content of the given cell
         */
-        virtual void getCellContent( ColPos const i_col, RowPos const i_row, ::com::sun::star::uno::Any& o_cellContent ) = 0;
+        virtual void getCellContent( ColPos const i_col, RowPos const i_row, css::uno::Any& o_cellContent ) = 0;
 
         /** returns an object which should be displayed as tooltip for the given cell
 
@@ -353,11 +353,11 @@ namespace svt { namespace table
             @param o_cellToolTip
                 takes the tooltip object upon return.
         */
-        virtual void getCellToolTip( ColPos const i_col, RowPos const i_row, ::com::sun::star::uno::Any & o_cellToolTip ) = 0;
+        virtual void getCellToolTip( ColPos const i_col, RowPos const i_row, css::uno::Any & o_cellToolTip ) = 0;
 
         /** retrieves title of a given row
         */
-        virtual ::com::sun::star::uno::Any      getRowHeading( RowPos const i_rowPos ) const = 0;
+        virtual css::uno::Any      getRowHeading( RowPos const i_rowPos ) const = 0;
 
         /** returns the color to be used for rendering the grid lines.
 
@@ -429,7 +429,7 @@ namespace svt { namespace table
 
         /** determines the vertical alignment of content within a cell
         */
-        virtual ::com::sun::star::style::VerticalAlignment getVerticalAlign() const = 0;
+        virtual css::style::VerticalAlignment getVerticalAlign() const = 0;
 
         /** returns an adapter to the sorting functionality of the model
 
diff --git a/include/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx
index f34e386d82d6..f11729347c7c 100644
--- a/include/svtools/table/tablerenderer.hxx
+++ b/include/svtools/table/tablerenderer.hxx
@@ -232,7 +232,7 @@ namespace svt { namespace table
                 given area.
         */
         virtual bool    FitsIntoCell(
-                            ::com::sun::star::uno::Any const & i_cellContent,
+                            css::uno::Any const & i_cellContent,
                             OutputDevice& i_targetDevice, Rectangle const & i_targetArea
                         ) const = 0;
 
@@ -246,7 +246,7 @@ namespace svt { namespace table
                 <TRUE/> if and only if the content could be formatted as string
         */
         virtual bool    GetFormattedCellString(
-                            ::com::sun::star::uno::Any const & i_cellValue,
+                            css::uno::Any const & i_cellValue,
                             OUString & o_cellString
                         ) const = 0;
 
diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx
index 9b3ac7a709c8..d749ca40727c 100644
--- a/include/svtools/toolboxcontroller.hxx
+++ b/include/svtools/toolboxcontroller.hxx
@@ -61,55 +61,55 @@ class SVT_DLLPUBLIC ToolboxController :
     private:
         bool  m_bSupportVisible;
     public:
-        ToolboxController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
-                           const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
+        ToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                           const css::uno::Reference< css::frame::XFrame >& xFrame,
                            const OUString& aCommandURL );
         ToolboxController();
         virtual ~ToolboxController();
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getFrameInterface() const;
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getContext() const;
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > getLayoutManager() const;
+        css::uno::Reference< css::frame::XFrame > getFrameInterface() const;
+        const css::uno::Reference< css::uno::XComponentContext >& getContext() const;
+        css::uno::Reference< css::frame::XLayoutManager > getLayoutManager() const;
 
         void updateStatus( const OUString& aCommandURL );
         void updateStatus();
 
         // XInterface
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
         virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
             throw (css::uno::RuntimeException, std::exception) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
         // XUpdatable
-        virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL update() 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;
 
         // XEventListener
         using cppu::OPropertySetHelper::disposing;
-        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;
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override = 0;
 
         // XToolbarController
-        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL click() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL doubleClick() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override;
         // OPropertySetHelper
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue ) throw(com::sun::star::uno::Exception, std::exception) override;
-        virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& rConvertedValue, com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const com::sun::star::uno::Any& rValue) throw(com::sun::star::lang::IllegalArgumentException) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw(css::uno::Exception, std::exception) override;
+        virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue) throw(css::lang::IllegalArgumentException) 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 css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
         // OPropertyArrayUsageHelper
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
@@ -118,7 +118,7 @@ class SVT_DLLPUBLIC ToolboxController :
         const OUString& getCommandURL() const { return  m_aCommandURL; }
         const OUString& getModuleName() const { return m_sModuleName; }
 
-        void dispatchCommand( const OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs, const OUString &rTarget = OUString() );
+        void dispatchCommand( const OUString& sCommandURL, const css::uno::Sequence< css::beans::PropertyValue >& rArgs, const OUString &rTarget = OUString() );
 
         void enable( bool bEnable );
 
@@ -127,22 +127,22 @@ class SVT_DLLPUBLIC ToolboxController :
         void setSupportVisibleProperty(bool bValue);
         struct Listener
         {
-            Listener( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) :
+            Listener( const css::util::URL& rURL, const css::uno::Reference< css::frame::XDispatch >& rDispatch ) :
                 aURL( rURL ), xDispatch( rDispatch ) {}
 
-            ::com::sun::star::util::URL aURL;
-            ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
+            css::util::URL aURL;
+            css::uno::Reference< css::frame::XDispatch > xDispatch;
         };
 
         struct DispatchInfo
         {
-            ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > mxDispatch;
-            const ::com::sun::star::util::URL maURL;
-            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > maArgs;
+            css::uno::Reference< css::frame::XDispatch > mxDispatch;
+            const css::util::URL maURL;
+            const css::uno::Sequence< css::beans::PropertyValue > maArgs;
 
-            DispatchInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& xDispatch,
-                          const ::com::sun::star::util::URL& rURL,
-                          const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs )
+            DispatchInfo( const css::uno::Reference< css::frame::XDispatch >& xDispatch,
+                          const css::util::URL& rURL,
+                          const css::uno::Sequence< css::beans::PropertyValue >& rArgs )
                 : mxDispatch( xDispatch )
                 , maURL( rURL )
                 , maArgs( rArgs )
@@ -163,22 +163,22 @@ class SVT_DLLPUBLIC ToolboxController :
         void unbindListener();
         bool isBound() const;
         // TODO remove
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > getURLTransformer() const { return m_xUrlTransformer;}
+        css::uno::Reference< css::util::XURLTransformer > getURLTransformer() const { return m_xUrlTransformer;}
         // TODO remove
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getParent() const { return m_xParentWindow;}
-
-        bool                                                                                m_bInitialized : 1,
-                                                                                            m_bDisposed : 1;
-        sal_uInt16                                                                          m_nToolBoxId;
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >                 m_xFrame;
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >        m_xContext;
-        OUString                                                                            m_aCommandURL;
-        URLToDispatchMap                                                                    m_aListenerMap;
-        ::cppu::OMultiTypeInterfaceContainerHelper                                          m_aListenerContainer;   /// container for ALL Listener
-
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >          m_xParentWindow;
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xUrlTransformer;
-        OUString m_sModuleName;
+        css::uno::Reference< css::awt::XWindow > getParent() const { return m_xParentWindow;}
+
+        bool                                                      m_bInitialized : 1,
+                                                                  m_bDisposed : 1;
+        sal_uInt16                                                m_nToolBoxId;
+        css::uno::Reference< css::frame::XFrame >                 m_xFrame;
+        css::uno::Reference< css::uno::XComponentContext >        m_xContext;
+        OUString                                                  m_aCommandURL;
+        URLToDispatchMap                                          m_aListenerMap;
+        ::cppu::OMultiTypeInterfaceContainerHelper                m_aListenerContainer;   /// container for ALL Listener
+
+        css::uno::Reference< css::awt::XWindow >                  m_xParentWindow;
+        css::uno::Reference< css::util::XURLTransformer >         m_xUrlTransformer;
+        OUString                                                  m_sModuleName;
 };
 
 }
diff --git a/include/svtools/toolpanel/decklayouter.hxx b/include/svtools/toolpanel/decklayouter.hxx
index 37b2a828d0a2..04de02cee180 100644
--- a/include/svtools/toolpanel/decklayouter.hxx
+++ b/include/svtools/toolpanel/decklayouter.hxx
@@ -78,10 +78,10 @@ namespace svt
         /** retrieves the XAccessible implementation for the <code>i_nChildIndex</code>'th child in the XAccessible
             hierarchy.
         */
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        virtual css::uno::Reference< css::accessibility::XAccessible >
                             GetAccessibleChild(
                                 const size_t i_nChildIndex,
-                                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
+                                const css::uno::Reference< css::accessibility::XAccessible >& i_rParentAccessible
                             ) = 0;
 
         virtual ~IDeckLayouter()
diff --git a/include/svtools/toolpanel/drawerlayouter.hxx b/include/svtools/toolpanel/drawerlayouter.hxx
index ccca954efacc..0e123be0b499 100644
--- a/include/svtools/toolpanel/drawerlayouter.hxx
+++ b/include/svtools/toolpanel/drawerlayouter.hxx
@@ -51,10 +51,10 @@ namespace svt
         virtual void        Destroy() override;
         virtual void        SetFocusToPanelSelector() override;
         virtual size_t      GetAccessibleChildCount() const override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        virtual css::uno::Reference< css::accessibility::XAccessible >
                             GetAccessibleChild(
                                 const size_t i_nChildIndex,
-                                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
+                                const css::uno::Reference< css::accessibility::XAccessible >& i_rParentAccessible
                             ) override;
 
         // IToolPanelDeckListener
diff --git a/include/svtools/toolpanel/paneltabbar.hxx b/include/svtools/toolpanel/paneltabbar.hxx
index 787058a929ff..84f8a0cce95d 100644
--- a/include/svtools/toolpanel/paneltabbar.hxx
+++ b/include/svtools/toolpanel/paneltabbar.hxx
@@ -81,7 +81,7 @@ namespace svt
         virtual void    KeyInput( const KeyEvent& i_rKeyEvent ) override;
         virtual void    DataChanged( const DataChangedEvent& i_rDataChanedEvent ) override;
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
+        virtual css::uno::Reference< css::awt::XWindowPeer >
                         GetComponentInterface( bool i_bCreate ) override;
 
     private:
diff --git a/include/svtools/toolpanel/tablayouter.hxx b/include/svtools/toolpanel/tablayouter.hxx
index 826029e48cc6..79271a8e94cb 100644
--- a/include/svtools/toolpanel/tablayouter.hxx
+++ b/include/svtools/toolpanel/tablayouter.hxx
@@ -76,10 +76,10 @@ namespace svt
         virtual void        Destroy() override;
         virtual void        SetFocusToPanelSelector() override;
         virtual size_t      GetAccessibleChildCount() const override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        virtual css::uno::Reference< css::accessibility::XAccessible >
                             GetAccessibleChild(
                                 const size_t i_nChildIndex,
-                                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
+                                const css::uno::Reference< css::accessibility::XAccessible >& i_rParentAccessible
                             ) override;
 
     private:
diff --git a/include/svtools/toolpanel/toolpanel.hxx b/include/svtools/toolpanel/toolpanel.hxx
index fafeb3981e11..a6ae92a4fb00 100644
--- a/include/svtools/toolpanel/toolpanel.hxx
+++ b/include/svtools/toolpanel/toolpanel.hxx
@@ -100,9 +100,9 @@ namespace svt
             Implementations are allowed to create a new instance each time this method is called, the caller
             is responsible for caching the XAccessible implementation, if this is desired.
         */
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        virtual css::uno::Reference< css::accessibility::XAccessible >
                     CreatePanelAccessible(
-                        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
+                        const css::uno::Reference< css::accessibility::XAccessible >& i_rParentAccessible
                     ) = 0;
 
         virtual ~IToolPanel()
diff --git a/include/svtools/toolpanel/toolpaneldeck.hxx b/include/svtools/toolpanel/toolpaneldeck.hxx
index b3e6cdd5c25d..fb1e9de24ab1 100644
--- a/include/svtools/toolpanel/toolpaneldeck.hxx
+++ b/include/svtools/toolpanel/toolpaneldeck.hxx
@@ -169,7 +169,7 @@ namespace svt
         virtual bool Notify( NotifyEvent& i_rNotifyEvent ) override;
         virtual void GetFocus() override;
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
+        virtual css::uno::Reference< css::awt::XWindowPeer >
                      GetComponentInterface( bool i_bCreate ) override;
 
     private:
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index 6b308150e644..b256366ae7a0 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -55,11 +55,11 @@ namespace vcl { class Window; }
 
 // Drag&Drop defines
 
-#define DND_ACTION_NONE     ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_NONE
-#define DND_ACTION_COPY     ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_COPY
-#define DND_ACTION_MOVE     ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_MOVE
-#define DND_ACTION_COPYMOVE ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_COPY_OR_MOVE
-#define DND_ACTION_LINK     ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_LINK
+#define DND_ACTION_NONE     css::datatransfer::dnd::DNDConstants::ACTION_NONE
+#define DND_ACTION_COPY     css::datatransfer::dnd::DNDConstants::ACTION_COPY
+#define DND_ACTION_MOVE     css::datatransfer::dnd::DNDConstants::ACTION_MOVE
+#define DND_ACTION_COPYMOVE css::datatransfer::dnd::DNDConstants::ACTION_COPY_OR_MOVE
+#define DND_ACTION_LINK     css::datatransfer::dnd::DNDConstants::ACTION_LINK
 
 #define DND_POINTER_NONE    0
 #define DND_IMAGE_NONE      0
@@ -76,7 +76,7 @@ struct TransferableObjectDescriptor
     bool                mbCanLink;
 
     TransferableObjectDescriptor()
-        : mnViewAspect(::com::sun::star::embed::Aspects::MSOLE_CONTENT)
+        : mnViewAspect(css::embed::Aspects::MSOLE_CONTENT)
         , mnOle2Misc(0)
         , mbCanLink(false)
     {}
@@ -88,7 +88,7 @@ struct AcceptDropEvent
 {
     sal_Int8                                                        mnAction;
     Point                                                           maPosPixel;
-    const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent  maDragEvent;
+    const css::datatransfer::dnd::DropTargetDragEvent               maDragEvent;
     bool                                                            mbLeaving;
     bool                                                            mbDefault;
 
@@ -99,7 +99,7 @@ struct AcceptDropEvent
 
     AcceptDropEvent( sal_Int8 nAction,
                      const Point& rPosPixel,
-                     const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDragEvent,
+                     const css::datatransfer::dnd::DropTargetDragEvent& rDragEvent,
                      bool bLeaving = false ) :
         mnAction( nAction ),
         maPosPixel( rPosPixel ),
@@ -112,7 +112,7 @@ struct ExecuteDropEvent
 {
     sal_Int8                                                        mnAction;
     Point                                                           maPosPixel;
-    const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent  maDropEvent;
+    const css::datatransfer::dnd::DropTargetDropEvent               maDropEvent;
     bool                                                            mbDefault;
 
     ExecuteDropEvent() :
@@ -121,22 +121,22 @@ struct ExecuteDropEvent
 
     ExecuteDropEvent( sal_Int8 nAction,
                       const Point& rPosPixel,
-                      const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDropEvent ) :
+                      const css::datatransfer::dnd::DropTargetDropEvent& rDropEvent ) :
         mnAction( nAction ),
         maPosPixel( rPosPixel ),
         maDropEvent( rDropEvent ),
         mbDefault( false ) {}
 };
 
-class SVT_DLLPUBLIC TransferableHelper : public ::cppu::WeakImplHelper4< ::com::sun::star::datatransfer::XTransferable2,
-                                                           ::com::sun::star::datatransfer::clipboard::XClipboardOwner,
-                                                           ::com::sun::star::datatransfer::dnd::XDragSourceListener,
-                                                           ::com::sun::star::lang::XUnoTunnel >
+class SVT_DLLPUBLIC TransferableHelper : public ::cppu::WeakImplHelper4< css::datatransfer::XTransferable2,
+                                                           css::datatransfer::clipboard::XClipboardOwner,
+                                                           css::datatransfer::dnd::XDragSourceListener,
+                                                           css::lang::XUnoTunnel >
 {
 private:
 
     // nested class to implement the XTerminateListener interface
-    class TerminateListener : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XTerminateListener >
+    class TerminateListener : public ::cppu::WeakImplHelper1< css::frame::XTerminateListener >
     {
     private:
 
@@ -145,11 +145,11 @@ private:
     private:
 
         // 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;
 
         // XTerminateListener
-        virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) throw( css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
 
     public:
 
@@ -161,23 +161,23 @@ private:
 
 private:
 
-    ::com::sun::star::uno::Any                                                                          maAny;
-    OUString                                                                                     maLastFormat;
-    mutable ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >   mxClipboard;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTerminateListener >                     mxTerminateListener;
-    DataFlavorExVector*                                                                                 mpFormats;
-    TransferableObjectDescriptor*                                                                       mpObjDesc;
+    css::uno::Any                                                             maAny;
+    OUString                                                                  maLastFormat;
+    mutable css::uno::Reference< css::datatransfer::clipboard::XClipboard >   mxClipboard;
+    css::uno::Reference< css::frame::XTerminateListener >                     mxTerminateListener;
+    DataFlavorExVector*                                                       mpFormats;
+    TransferableObjectDescriptor*                                             mpObjDesc;
 
 protected:
-    inline const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >&
+    inline const css::uno::Reference< css::datatransfer::clipboard::XClipboard >&
         getOwnClipboard() const { return mxClipboard; }
 
 private:
 
     // XTransferable
-    virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& rFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& rFlavor ) throw(css::uno::RuntimeException, std::exception) override;
 
     // Transferable2
     virtual css::uno::Any SAL_CALL getTransferData2(
@@ -185,27 +185,27 @@ private:
             throw (css::datatransfer::UnsupportedFlavorException, css::io::IOException, 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;
 
     // XDragSourceListener
-    virtual void SAL_CALL dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dragEnter( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dragExit( const css::datatransfer::dnd::DragSourceEvent& dse ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dragOver( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(css::uno::RuntimeException, std::exception) override;
 
 private:
 
     // XClipboardOwner
-    virtual void SAL_CALL lostOwnership( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& xClipboard, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL lostOwnership( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& xClipboard, const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) throw(css::uno::RuntimeException, std::exception) override;
 
 protected:
     // derivees need to access lostOwnership in case hey override it
     // on windows, changing the access rights to a method gives unresolved externals, so we introduce
     // this impl-method here 'til the next incompatible update
     inline  void    implCallOwnLostOwnership(
-                        const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& _rxClipboard,
-                        const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxTrans
+                        const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& _rxClipboard,
+                        const css::uno::Reference< css::datatransfer::XTransferable >& _rxTrans
                     )
             {
                 TransferableHelper::lostOwnership( _rxClipboard, _rxTrans );
@@ -221,28 +221,28 @@ protected:
     virtual             ~TransferableHelper();
 
     void                AddFormat( SotClipboardFormatId nFormat );
-    void                AddFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    void                AddFormat( const css::datatransfer::DataFlavor& rFlavor );
     void                RemoveFormat( SotClipboardFormatId nFormat );
-    void                RemoveFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    void                RemoveFormat( const css::datatransfer::DataFlavor& rFlavor );
     bool                HasFormat( SotClipboardFormatId nFormat );
     void                ClearFormats();
 
-    bool                SetAny( const ::com::sun::star::uno::Any& rAny, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    bool                SetString( const OUString& rString, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    bool                SetBitmapEx( const BitmapEx& rBitmap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    bool                SetGDIMetaFile( const GDIMetaFile& rMtf, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    bool                SetGraphic( const Graphic& rGraphic, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    bool                SetImageMap( const ImageMap& rIMap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    bool                SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    bool                SetINetBookmark( const INetBookmark& rBmk, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    bool                SetINetImage( const INetImage& rINtImg, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-    bool                SetObject( void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    bool                SetAny( const css::uno::Any& rAny, const css::datatransfer::DataFlavor& rFlavor );
+    bool                SetString( const OUString& rString, const css::datatransfer::DataFlavor& rFlavor );
+    bool                SetBitmapEx( const BitmapEx& rBitmap, const css::datatransfer::DataFlavor& rFlavor );
+    bool                SetGDIMetaFile( const GDIMetaFile& rMtf, const css::datatransfer::DataFlavor& rFlavor );
+    bool                SetGraphic( const Graphic& rGraphic, const css::datatransfer::DataFlavor& rFlavor );
+    bool                SetImageMap( const ImageMap& rIMap, const css::datatransfer::DataFlavor& rFlavor );
+    bool                SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc, const css::datatransfer::DataFlavor& rFlavor );
+    bool                SetINetBookmark( const INetBookmark& rBmk, const css::datatransfer::DataFlavor& rFlavor );
+    bool                SetINetImage( const INetImage& rINtImg, const css::datatransfer::DataFlavor& rFlavor );
+    bool                SetObject( void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& rFlavor );
 
 protected:
 
     virtual void        AddSupportedFormats() = 0;
     virtual bool        GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) = 0;
-    virtual bool        WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+    virtual bool        WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& rFlavor );
     virtual void        DragFinished( sal_Int8 nDropAction );
     virtual void        ObjectReleased();
 
@@ -260,12 +260,12 @@ public:
 
     static void         ClearSelection( vcl::Window *pWindow );
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetSystemClipboard();
-    static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
+    static css::uno::Reference< css::datatransfer::clipboard::XClipboard > GetSystemClipboard();
+    static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
 
 public:
 
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override;
 };
 
 struct TransferableDataHelper_Impl;
@@ -276,44 +276,44 @@ class SVT_DLLPUBLIC TransferableDataHelper
 
 private:
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >           mxTransfer;
-    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >   mxClipboard;
-    DataFlavorExVector*                                                                         mpFormats;
-    TransferableObjectDescriptor*                                                               mpObjDesc;
-    TransferableDataHelper_Impl*                                                                mpImpl;
+    css::uno::Reference< css::datatransfer::XTransferable >           mxTransfer;
+    css::uno::Reference< css::datatransfer::clipboard::XClipboard >   mxClipboard;
+    DataFlavorExVector*                                               mpFormats;
+    TransferableObjectDescriptor*                                     mpObjDesc;
+    TransferableDataHelper_Impl*                                      mpImpl;
 
 protected:
     void                        InitFormats();
 
 public:
 
-    static void                 FillDataFlavorExVector( const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& rDataFlavorSeq,
+    static void                 FillDataFlavorExVector( const css::uno::Sequence< css::datatransfer::DataFlavor >& rDataFlavorSeq,
                                                         DataFlavorExVector& rDataFlavorExVector );
 
                                 TransferableDataHelper();
                                 TransferableDataHelper( const TransferableDataHelper& rDataHelper );
-                                TransferableDataHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable );
+                                TransferableDataHelper( const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable );
                                 ~TransferableDataHelper();
 
     TransferableDataHelper&     operator=( const TransferableDataHelper& rDataHelper );
 
-    const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >&    GetTransferable() const { return mxTransfer; }
-    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >           GetXTransferable() const;
+    const css::uno::Reference< css::datatransfer::XTransferable >&    GetTransferable() const { return mxTransfer; }
+    css::uno::Reference< css::datatransfer::XTransferable >           GetXTransferable() const;
 
     bool                        HasFormat( SotClipboardFormatId nFormat ) const;
-    bool                        HasFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) const;
+    bool                        HasFormat( const css::datatransfer::DataFlavor& rFlavor ) const;
 
     sal_uInt32                  GetFormatCount() const;
 
-    SotClipboardFormatId                           GetFormat( sal_uInt32 nFormat ) const;
-    ::com::sun::star::datatransfer::DataFlavor  GetFormatDataFlavor( sal_uInt32 nFormat ) const;
+    SotClipboardFormatId           GetFormat( sal_uInt32 nFormat ) const;
+    css::datatransfer::DataFlavor  GetFormatDataFlavor( sal_uInt32 nFormat ) const;
 
     DataFlavorExVector&         GetDataFlavorExVector() const {return *mpFormats; }
 
     bool                        StartClipboardListening( );
     void                        StopClipboardListening( );
 
-    void                        Rebind( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxNewData );
+    void                        Rebind( const css::uno::Reference< css::datatransfer::XTransferable >& _rxNewData );
 
 public:
 
@@ -321,10 +321,10 @@ public:
     css::uno::Any GetAny( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) const;
 
     bool                        GetString( SotClipboardFormatId nFormat, OUString& rStr );
-    bool                        GetString( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, OUString& rStr );
+    bool                        GetString( const css::datatransfer::DataFlavor& rFlavor, OUString& rStr );
 
     bool                        GetBitmapEx( SotClipboardFormatId nFormat, BitmapEx& rBmp );
-    bool                        GetBitmapEx( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, BitmapEx& rBmp );
+    bool                        GetBitmapEx( const css::datatransfer::DataFlavor& rFlavor, BitmapEx& rBmp );
 
     /** Return as GDI metafile.
 
@@ -335,31 +335,31 @@ public:
         any reasonable handling - and you need to set a limit.
     */
     bool                        GetGDIMetaFile( SotClipboardFormatId nFormat, GDIMetaFile& rMtf, size_t nMaxActions = 0 );
-    bool                        GetGDIMetaFile( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, GDIMetaFile& rMtf );
+    bool                        GetGDIMetaFile( const css::datatransfer::DataFlavor& rFlavor, GDIMetaFile& rMtf );
 
     bool                        GetGraphic( SotClipboardFormatId nFormat, Graphic& rGraphic );
-    bool                        GetGraphic( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic );
+    bool                        GetGraphic( const css::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic );
 
     bool                        GetImageMap( SotClipboardFormatId nFormat, ImageMap& rIMap );
-    bool                        GetImageMap( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ImageMap& rImap );
+    bool                        GetImageMap( const css::datatransfer::DataFlavor& rFlavor, ImageMap& rImap );
 
     bool                        GetTransferableObjectDescriptor( SotClipboardFormatId nFormat, TransferableObjectDescriptor& rDesc );
-    bool                        GetTransferableObjectDescriptor( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, TransferableObjectDescriptor& rDesc );
+    bool                        GetTransferableObjectDescriptor( const css::datatransfer::DataFlavor& rFlavor, TransferableObjectDescriptor& rDesc );
 
     bool                        GetINetBookmark( SotClipboardFormatId nFormat, INetBookmark& rBmk );
-    bool                        GetINetBookmark( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk );
+    bool                        GetINetBookmark( const css::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk );
 
     bool                        GetINetImage( SotClipboardFormatId nFormat, INetImage& rINtImg );
-    bool                        GetINetImage( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, INetImage& rINtImg );
+    bool                        GetINetImage( const css::datatransfer::DataFlavor& rFlavor, INetImage& rINtImg );
 
     bool                        GetFileList( SotClipboardFormatId nFormat, FileList& rFileList );
-    bool                        GetFileList( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, FileList& rFileList );
+    bool                        GetFileList( const css::datatransfer::DataFlavor& rFlavor, FileList& rFileList );
 
     css::uno::Sequence<sal_Int8> GetSequence( SotClipboardFormatId nFormat, const OUString& rDestDoc );
     css::uno::Sequence<sal_Int8> GetSequence( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc );
 
     bool                        GetSotStorageStream( SotClipboardFormatId nFormat, tools::SvRef<SotStorageStream>& rStreamRef );
-    bool                        GetSotStorageStream( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, tools::SvRef<SotStorageStream>& rStreamRef );
+    bool                        GetSotStorageStream( const css::datatransfer::DataFlavor& rFlavor, tools::SvRef<SotStorageStream>& rStreamRef );
 
     css::uno::Reference<css::io::XInputStream> GetInputStream( SotClipboardFormatId nFormat, const OUString& rDestDoc );
     css::uno::Reference<css::io::XInputStream> GetInputStream( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc );
@@ -368,8 +368,8 @@ public:
 
     static TransferableDataHelper   CreateFromSystemClipboard( vcl::Window * pWindow );
     static TransferableDataHelper   CreateFromSelection( vcl::Window * pWindow );
-    static bool                     IsEqual( const ::com::sun::star::datatransfer::DataFlavor& rInternalFlavor,
-                                             const ::com::sun::star::datatransfer::DataFlavor& rRequestFlavor,
+    static bool                     IsEqual( const css::datatransfer::DataFlavor& rInternalFlavor,
+                                             const css::datatransfer::DataFlavor& rRequestFlavor,
                                              bool bCompareParameters = false );
 };
 
@@ -378,7 +378,7 @@ class SVT_DLLPUBLIC DragSourceHelper
 private:
 
     // nested class to implement the XDragGestureListener interface
-    class DragGestureListener : public ::cppu::WeakImplHelper1< ::com::sun::star::datatransfer::dnd::XDragGestureListener >
+    class DragGestureListener : public ::cppu::WeakImplHelper1< css::datatransfer::dnd::XDragGestureListener >
     {
     private:
 
@@ -387,10 +387,10 @@ private:
     private:
 
         // 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;
 
         // XDragGestureListener
-        virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE ) throw( css::uno::RuntimeException, std::exception ) override;
 
     public:
 
@@ -402,8 +402,8 @@ private:
 
 private:
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > mxDragGestureRecognizer;
-    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >   mxDragGestureListener;
+    css::uno::Reference< css::datatransfer::dnd::XDragGestureRecognizer > mxDragGestureRecognizer;
+    css::uno::Reference< css::datatransfer::dnd::XDragGestureListener >   mxDragGestureListener;
 
     DragSourceHelper&   operator=( const DragSourceHelper& rDragSourceHelper ) = delete;
     bool                operator==( const DragSourceHelper& rDragSourceHelper ) const = delete;
@@ -422,7 +422,7 @@ class SVT_DLLPUBLIC DropTargetHelper
 private:
 
     // nested class to implement the XDropTargetListener interface
-    class DropTargetListener : public ::cppu::WeakImplHelper1< ::com::sun::star::datatransfer::dnd::XDropTargetListener >
+    class DropTargetListener : public ::cppu::WeakImplHelper1< css::datatransfer::dnd::XDropTargetListener >
     {
     private:
 
@@ -432,14 +432,14 @@ private:
     private:
 
         // 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;
 
         // XDropTargetListener
-        virtual void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override;
 
     public:
 
@@ -451,9 +451,9 @@ private:
 
 private:
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget >            mxDropTarget;
-    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >    mxDropTargetListener;
-    DataFlavorExVector*                                                                             mpFormats;
+    css::uno::Reference< css::datatransfer::dnd::XDropTarget >            mxDropTarget;
+    css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >    mxDropTargetListener;
+    DataFlavorExVector*                                                   mpFormats;
 
                         DropTargetHelper() = delete;
     DropTargetHelper&   operator=( const DropTargetHelper& rDropTargetHelper ) = delete;
@@ -462,7 +462,7 @@ private:
     void                ImplConstruct();
 
                         // called by our own implementation of XDropTargetListener (DropTargetListener instance)
-    void                ImplBeginDrag( const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& rSupportedDataFlavors );
+    void                ImplBeginDrag( const css::uno::Sequence< css::datatransfer::DataFlavor >& rSupportedDataFlavors );
     void                ImplEndDrag();
 
 public:
@@ -472,7 +472,7 @@ public:
     virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& rEvt );
 
                         DropTargetHelper( vcl::Window* pWindow );
-                        DropTargetHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget >& rxDropTarget );
+                        DropTargetHelper( const css::uno::Reference< css::datatransfer::dnd::XDropTarget >& rxDropTarget );
 
     virtual             ~DropTargetHelper();
 
@@ -492,7 +492,7 @@ class SVT_DLLPUBLIC TransferDataContainer : public TransferableHelper
 protected:
 
     virtual void        AddSupportedFormats() override;
-    virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override;
+    virtual bool        GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override;
     virtual void        DragFinished( sal_Int8 nDropAction ) override;
 
 public:
@@ -506,7 +506,7 @@ public:
     void                CopyGraphic( const Graphic& rGrf );
     void                CopyString( const OUString& rStr );
     void                CopyString( SotClipboardFormatId nFmt, const OUString& rStr );
-    void                CopyAny( SotClipboardFormatId nFmt, const ::com::sun::star::uno::Any& rAny );
+    void                CopyAny( SotClipboardFormatId nFmt, const css::uno::Any& rAny );
 
     void                CopyByteString( SotClipboardFormatId nFormatId, const OString& rStr );
     void                CopyAnyData( SotClipboardFormatId nFormatId, const sal_Char* pData, sal_uLong nLen );
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 13707db265d1..086589183467 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -530,8 +530,7 @@ public:
     // ACCESSIBILITY ==========================================================
 
     /** Creates and returns the accessible object of the Box. */
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible > CreateAccessible() override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
 
     /** Fills the StateSet of one entry. */
     void FillAccessibleEntryStateSet( SvTreeListEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const;
diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx
index 92b669fe4dee..36337f4c6857 100644
--- a/include/svtools/unoevent.hxx
+++ b/include/svtools/unoevent.hxx
@@ -56,8 +56,8 @@ struct SvEventDescription
  */
 class SVT_DLLPUBLIC SvBaseEventDescriptor : public cppu::WeakImplHelper2
 <
-    ::com::sun::star::container::XNameReplace,
-    ::com::sun::star::lang::XServiceInfo
+    css::container::XNameReplace,
+    css::lang::XServiceInfo
 >
 {
     const OUString sEventType;
@@ -88,53 +88,53 @@ public:
     /// calls replaceByName(const sal_uInt16, const SvxMacro&)
     virtual void SAL_CALL replaceByName(
         const OUString& rName,                /// API name of event
-        const ::com::sun::star::uno::Any& rElement ) /// event (PropertyValues)
+        const css::uno::Any& rElement ) /// event (PropertyValues)
             throw(
-                ::com::sun::star::lang::IllegalArgumentException,
-                ::com::sun::star::container::NoSuchElementException,
-                ::com::sun::star::lang::WrappedTargetException,
-                ::com::sun::star::uno::RuntimeException, std::exception) override;
+                css::lang::IllegalArgumentException,
+                css::container::NoSuchElementException,
+                css::lang::WrappedTargetException,
+                css::uno::RuntimeException, std::exception) override;
 
     // XNameAccess (via XNameReplace)
     /// calls getByName(sal_uInt16)
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName(
+    virtual css::uno::Any SAL_CALL getByName(
         const OUString& rName )  /// API name of event
             throw(
-                ::com::sun::star::container::NoSuchElementException,
-                ::com::sun::star::lang::WrappedTargetException,
-                ::com::sun::star::uno::RuntimeException, std::exception) override;
+                css::container::NoSuchElementException,
+                css::lang::WrappedTargetException,
+                css::uno::RuntimeException, std::exception) override;
 
     // XNameAxcess (via XNameReplace)
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
+    virtual css::uno::Sequence< OUString > SAL_CALL
                                                         getElementNames()
-        throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw(css::uno::RuntimeException, std::exception) override;
 
     // XNameAccess (via XNameReplace)
     virtual sal_Bool SAL_CALL hasByName(
         const OUString& rName )
-            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw(css::uno::RuntimeException, std::exception) override;
 
     // XElementAccess (via XNameReplace)
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
-        throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType()
+        throw(css::uno::RuntimeException, std::exception) override;
 
     // XElementAccess (via XNameReplace)
     virtual sal_Bool SAL_CALL hasElements()
-        throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw(css::uno::RuntimeException, std::exception) override;
 
     // XServiceInfo
     /// must be implemented in subclass
     virtual OUString SAL_CALL getImplementationName()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0;
+        throw( css::uno::RuntimeException, std::exception ) override = 0;
 
     // XServiceInfo
     virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     // XServiceInfo
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
+    virtual css::uno::Sequence< OUString > SAL_CALL
         getSupportedServiceNames()
-            throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+            throw( css::uno::RuntimeException, std::exception ) override;
 
 protected:
 
@@ -143,19 +143,19 @@ 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) = 0;
+                css::lang::IllegalArgumentException,
+                css::container::NoSuchElementException,
+                css::lang::WrappedTargetException,
+                css::uno::RuntimeException) = 0;
 
     /// Must be implemented in subclass.
     virtual void getByName(
         SvxMacro& rMacro,
         const sal_uInt16 nEvent )
             throw(
-                ::com::sun::star::container::NoSuchElementException,
-                ::com::sun::star::lang::WrappedTargetException,
-                ::com::sun::star::uno::RuntimeException) = 0;
+                css::container::NoSuchElementException,
+                css::lang::WrappedTargetException,
+                css::uno::RuntimeException) = 0;
 
     /// convert an API event name to the event ID as used by SvxMacroItem
     sal_uInt16 mapNameToEventID(const OUString& rName) const;
@@ -165,15 +165,15 @@ protected:
 
     /// create PropertyValues and Any from macro
     void getAnyFromMacro(
-        ::com::sun::star::uno::Any& aAny,   // Any to be filled by Macro values
+        css::uno::Any& aAny,   // Any to be filled by Macro values
         const SvxMacro& rMacro);
 
     /// create macro from PropertyValues (in an Any)
     void getMacroFromAny(
         SvxMacro& aMacro,       // reference to be filled by Any
-        const ::com::sun::star::uno::Any& rAny)
+        const css::uno::Any& rAny)
             throw (
-                ::com::sun::star::lang::IllegalArgumentException);
+                css::lang::IllegalArgumentException);
 
 };
 
@@ -196,12 +196,11 @@ protected:
 class SVT_DLLPUBLIC SvEventDescriptor : public SvBaseEventDescriptor
 {
     /// keep reference to parent to prevent it from being destroyed
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::uno::XInterface > xParentRef;
+    css::uno::Reference< css::uno::XInterface > xParentRef;
 
 public:
 
-     SvEventDescriptor(::com::sun::star::uno::XInterface& rParent,
+     SvEventDescriptor(css::uno::XInterface& rParent,
                       const SvEventDescription* pSupportedMacroItems);
 
     virtual ~SvEventDescriptor();
@@ -215,19 +214,19 @@ 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;
 
     using SvBaseEventDescriptor::getByName;
     virtual void getByName(
         SvxMacro& rMacros,          /// macro to be filled with values
         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;
 
 
     /// Get the SvxMacroItem from the parent.
@@ -262,7 +261,7 @@ public:
 
     //XServiceInfo
     virtual OUString SAL_CALL getImplementationName()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        throw( css::uno::RuntimeException, std::exception ) override;
 
 protected:
 
@@ -273,19 +272,19 @@ 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;
 
     using SvBaseEventDescriptor::getByName;
     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;
 
     /// do we have an event?
     /// return true: we have a macro for the event
@@ -294,7 +293,7 @@ protected:
     bool hasById(
         const sal_uInt16 nEvent ) const     /// item ID of event
              throw(
-                ::com::sun::star::lang::IllegalArgumentException);
+                css::lang::IllegalArgumentException);
 
 };
 
diff --git a/include/svtools/unoimap.hxx b/include/svtools/unoimap.hxx
index a369ca8a8a97..46613ad05bc6 100644
--- a/include/svtools/unoimap.hxx
+++ b/include/svtools/unoimap.hxx
@@ -26,13 +26,13 @@
 class ImageMap;
 struct SvEventDescription;
 
-SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMapRectangleObject_createInstance( const SvEventDescription* pSupportedMacroItems );
-SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMapCircleObject_createInstance( const SvEventDescription* pSupportedMacroItems );
-SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMapPolygonObject_createInstance( const SvEventDescription* pSupportedMacroItems );
+SVT_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvUnoImageMapRectangleObject_createInstance( const SvEventDescription* pSupportedMacroItems );
+SVT_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvUnoImageMapCircleObject_createInstance( const SvEventDescription* pSupportedMacroItems );
+SVT_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvUnoImageMapPolygonObject_createInstance( const SvEventDescription* pSupportedMacroItems );
 
-SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMap_createInstance( const SvEventDescription* pSupportedMacroItems );
-SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMap_createInstance( const ImageMap& rMap, const SvEventDescription* pSupportedMacroItems );
-SVT_DLLPUBLIC bool SvUnoImageMap_fillImageMap( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xImageMap, ImageMap& rMap );
+SVT_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvUnoImageMap_createInstance( const SvEventDescription* pSupportedMacroItems );
+SVT_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvUnoImageMap_createInstance( const ImageMap& rMap, const SvEventDescription* pSupportedMacroItems );
+SVT_DLLPUBLIC bool SvUnoImageMap_fillImageMap( css::uno::Reference< css::uno::XInterface > xImageMap, ImageMap& rMap );
 
 #endif
 
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 58b508fa37c6..c3a6f7612797 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -267,7 +267,7 @@ private:
     SVT_DLLPRIVATE sal_uInt16          ImplGetVisibleItemCount() const;
     SVT_DLLPRIVATE void         ImplInsertItem( ValueSetItem *const pItem, const size_t nPos );
     SVT_DLLPRIVATE Rectangle    ImplGetItemRect( size_t nPos ) const;
-    SVT_DLLPRIVATE void            ImplFireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue );
+    SVT_DLLPRIVATE void         ImplFireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue );
     SVT_DLLPRIVATE bool         ImplHasAccessibleListeners();
     SVT_DLLPRIVATE void         ImplTracking( const Point& rPos, bool bRepeat );
     SVT_DLLPRIVATE void         ImplEndTracking( const Point& rPos, bool bCancel );
diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx
index 22243f3692c1..90bbe7a96bc1 100644
--- a/include/svtools/xwindowitem.hxx
+++ b/include/svtools/xwindowitem.hxx
@@ -33,7 +33,7 @@ namespace vcl { class Window; }
 
 class SVT_DLLPUBLIC XWindowItem : public SfxPoolItem
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >      m_xWin;
+    css::uno::Reference< css::awt::XWindow >      m_xWin;
 
     XWindowItem & operator = ( const XWindowItem & ) = delete;