com::sun::star->css in include/linguistic to include/sfx2

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

69 files changed, 698 insertions, 705 deletions

diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx
index ad0153fe730e..1095e4555182 100644
--- a/include/oox/core/binarycodec.hxx
+++ b/include/oox/core/binarycodec.hxx
@@ -82,7 +82,7 @@ public:
             The sequence contains the necessary data to initialize
             the codec.
      */
-    bool                initCodec( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aData );
+    bool                initCodec( const css::uno::Sequence< css::beans::NamedValue >& aData );
 
     /** Retrieves the encryption data
 
@@ -90,7 +90,7 @@ public:
             The sequence contains the necessary data to initialize
             the codec.
      */
-    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > getEncryptionData();
+    css::uno::Sequence< css::beans::NamedValue > getEncryptionData();
 
     /** Verifies the validity of the password using the passed key and hash.
 
@@ -192,7 +192,7 @@ public:
             The sequence contains the necessary data to initialize
             the codec.
      */
-    bool            initCodec( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aData );
+    bool            initCodec( const css::uno::Sequence< css::beans::NamedValue >& aData );
 
     /** Retrieves the encryption data
 
@@ -200,7 +200,7 @@ public:
             The sequence contains the necessary data to initialize
             the codec.
      */
-    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > getEncryptionData();
+    css::uno::Sequence< css::beans::NamedValue > getEncryptionData();
 
     /** Initializes the algorithm with the specified password and document ID.
 
diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx
index 5578796bfacf..50b935d29ad8 100644
--- a/include/oox/core/contexthandler.hxx
+++ b/include/oox/core/contexthandler.hxx
@@ -48,7 +48,7 @@ typedef ::rtl::Reference< ContextHandler > ContextHandlerRef;
 struct FragmentBaseData;
 typedef std::shared_ptr< FragmentBaseData > FragmentBaseDataRef;
 
-typedef ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XFastContextHandler > ContextHandler_BASE;
+typedef ::cppu::WeakImplHelper< css::xml::sax::XFastContextHandler > ContextHandler_BASE;
 
 class OOX_DLLPUBLIC ContextHandler : public ContextHandler_BASE
 {
@@ -73,13 +73,13 @@ public:
 
     // com.sun.star.xml.sax.XFastContextHandler interface ---------------------
 
-    virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
 
     // record context interface -----------------------------------------------
 
@@ -91,7 +91,7 @@ protected:
     /** Helper constructor for the FragmentHandler. */
     explicit            ContextHandler( const FragmentBaseDataRef& rxBaseData );
 
-    void                implSetLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& rxLocator );
+    void                implSetLocator( const css::uno::Reference< css::xml::sax::XLocator >& rxLocator );
 
 #ifdef _MSC_VER
     ContextHandler() {} // workaround
diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx
index c4ef4539df09..20ab9ffdf25e 100644
--- a/include/oox/core/contexthandler2.hxx
+++ b/include/oox/core/contexthandler2.hxx
@@ -164,15 +164,15 @@ public:
 
 protected:
     /** Must be called from createFastChildContext() in derived classes. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler >
+    css::uno::Reference< css::xml::sax::XFastContextHandler >
                         implCreateChildContext(
                             sal_Int32 nElement,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs );
+                            const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs );
 
     /** Must be called from startFastElement() in derived classes. */
     void                implStartElement(
                             sal_Int32 nElement,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs );
+                            const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs );
 
     /** Must be called from characters() in derived classes. */
     void                implCharacters( const OUString& rChars );
@@ -219,26 +219,26 @@ public:
 
     // com.sun.star.xml.sax.XFastContextHandler interface ---------------------
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
                         createFastChildContext(
                             sal_Int32 nElement,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
-                            throw(  ::com::sun::star::xml::sax::SAXException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) final override;
+                            const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs )
+                            throw(  css::xml::sax::SAXException,
+                                    css::uno::RuntimeException, std::exception ) final override;
 
     virtual void SAL_CALL startFastElement(
                             sal_Int32 nElement,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
-                            throw(  ::com::sun::star::xml::sax::SAXException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) final override;
+                            const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs )
+                            throw(  css::xml::sax::SAXException,
+                                    css::uno::RuntimeException, std::exception ) final override;
 
     virtual void SAL_CALL characters( const OUString& rChars )
-                            throw(  ::com::sun::star::xml::sax::SAXException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) final override;
+                            throw(  css::xml::sax::SAXException,
+                                    css::uno::RuntimeException, std::exception ) final override;
 
     virtual void SAL_CALL endFastElement( sal_Int32 nElement )
-                            throw(  ::com::sun::star::xml::sax::SAXException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) final override;
+                            throw(  css::xml::sax::SAXException,
+                                    css::uno::RuntimeException, std::exception ) final override;
 
     // oox.core.ContextHandler interface --------------------------------------
 
diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx
index 8d41deee87f5..497bb0029166 100644
--- a/include/oox/core/fastparser.hxx
+++ b/include/oox/core/fastparser.hxx
@@ -44,51 +44,51 @@ class FastParser
 {
 public:
     explicit            FastParser(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
-                            throw( ::com::sun::star::uno::RuntimeException );
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext )
+                            throw( css::uno::RuntimeException );
 
     virtual             ~FastParser();
 
     /** Registers an OOXML namespace at the parser. */
     void                registerNamespace( sal_Int32 nNamespaceId )
-                            throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+                            throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
 
     /** Sets the passed document handler that will receive the SAX parser events. */
     void                setDocumentHandler(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastDocumentHandler >& rxDocHandler )
-                            throw( ::com::sun::star::uno::RuntimeException );
+                            const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& rxDocHandler )
+                            throw( css::uno::RuntimeException );
 
     /** Parses the passed SAX input source.
         @param bCloseStream  True = closes the stream in the input source after parsing. */
-    void                parseStream( const ::com::sun::star::xml::sax::InputSource& rInputSource, bool bCloseStream = false )
-                            throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
+    void                parseStream( const css::xml::sax::InputSource& rInputSource, bool bCloseStream = false )
+                            throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException );
 
     /** Parses the passed input stream.
         @param bCloseStream  True = closes the passed stream after parsing. */
     void                parseStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream,
+                            const css::uno::Reference< css::io::XInputStream >& rxInStream,
                             const OUString& rStreamName, bool bCloseStream = false )
-                            throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
+                            throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException );
 
     /** Parses a stream from the passed storage with the specified name.
         @param bCloseStream  True = closes the stream after parsing. */
     void                parseStream( StorageBase& rStorage, const OUString& rStreamName, bool bCloseStream = false )
-                            throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
+                            throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException );
 
     OUString getNamespaceURL( const OUString& rPrefix )
-                        throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+                        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
 
     bool hasNamespaceURL( const OUString& rPrefix ) const;
 
     sal_Int32 getNamespaceId( const OUString& aUrl );
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler >
+    css::uno::Reference< css::xml::sax::XFastTokenHandler >
                getTokenHandler() const { return mxTokenHandler; }
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastParser >
+    css::uno::Reference< css::xml::sax::XFastParser >
                         mxParser;
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler >
+    css::uno::Reference< css::xml::sax::XFastTokenHandler >
                         mxTokenHandler;
     const NamespaceMap& mrNamespaceMap;
 
diff --git a/include/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx
index 3ac4e5fe14fb..744d9225870c 100644
--- a/include/oox/core/fasttokenhandler.hxx
+++ b/include/oox/core/fasttokenhandler.hxx
@@ -37,8 +37,8 @@ namespace core {
     that provides access to the tokens generated from the internal token name list.
  */
 class OOX_DLLPUBLIC FastTokenHandler :
-    public ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo,
-                                    ::com::sun::star::xml::sax::XFastTokenHandler >,
+    public ::cppu::WeakImplHelper< css::lang::XServiceInfo,
+                                   css::xml::sax::XFastTokenHandler >,
     public sax_fastparser::FastTokenHandlerBase
 {
 public:
@@ -46,13 +46,13 @@ public:
     virtual             ~FastTokenHandler();
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
 
     // XFastTokenHandler
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getTokenFromUTF8( const ::com::sun::star::uno::Sequence< sal_Int8 >& Identifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) throw (css::uno::RuntimeException, std::exception) override;
 
     // Much faster direct C++ shortcut to the method that matters
     virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const override;
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx
index f37489db87dc..519e63ff0504 100644
--- a/include/oox/core/filterbase.hxx
+++ b/include/oox/core/filterbase.hxx
@@ -81,19 +81,19 @@ enum OoxmlVersion
 struct FilterBaseImpl;
 
 typedef ::cppu::WeakImplHelper<
-        ::com::sun::star::lang::XServiceInfo,
-        ::com::sun::star::lang::XInitialization,
-        ::com::sun::star::document::XImporter,
-        ::com::sun::star::document::XExporter,
-        ::com::sun::star::document::XFilter >
+        css::lang::XServiceInfo,
+        css::lang::XInitialization,
+        css::document::XImporter,
+        css::document::XExporter,
+        css::document::XFilter >
     FilterBase_BASE;
 
 class OOX_DLLPUBLIC FilterBase : public FilterBase_BASE, public ::cppu::BaseMutex
 {
 public:
     explicit            FilterBase(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
-                            throw( ::com::sun::star::uno::RuntimeException );
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext )
+                            throw( css::uno::RuntimeException );
 
     virtual             ~FilterBase();
 
@@ -113,27 +113,27 @@ public:
 
 
     /** Returns the component context passed in the filter constructor (always existing). */
-    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
+    const css::uno::Reference< css::uno::XComponentContext >&
                         getComponentContext() const;
 
     /** Returns the document model (always existing). */
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >&
+    const css::uno::Reference< css::frame::XModel >&
                         getModel() const;
 
     /** Returns the service factory provided by the document model (always existing). */
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&
+    const css::uno::Reference< css::lang::XMultiServiceFactory >&
                         getModelFactory() const;
 
     /** Returns the frame that will contain the document model (may be null). */
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&
+    const css::uno::Reference< css::frame::XFrame >&
                         getTargetFrame() const;
 
     /// Returns the parent shape to load into (if any)
-    const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >&
+    const css::uno::Reference< css::drawing::XShape >&
                         getParentShape() const;
 
     /** Returns the status indicator (may be null). */
-    const ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >&
+    const css::uno::Reference< css::task::XStatusIndicator >&
                         getStatusIndicator() const;
 
     /** Returns the FilterData */
@@ -159,7 +159,7 @@ public:
             access has been enabled in the storage, the base stream can be
             accessed by passing an empty string as stream name.
      */
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+    css::uno::Reference< css::io::XInputStream >
                         openInputStream( const OUString& rStreamName ) const;
 
     /** Opens and returns the specified output stream from the base storage.
@@ -170,7 +170,7 @@ public:
             access has been enabled in the storage, the base stream can be
             accessed by passing an empty string as stream name.
      */
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
+    css::uno::Reference< css::io::XOutputStream >
                         openOutputStream( const OUString& rStreamName ) const;
 
     /** Commits changes to base storage (and substorages) */
@@ -199,11 +199,11 @@ public:
 
     virtual sal_Bool SAL_CALL
                         supportsService( const OUString& rServiceName )
-                            throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+                            throw( css::uno::RuntimeException, std::exception ) override;
 
-    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;
 
     // com.sun.star.lang.XInitialization interface ----------------------------
 
@@ -218,49 +218,49 @@ public:
             filter implementations may support different arguments.
      */
     virtual void SAL_CALL initialize(
-                            const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs )
-                            throw(  ::com::sun::star::uno::Exception,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) override;
+                            const css::uno::Sequence< css::uno::Any >& rArgs )
+                            throw(  css::uno::Exception,
+                                    css::uno::RuntimeException, std::exception ) override;
 
     // com.sun.star.document.XImporter interface ------------------------------
 
     virtual void SAL_CALL setTargetDocument(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxDocument )
-                            throw(  ::com::sun::star::lang::IllegalArgumentException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) override;
+                            const css::uno::Reference< css::lang::XComponent >& rxDocument )
+                            throw(  css::lang::IllegalArgumentException,
+                                    css::uno::RuntimeException, std::exception ) override;
 
     // com.sun.star.document.XExporter interface ------------------------------
 
     virtual void SAL_CALL setSourceDocument(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxDocument )
-                            throw(  ::com::sun::star::lang::IllegalArgumentException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) override;
+                            const css::uno::Reference< css::lang::XComponent >& rxDocument )
+                            throw(  css::lang::IllegalArgumentException,
+                                    css::uno::RuntimeException, std::exception ) override;
 
     // com.sun.star.document.XFilter interface --------------------------------
 
     virtual sal_Bool SAL_CALL filter(
-                            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq )
-                            throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+                            const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescSeq )
+                            throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL cancel()
-                            throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+                            throw( css::uno::RuntimeException, std::exception ) override;
 
     bool exportVBA() const;
 
 protected:
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+    virtual css::uno::Reference< css::io::XInputStream >
                         implGetInputStream( utl::MediaDescriptor& rMediaDesc ) const;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
+    virtual css::uno::Reference< css::io::XStream >
                         implGetOutputStream( utl::MediaDescriptor& rMediaDesc ) const;
 
     virtual bool        implFinalizeExport( utl::MediaDescriptor& rMediaDescriptor );
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
+    css::uno::Reference< css::io::XStream >
                         getMainDocumentStream( ) const;
 
 private:
     void                setMediaDescriptor(
-                            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq );
+                            const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescSeq );
 
     /** Derived classes may create a specialized graphic helper, e.g. for
         resolving palette colors. */
@@ -270,9 +270,9 @@ private:
     virtual ::oox::ole::VbaProject* implCreateVbaProject() const = 0;
 
     virtual StorageRef  implCreateStorage(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream ) const = 0;
+                            const css::uno::Reference< css::io::XInputStream >& rxInStream ) const = 0;
     virtual StorageRef  implCreateStorage(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ) const = 0;
+                            const css::uno::Reference< css::io::XStream >& rxOutStream ) const = 0;
 
 private:
     std::unique_ptr< FilterBaseImpl > mxImpl;
diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx
index e5db562f1fbd..9ac48df128c8 100644
--- a/include/oox/core/filterdetect.hxx
+++ b/include/oox/core/filterdetect.hxx
@@ -46,25 +46,25 @@ namespace core {
     It takes a reference to the filter string object via its constructor, and
     puts the name of the detected filter to it, if it successfully finds one.
  */
-class FilterDetectDocHandler : public ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XFastDocumentHandler >
+class FilterDetectDocHandler : public ::cppu::WeakImplHelper< css::xml::sax::XFastDocumentHandler >
 {
 public:
-    explicit            FilterDetectDocHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, OUString& rFilter );
+    explicit            FilterDetectDocHandler( const css::uno::Reference< css::uno::XComponentContext >& rxContext, OUString& rFilter );
     virtual             ~FilterDetectDocHandler();
 
     // XFastDocumentHandler
-    virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
 
     // XFastContextHandler
-    virtual void SAL_CALL startFastElement( sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endFastElement( sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startFastElement( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endFastElement( sal_Int32 Element ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
 
 private:
     void                parseRelationship( const AttributeList& rAttribs );
@@ -76,19 +76,19 @@ private:
 private:
     typedef ::std::vector< sal_Int32 > ContextVector;
 
-    OUString&    mrFilterName;
+    OUString&           mrFilterName;
     ContextVector       maContextStack;
-    OUString     maTargetPath;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
+    OUString            maTargetPath;
+    css::uno::Reference< css::uno::XComponentContext > mxContext;
 };
 
 
 
-class OOX_DLLPUBLIC FilterDetect : public ::cppu::WeakImplHelper< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo >
+class OOX_DLLPUBLIC FilterDetect : public ::cppu::WeakImplHelper< css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
 {
 public:
-    explicit            FilterDetect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
-                            throw( ::com::sun::star::uno::RuntimeException );
+    explicit            FilterDetect( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
+                            throw( css::uno::RuntimeException );
     virtual             ~FilterDetect();
 
     /** Tries to extract an unencrypted ZIP package from the passed media
@@ -114,14 +114,14 @@ public:
         is stored in the property 'ComponentData' of the media descriptor and
         its input stream is returned.
      */
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+    css::uno::Reference< css::io::XInputStream >
                         extractUnencryptedPackage( utl::MediaDescriptor& rMediaDesc ) const;
 
     // com.sun.star.lang.XServiceInfo interface -------------------------------
 
-    virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
 
     // com.sun.star.document.XExtendedFilterDetection interface ---------------
 
@@ -142,11 +142,11 @@ public:
         property of the passed media descriptor.
      */
     virtual OUString SAL_CALL
-                        detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq )
-                            throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+                        detect( css::uno::Sequence< css::beans::PropertyValue >& rMediaDescSeq )
+                            throw( css::uno::RuntimeException, std::exception ) override;
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
+    css::uno::Reference< css::uno::XComponentContext > mxContext;
 };
 
 
diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx
index 81bce5815ee6..f1110db8cf13 100644
--- a/include/oox/core/fragmenthandler.hxx
+++ b/include/oox/core/fragmenthandler.hxx
@@ -43,8 +43,8 @@ namespace core {
 struct FragmentBaseData
 {
     XmlFilterBase&      mrFilter;
-    const OUString maFragmentPath;
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >
+    const OUString      maFragmentPath;
+    css::uno::Reference< css::xml::sax::XLocator >
                         mxLocator;
     RelationsRef        mxRelations;
 
@@ -74,7 +74,7 @@ struct RecordInfo
 
 
 
-typedef ::cppu::ImplInheritanceHelper< ContextHandler, ::com::sun::star::xml::sax::XFastDocumentHandler > FragmentHandler_BASE;
+typedef ::cppu::ImplInheritanceHelper< ContextHandler, css::xml::sax::XFastDocumentHandler > FragmentHandler_BASE;
 
 class OOX_DLLPUBLIC FragmentHandler : public FragmentHandler_BASE
 {
@@ -83,30 +83,30 @@ public:
     virtual             ~FragmentHandler();
 
     /** Returns the com.sun.star.xml.sax.XFastContextHandler interface of this context. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler >
+    css::uno::Reference< css::xml::sax::XFastContextHandler >
                         getFastContextHandler() { return static_cast< ContextHandler* >( this ); }
 
     // com.sun.star.xml.sax.XFastDocumentHandler interface --------------------
 
-    virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& rxLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& rxLocator ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
 
     // com.sun.star.xml.sax.XFastContextHandler interface ---------------------
 
-    virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
 
     // XML stream handling ----------------------------------------------------
 
     /** Opens the fragment stream referred by the own fragment path. Derived
         classes may provide specilized stream implementations. */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+    virtual css::uno::Reference< css::io::XInputStream >
                         openFragmentStream() const;
 
     // binary records ---------------------------------------------------------
diff --git a/include/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx
index ac2301457a54..200be17e360d 100644
--- a/include/oox/core/fragmenthandler2.hxx
+++ b/include/oox/core/fragmenthandler2.hxx
@@ -57,36 +57,36 @@ public:
 
     // com.sun.star.xml.sax.XFastContextHandler interface ---------------------
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
                         createFastChildContext(
                             sal_Int32 nElement,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
-                            throw(  ::com::sun::star::xml::sax::SAXException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) final override;
+                            const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs )
+                            throw(  css::xml::sax::SAXException,
+                                    css::uno::RuntimeException, std::exception ) final override;
 
     virtual void SAL_CALL startFastElement(
                             sal_Int32 nElement,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
-                            throw(  ::com::sun::star::xml::sax::SAXException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) final override;
+                            const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs )
+                            throw(  css::xml::sax::SAXException,
+                                    css::uno::RuntimeException, std::exception ) final override;
 
     virtual void SAL_CALL characters( const OUString& rChars )
-                            throw(  ::com::sun::star::xml::sax::SAXException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) final override;
+                            throw(  css::xml::sax::SAXException,
+                                    css::uno::RuntimeException, std::exception ) final override;
 
     virtual void SAL_CALL endFastElement( sal_Int32 nElement )
-                            throw(  ::com::sun::star::xml::sax::SAXException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) final override;
+                            throw(  css::xml::sax::SAXException,
+                                    css::uno::RuntimeException, std::exception ) final override;
 
     // com.sun.star.xml.sax.XFastDocumentHandler interface --------------------
 
     virtual void SAL_CALL startDocument()
-                            throw(  ::com::sun::star::xml::sax::SAXException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) override;
+                            throw(  css::xml::sax::SAXException,
+                                    css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL endDocument()
-                            throw(  ::com::sun::star::xml::sax::SAXException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) override;
+                            throw(  css::xml::sax::SAXException,
+                                    css::uno::RuntimeException, std::exception ) override;
 
     // oox.core.ContextHandler interface --------------------------------------
 
diff --git a/include/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx
index 8d97af4be69f..03c69042cf88 100644
--- a/include/oox/core/recordparser.hxx
+++ b/include/oox/core/recordparser.hxx
@@ -53,9 +53,9 @@ public:
     void                setFragmentHandler( const ::rtl::Reference< FragmentHandler >& rxHandler );
 
     void                parseStream( const RecordInputSource& rInputSource )
-                            throw(  ::com::sun::star::xml::sax::SAXException,
-                                    ::com::sun::star::io::IOException,
-                                    ::com::sun::star::uno::RuntimeException );
+                            throw(  css::xml::sax::SAXException,
+                                    css::io::IOException,
+                                    css::uno::RuntimeException );
 
     const RecordInputSource& getInputSource() const { return maSource; }
 
diff --git a/include/oox/core/relationshandler.hxx b/include/oox/core/relationshandler.hxx
index 9dac43f64428..d7ceb73238e3 100644
--- a/include/oox/core/relationshandler.hxx
+++ b/include/oox/core/relationshandler.hxx
@@ -34,11 +34,11 @@ public:
                             XmlFilterBase& rFilter,
                             RelationsRef xRelations );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
                         createFastChildContext(
                             sal_Int32 nElement,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
-                        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+                            const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs )
+                        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
 
 private:
     RelationsRef        mxRelations;
diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx
index 0a775b73a57b..f845aea87be6 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -62,9 +62,9 @@ class FragmentHandler;
 class FastParser;
 
 struct TextField {
-    com::sun::star::uno::Reference< com::sun::star::text::XText > xText;
-    com::sun::star::uno::Reference< com::sun::star::text::XTextCursor > xTextCursor;
-    com::sun::star::uno::Reference< com::sun::star::text::XTextField > xTextField;
+    css::uno::Reference< css::text::XText >       xText;
+    css::uno::Reference< css::text::XTextCursor > xTextCursor;
+    css::uno::Reference< css::text::XTextField >  xTextField;
 };
 typedef std::vector< TextField > TextFieldStack;
 
@@ -74,8 +74,8 @@ class OOX_DLLPUBLIC XmlFilterBase : public FilterBase
 {
 public:
     explicit            XmlFilterBase(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
-                            throw( ::com::sun::star::uno::RuntimeException );
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext )
+                            throw( css::uno::RuntimeException );
 
     virtual             ~XmlFilterBase();
 
@@ -115,8 +115,7 @@ public:
         @return a non-empty reference to the XDocument, if the
         fragment could be imported.
      */
-    ::com::sun::star::uno::Reference<
-       ::com::sun::star::xml::dom::XDocument> importFragment( const OUString& rFragmentPath );
+    css::uno::Reference< css::xml::dom::XDocument> importFragment( const OUString& rFragmentPath );
 
     /** Imports a fragment from an xml::dom::XDocument using the
         passed fragment handler
@@ -130,8 +129,7 @@ public:
         @return true, if the fragment could be imported.
      */
     bool importFragment( const ::rtl::Reference< FragmentHandler >& rxHandler,
-                         const ::com::sun::star::uno::Reference<
-                               ::com::sun::star::xml::sax::XFastSAXSerializable >& rxSerializer );
+                         const css::uno::Reference< css::xml::sax::XFastSAXSerializable >& rxSerializer );
 
     /** Imports the relations fragment associated with the specified fragment.
 
@@ -164,7 +162,7 @@ public:
 
         @return  Added relation Id.
      */
-    OUString     addRelation( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream, const OUString& rType, const OUString& rTarget, bool bExternal = false );
+    OUString     addRelation( const css::uno::Reference< css::io::XOutputStream >& rOutputStream, const OUString& rType, const OUString& rTarget, bool bExternal = false );
 
     /** Returns a stack of used textfields, used by the pptx importer to replace links to slidepages with the real page name */
     TextFieldStack& getTextFieldStack() const;
@@ -183,7 +181,7 @@ public:
 
         @return The opened output stream.
      */
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
+    css::uno::Reference< css::io::XOutputStream >
                         openFragmentStream(
                             const OUString& rStreamName,
                             const OUString& rMediaType );
@@ -220,7 +218,7 @@ public:
 
         @return *this
      */
-    XmlFilterBase& exportDocumentProperties( ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > xProperties );
+    XmlFilterBase& exportDocumentProperties( css::uno::Reference< css::document::XDocumentProperties > xProperties );
 
     OUString getNamespaceURL( const OUString& rPrefix );
 
@@ -235,22 +233,22 @@ public:
     bool isMSO2007Document() const;
 
     void checkDocumentProperties(
-            com::sun::star::uno::Reference<com::sun::star::document::XDocumentProperties> xDocProps);
+            css::uno::Reference<css::document::XDocumentProperties> xDocProps);
 
 protected:
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+    virtual css::uno::Reference< css::io::XInputStream >
         implGetInputStream( utl::MediaDescriptor& rMediaDesc ) const override;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
+    virtual css::uno::Reference< css::io::XStream >
         implGetOutputStream( utl::MediaDescriptor& rMediaDesc ) const override;
 
     virtual bool implFinalizeExport( utl::MediaDescriptor& rMediaDescriptor ) override;
 
 private:
     virtual StorageRef  implCreateStorage(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream ) const override;
+                            const css::uno::Reference< css::io::XInputStream >& rxInStream ) const override;
     virtual StorageRef  implCreateStorage(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ) const override;
+                            const css::uno::Reference< css::io::XStream >& rxOutStream ) const override;
 
 private:
     ::std::unique_ptr< XmlFilterBaseImpl > mxImpl;
diff --git a/include/oox/crypto/DocumentDecryption.hxx b/include/oox/crypto/DocumentDecryption.hxx
index ca80a95de488..b494ea2900fa 100644
--- a/include/oox/crypto/DocumentDecryption.hxx
+++ b/include/oox/crypto/DocumentDecryption.hxx
@@ -34,7 +34,7 @@ namespace core {
 class OOX_DLLPUBLIC DocumentDecryption
 {
 private:
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
+    css::uno::Reference< css::uno::XComponentContext > mxContext;
 
     enum CryptoType
     {
@@ -44,22 +44,22 @@ private:
     };
 
     oox::ole::OleStorage&           mrOleStorage;
-    std::unique_ptr<CryptoEngine> mEngine;
+    std::unique_ptr<CryptoEngine>   mEngine;
     CryptoType                      mCryptoType;
 
-    bool readAgileEncryptionInfo( com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& rStream );
+    bool readAgileEncryptionInfo( css::uno::Reference< css::io::XInputStream >& rStream );
     bool readStandard2007EncryptionInfo( BinaryInputStream& rStream );
 
 public:
     DocumentDecryption(
         oox::ole::OleStorage& rOleStorage,
-        com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext);
+        css::uno::Reference< css::uno::XComponentContext > xContext);
 
-    bool decrypt(com::sun::star::uno::Reference< com::sun::star::io::XStream > xDocumentStream);
+    bool decrypt(css::uno::Reference< css::io::XStream > xDocumentStream);
     bool readEncryptionInfo();
     bool generateEncryptionKey(const OUString& rPassword);
 
-    com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > createEncryptionData(const OUString& rPassword);
+    css::uno::Sequence< css::beans::NamedValue > createEncryptionData(const OUString& rPassword);
 
 };
 
diff --git a/include/oox/crypto/DocumentEncryption.hxx b/include/oox/crypto/DocumentEncryption.hxx
index 55e3d12f4c43..d0ceee4b2738 100644
--- a/include/oox/crypto/DocumentEncryption.hxx
+++ b/include/oox/crypto/DocumentEncryption.hxx
@@ -31,7 +31,7 @@ namespace core {
 class OOX_DLLPUBLIC DocumentEncryption
 {
 private:
-    com::sun::star::uno::Reference< com::sun::star::io::XStream > mxDocumentStream;
+    css::uno::Reference< css::io::XStream > mxDocumentStream;
     oox::ole::OleStorage& mrOleStorage;
     OUString maPassword;
 
@@ -39,7 +39,7 @@ private:
 
 public:
     DocumentEncryption(
-        com::sun::star::uno::Reference< com::sun::star::io::XStream > xDocumentStream,
+        css::uno::Reference< css::io::XStream > xDocumentStream,
         oox::ole::OleStorage& rOleStorage,
         const OUString& aPassword);
 
diff --git a/include/oox/drawingml/chart/chartconverter.hxx b/include/oox/drawingml/chart/chartconverter.hxx
index d459f54bc428..ebce01a4006d 100644
--- a/include/oox/drawingml/chart/chartconverter.hxx
+++ b/include/oox/drawingml/chart/chartconverter.hxx
@@ -71,15 +71,15 @@ public:
     void                convertFromModel(
                             ::oox::core::XmlFilterBase& rFilter,
                             ChartSpaceModel& rChartModel,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxExternalPage,
-                            const ::com::sun::star::awt::Point& rChartPos,
-                            const ::com::sun::star::awt::Size& rChartSize );
+                            const css::uno::Reference< css::chart2::XChartDocument >& rxChartDoc,
+                            const css::uno::Reference< css::drawing::XShapes >& rxExternalPage,
+                            const css::awt::Point& rChartPos,
+                            const css::awt::Size& rChartSize );
 
     /** Creates an internal data provider. Derived classes may override this
         function to create an external data provider. */
     virtual void        createDataProvider(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc );
+                            const css::uno::Reference< css::chart2::XChartDocument >& rxChartDoc );
 
     /** Creates a data sequence from a formula. Dummy implementation. Derived
         classes have to override this function to actually parse the formula. */
diff --git a/include/oox/drawingml/chart/datasourcemodel.hxx b/include/oox/drawingml/chart/datasourcemodel.hxx
index 75a5d012f82b..e6539cae744c 100644
--- a/include/oox/drawingml/chart/datasourcemodel.hxx
+++ b/include/oox/drawingml/chart/datasourcemodel.hxx
@@ -31,7 +31,7 @@ namespace chart {
 
 struct DataSequenceModel
 {
-    typedef ::std::map< sal_Int32, ::com::sun::star::uno::Any > AnyMap;
+    typedef ::std::map< sal_Int32, css::uno::Any > AnyMap;
 
     AnyMap              maData;             /// Map of values, indexed by point identifier.
     OUString     maFormula;          /// Formula reference, e.g. into a spreadsheet.
diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx
index e84628917757..110b0d6e36f3 100644
--- a/include/oox/drawingml/color.hxx
+++ b/include/oox/drawingml/color.hxx
@@ -97,7 +97,7 @@ public:
     /** Returns the scheme name from the a:schemeClr element for interoperability purposes */
     OUString            getSchemeName() const { return msSchemeName; }
     /** Returns the unaltered list of transformations for interoperability purposes */
-    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getTransformations() const { return maInteropTransformations;}
+    css::uno::Sequence< css::beans::PropertyValue > getTransformations() const { return maInteropTransformations;}
 
     /** Translates between color transformation tokens and their names */
     static OUString     getColorTransformationName( sal_Int32 nElement );
@@ -146,7 +146,7 @@ private:
     sal_Int32           mnAlpha;        /// Alpha value (color opacity).
 
     OUString            msSchemeName;   /// Scheme name from the a:schemeClr element for interoperability purposes
-    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
+    css::uno::Sequence< css::beans::PropertyValue >
                         maInteropTransformations;   /// Unaltered list of transformations for interoperability purposes
 };
 
diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx
index 621695b550d9..6fa8261e7956 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -89,14 +89,14 @@ typedef std::shared_ptr< TableProperties > TablePropertiesPtr;
 
 
 /** converts the attributes from an CT_TLPoint into an awt Point with 1/1000% */
-com::sun::star::awt::Point GetPointPercent( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs );
+css::awt::Point GetPointPercent( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs );
 
 
 /** converts the attributes from an CT_Size2D into an awt Size with 1/100th mm */
-com::sun::star::awt::Size GetSize2D( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes );
+css::awt::Size GetSize2D( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes );
 
 /** converts the attributes from a CT_RelativeRect to an IntegerRectangle2D */
-com::sun::star::geometry::IntegerRectangle2D GetRelativeRect( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes );
+css::geometry::IntegerRectangle2D GetRelativeRect( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes );
 
 /** converts EMUs into 1/100th mmm */
 sal_Int32 GetCoordinate( sal_Int32 nValue );
@@ -118,7 +118,7 @@ sal_Int32 GetTextSpacingPoint(  const OUString& sValue );
 sal_Int32 GetTextSpacingPoint(  const sal_Int32 nValue );
 
 /** */
-::com::sun::star::style::TabAlign GetTabAlign( ::sal_Int32 aToken );
+css::style::TabAlign GetTabAlign( ::sal_Int32 aToken );
 
 float GetFontHeight( sal_Int32 nHeight );
 
@@ -132,13 +132,13 @@ sal_Int16 GetCaseMap( sal_Int32 nToken );
 sal_Int16 GetParaAdjust( sal_Int32 nAlign );
 
 // Converts vertical adjust tokens to a TextVerticalAdjust item
-::com::sun::star::drawing::TextVerticalAdjust GetTextVerticalAdjust( sal_Int32 nToken );
+css::drawing::TextVerticalAdjust GetTextVerticalAdjust( sal_Int32 nToken );
 
 // Converts a TextVerticalAdjust item to string value appearing in ooxml
-OOX_DLLPUBLIC const char* GetTextVerticalAdjust( ::com::sun::star::drawing::TextVerticalAdjust eAdjust );
+OOX_DLLPUBLIC const char* GetTextVerticalAdjust( css::drawing::TextVerticalAdjust eAdjust );
 
 // Converts a Hatch object to an ooxml pattern.
-const char* GetHatchPattern( const ::com::sun::star::drawing::Hatch& rHatch );
+const char* GetHatchPattern( const css::drawing::Hatch& rHatch );
 
 
 
@@ -149,7 +149,7 @@ struct IndexRange {
 };
 
 /** retrieve the content of CT_IndexRange */
-IndexRange GetIndexRange( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes );
+IndexRange GetIndexRange( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes );
 
 
 
diff --git a/include/oox/drawingml/fillproperties.hxx b/include/oox/drawingml/fillproperties.hxx
index 815881a52c28..0fa28adeaaea 100644
--- a/include/oox/drawingml/fillproperties.hxx
+++ b/include/oox/drawingml/fillproperties.hxx
@@ -41,8 +41,8 @@ struct GradientFillProperties
     typedef ::std::map< double, Color > GradientStopMap;
 
     GradientStopMap     maGradientStops;        /// Gradient stops (colors/transparence).
-    OptValue< ::com::sun::star::geometry::IntegerRectangle2D > moFillToRect;
-    OptValue< ::com::sun::star::geometry::IntegerRectangle2D > moTileRect;
+    OptValue< css::geometry::IntegerRectangle2D > moFillToRect;
+    OptValue< css::geometry::IntegerRectangle2D > moTileRect;
     OptValue< sal_Int32 > moGradientPath;       /// If set, gradient follows rectangle, circle, or shape.
     OptValue< sal_Int32 > moShadeAngle;         /// Rotation angle of linear gradients.
     OptValue< sal_Int32 > moShadeFlip;          /// Flip mode of gradient, if not stretched to shape.
@@ -88,27 +88,27 @@ struct ArtisticEffectProperties
 
 struct BlipFillProperties
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >
-                        mxGraphic;              /// The fill graphic.
+    css::uno::Reference< css::graphic::XGraphic >
+                          mxGraphic;              /// The fill graphic.
     OptValue< sal_Int32 > moBitmapMode;         /// Bitmap tile or stretch.
-    OptValue< ::com::sun::star::geometry::IntegerRectangle2D >
-                        moFillRect;             /// Stretch fill offsets.
-    OptValue< ::com::sun::star::geometry::IntegerRectangle2D >
-                        moClipRect;
+    OptValue< css::geometry::IntegerRectangle2D >
+                          moFillRect;             /// Stretch fill offsets.
+    OptValue< css::geometry::IntegerRectangle2D >
+                          moClipRect;
     OptValue< sal_Int32 > moTileOffsetX;        /// Width of bitmap tiles (EMUs).
     OptValue< sal_Int32 > moTileOffsetY;        /// Height of bitmap tiles (EMUs).
     OptValue< sal_Int32 > moTileScaleX;         /// Horizontal scaling of bitmap tiles (1/1000 percent).
     OptValue< sal_Int32 > moTileScaleY;         /// Vertical scaling of bitmap tiles (1/1000 percent).
     OptValue< sal_Int32 > moTileAlign;          /// Anchor point inside bitmap.
     OptValue< sal_Int32 > moTileFlip;           /// Flip mode of bitmap tiles.
-    OptValue< bool >    moRotateWithShape;      /// True = rotate bitmap with shape.
+    OptValue< bool >      moRotateWithShape;      /// True = rotate bitmap with shape.
     // effects
     OptValue< sal_Int32 > moColorEffect;        /// XML token for a color effect.
     OptValue< sal_Int32 > moBrightness;         /// Brightness in the range [-100000,100000].
     OptValue< sal_Int32 > moContrast;           /// Contrast in the range [-100000,100000].
-    Color               maColorChangeFrom;      /// Start color of color transformation.
-    Color               maColorChangeTo;        /// Destination color of color transformation.
-    Color               maDuotoneColors[2];     /// Duotone Colors
+    Color                 maColorChangeFrom;      /// Start color of color transformation.
+    Color                 maColorChangeTo;        /// Destination color of color transformation.
+    Color                 maDuotoneColors[2];     /// Duotone Colors
 
     ArtisticEffectProperties maEffect;          /// Artistic effect, not supported by core.
 
diff --git a/include/oox/drawingml/lineproperties.hxx b/include/oox/drawingml/lineproperties.hxx
index c38c7e14a0e4..bc1793dcdcd5 100644
--- a/include/oox/drawingml/lineproperties.hxx
+++ b/include/oox/drawingml/lineproperties.hxx
@@ -62,9 +62,9 @@ struct OOX_DLLPUBLIC LineProperties
                             sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const;
 
     /** Calculates the line style attribute from the internal state of the object */
-    ::com::sun::star::drawing::LineStyle  getLineStyle() const;
+    css::drawing::LineStyle  getLineStyle() const;
     /** Calculates the line joint attribute from the internal state of the object */
-    ::com::sun::star::drawing::LineJoint  getLineJoint() const;
+    css::drawing::LineJoint  getLineJoint() const;
     /** Calculates the line width attribute from the internal state of the object */
     sal_Int32           getLineWidth() const;
 };
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index ba5e89b8edff..486cd6c4f44e 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -103,14 +103,14 @@ public:
 
     EffectProperties&               getEffectProperties() { return *mpEffectPropertiesPtr; }
 
-    void                              setChildPosition( com::sun::star::awt::Point nPosition ){ maChPosition = nPosition; }
-    void                              setChildSize( com::sun::star::awt::Size aSize ){ maChSize = aSize; }
+    void                            setChildPosition( css::awt::Point nPosition ){ maChPosition = nPosition; }
+    void                            setChildSize( css::awt::Size aSize ){ maChSize = aSize; }
 
-    void                              setPosition( com::sun::star::awt::Point nPosition ){ maPosition = nPosition; }
-    const com::sun::star::awt::Point& getPosition() const { return maPosition; }
+    void                            setPosition( css::awt::Point nPosition ){ maPosition = nPosition; }
+    const css::awt::Point&          getPosition() const { return maPosition; }
 
-    void                              setSize( com::sun::star::awt::Size aSize ){ maSize = aSize; }
-    const com::sun::star::awt::Size&  getSize() const { return maSize; }
+    void                            setSize( css::awt::Size aSize ){ maSize = aSize; }
+    const css::awt::Size&           getSize() const { return maSize; }
 
     void                            setRotation( sal_Int32 nRotation ) { mnRotation = nRotation; }
     void                            setFlip( bool bFlipH, bool bFlipV ) { mbFlipH = bFlipH; mbFlipV = bFlipV; }
@@ -149,23 +149,23 @@ public:
     void                addShape(
                             ::oox::core::XmlFilterBase& rFilterBase,
                             const Theme* pTheme,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+                            const css::uno::Reference< css::drawing::XShapes >& rxShapes,
                             const basegfx::B2DHomMatrix& aTransformation,
                             FillProperties& rShapeOrParentShapeFillProps,
-                            const ::com::sun::star::awt::Rectangle* pShapeRect = 0,
+                            const css::awt::Rectangle* pShapeRect = 0,
                             ShapeIdMap* pShapeMap = 0 );
 
     void                addChildren(
                             ::oox::core::XmlFilterBase& rFilterBase,
                             const Theme* pTheme,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+                            const css::uno::Reference< css::drawing::XShapes >& rxShapes,
                             basegfx::B2DHomMatrix& aTransformation,
-                            const ::com::sun::star::awt::Rectangle* pShapeRect = 0,
+                            const css::awt::Rectangle* pShapeRect = 0,
                             ShapeIdMap* pShapeMap = 0 );
 
-    void                setXShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rXShape )
+    void                setXShape( const css::uno::Reference< css::drawing::XShape >& rXShape )
                             { mxShape = rXShape; };
-    const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &
+    const css::uno::Reference< css::drawing::XShape > &
                         getXShape() const { return mxShape; }
 
     virtual void        applyShapeReference( const Shape& rReferencedShape, bool bUseText = true );
@@ -180,10 +180,10 @@ public:
     void                setWps(bool bWps);
     bool                getWps() { return mbWps;}
     void                setTextBox(bool bTextBox);
-    const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> &
+    const css::uno::Sequence<css::beans::PropertyValue> &
                         getDiagramDoms() { return maDiagramDoms; }
-    void                setDiagramDoms(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rDiagramDoms) { maDiagramDoms = rDiagramDoms; }
-    com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::uno::Any > >resolveRelationshipsOfTypeFromOfficeDoc(
+    void                setDiagramDoms(const css::uno::Sequence<css::beans::PropertyValue>& rDiagramDoms) { maDiagramDoms = rDiagramDoms; }
+    css::uno::Sequence< css::uno::Sequence< css::uno::Any > >resolveRelationshipsOfTypeFromOfficeDoc(
                                                                           core::XmlFilterBase& rFilter, const OUString& sFragment, const OUString& sType );
     void                setLinkedTxbxAttributes(const LinkedTxbxAttr& rhs){ maLinkedTxbxAttr = rhs; };
     void                setTxbxHasLinkedTxtBox( const bool rhs){ mbHasLinkedTxbx = rhs; };
@@ -192,13 +192,13 @@ public:
 
 protected:
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+    css::uno::Reference< css::drawing::XShape >
                         createAndInsert(
                             ::oox::core::XmlFilterBase& rFilterBase,
                             const OUString& rServiceName,
                             const Theme* pTheme,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
-                            const ::com::sun::star::awt::Rectangle* pShapeRect,
+                            const css::uno::Reference< css::drawing::XShapes >& rxShapes,
+                            const css::awt::Rectangle* pShapeRect,
                             bool bClearText,
                             bool bDoNotInsertEmptyTextBody,
                             basegfx::B2DHomMatrix& aTransformation,
@@ -209,35 +209,35 @@ protected:
                             ::oox::core::XmlFilterBase& rFilterBase,
                             Shape& rMaster,
                             const Theme* pTheme,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
-                            const ::com::sun::star::awt::Rectangle& rClientRect,
+                            const css::uno::Reference< css::drawing::XShapes >& rxShapes,
+                            const css::awt::Rectangle& rClientRect,
                             ShapeIdMap* pShapeMap,
                             const basegfx::B2DHomMatrix& aTransformation );
 
     void                keepDiagramCompatibilityInfo( ::oox::core::XmlFilterBase& rFilterBase );
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+    css::uno::Reference< css::drawing::XShape >
                         renderDiagramToGraphic( ::oox::core::XmlFilterBase& rFilterBase );
 
     OUString finalizeServiceName(
                             ::oox::core::XmlFilterBase& rFilter,
                             const OUString& rServiceName,
-                            const ::com::sun::star::awt::Rectangle& rShapeRect );
+                            const css::awt::Rectangle& rShapeRect );
 
     virtual void        finalizeXShape(
                             ::oox::core::XmlFilterBase& rFilter,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes );
+                            const css::uno::Reference< css::drawing::XShapes >& rxShapes );
 
     void                putPropertyToGrabBag(
-                            const OUString& sPropertyName, const ::com::sun::star::uno::Any& aPropertyValue );
+                            const OUString& sPropertyName, const css::uno::Any& aPropertyValue );
     void                putPropertyToGrabBag(
-                            const ::com::sun::star::beans::PropertyValue& pProperty );
+                            const css::beans::PropertyValue& pProperty );
     void                putPropertiesToGrabBag(
-                            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties );
+                            const css::uno::Sequence< css::beans::PropertyValue >& aProperties );
 
     std::vector< ShapePtr >     maChildren;               // only used for group shapes
-    com::sun::star::awt::Size   maChSize;                 // only used for group shapes
-    com::sun::star::awt::Point  maChPosition;             // only used for group shapes
+    css::awt::Size   maChSize;                 // only used for group shapes
+    css::awt::Point  maChPosition;             // only used for group shapes
     bool                        mbIsChild;
 
     TextBodyPtr                 mpTextBody;
@@ -254,20 +254,20 @@ protected:
     PropertyMap                 maShapeProperties;
     PropertyMap                 maDefaultShapeProperties;
     TextListStylePtr            mpMasterTextListStyle;
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape;
+    css::uno::Reference< css::drawing::XShape > mxShape;
 
-    OUString       msServiceName;
-    OUString       msName;
-    OUString       msId;
-    sal_Int32           mnSubType;      // if this type is not zero, then the shape is a placeholder
-    OptValue< sal_Int32 >   moSubTypeIndex;
+    OUString                    msServiceName;
+    OUString                    msName;
+    OUString                    msId;
+    sal_Int32                   mnSubType;      // if this type is not zero, then the shape is a placeholder
+    OptValue< sal_Int32 >       moSubTypeIndex;
 
-    ShapeStyleRefMap   maShapeStyleRefs;
+    ShapeStyleRefMap            maShapeStyleRefs;
 
-    com::sun::star::awt::Size       maSize;
-    com::sun::star::awt::Point      maPosition;
-    ::std::vector<OUString>    maExtDrawings;
-    Color                           maFontRefColorForNodes;
+    css::awt::Size              maSize;
+    css::awt::Point             maPosition;
+    ::std::vector<OUString>     maExtDrawings;
+    Color                       maFontRefColorForNodes;
 
 private:
     enum FrameType
@@ -299,7 +299,7 @@ private:
     LinkedTxbxAttr                  maLinkedTxbxAttr;
     bool                            mbHasLinkedTxbx; // this text box has linked text box ?
 
-    com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maDiagramDoms;
+    css::uno::Sequence<css::beans::PropertyValue> maDiagramDoms;
 };
 
 } }
diff --git a/include/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx
index 13e8e507a7a9..abe5505d1740 100644
--- a/include/oox/drawingml/shapepropertymap.hxx
+++ b/include/oox/drawingml/shapepropertymap.hxx
@@ -109,33 +109,33 @@ public:
     bool                hasNamedLineMarkerInTable( const OUString& rMarkerName ) const;
 
     /** Sets the specified shape property to the passed value. */
-    bool                setAnyProperty( ShapePropertyId ePropId, const ::com::sun::star::uno::Any& rValue );
+    bool                setAnyProperty( ShapePropertyId ePropId, const css::uno::Any& rValue );
 
     /** Sets the specified shape property to the passed value. */
     template< typename Type >
     bool         setProperty( ShapePropertyId ePropId, const Type& rValue )
-                            { return setAnyProperty( ePropId, ::com::sun::star::uno::Any( rValue ) ); }
+                            { return setAnyProperty( ePropId, css::uno::Any( rValue ) ); }
 
     using PropertyMap::setAnyProperty;
     using PropertyMap::setProperty;
 
 private:
     /** Sets an explicit line marker, or creates a named line marker. */
-    bool                setLineMarker( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
+    bool                setLineMarker( sal_Int32 nPropId, const css::uno::Any& rValue );
     /** Sets an explicit line dash, or creates a named line dash. */
-    bool                setLineDash( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
+    bool                setLineDash( sal_Int32 nPropId, const css::uno::Any& rValue );
     /** Sets an explicit fill gradient, or creates a named fill gradient. */
-    bool                setFillGradient( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
+    bool                setFillGradient( sal_Int32 nPropId, const css::uno::Any& rValue );
     /** Creates a named transparency gradient. */
-    bool                setGradientTrans( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
+    bool                setGradientTrans( sal_Int32 nPropId, const css::uno::Any& rValue );
     /** Sets an explicit fill bitmap URL, or creates a named fill bitmap URL. */
-    bool                setFillBitmapUrl( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
+    bool                setFillBitmapUrl( sal_Int32 nPropId, const css::uno::Any& rValue );
     /** Sets an explicit fill bitmap URL and pushes the name to FillBitmapName */
-    bool                setFillBitmapNameFromUrl( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
+    bool                setFillBitmapNameFromUrl( sal_Int32 nPropId, const css::uno::Any& rValue );
 
     // not implemented, to prevent implicit conversion from enum to int
-    ::com::sun::star::uno::Any& operator[]( ShapePropertyId ePropId );
-    const ::com::sun::star::uno::Any& operator[]( ShapePropertyId ePropId ) const;
+    css::uno::Any& operator[]( ShapePropertyId ePropId );
+    const css::uno::Any& operator[]( ShapePropertyId ePropId ) const;
 
 private:
     ModelObjectHelper&  mrModelObjHelper;
diff --git a/include/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx
index f97a821ab919..557e9a16248e 100644
--- a/include/oox/drawingml/theme.hxx
+++ b/include/oox/drawingml/theme.hxx
@@ -85,11 +85,10 @@ public:
     Shape&                   getTxDef() { return maTxDef; }
     const Shape&             getTxDef() const { return maTxDef; }
 
-    void                            setFragment( const ::com::sun::star::uno::Reference<
-                                                    ::com::sun::star::xml::dom::XDocument>& xRef ) { mxFragment=xRef; }
+    void                     setFragment( const css::uno::Reference< css::xml::dom::XDocument>& xRef ) { mxFragment=xRef; }
 
 private:
-    OUString     maStyleName;
+    OUString            maStyleName;
     ClrScheme           maClrScheme;
     FillStyleList       maFillStyleList;
     FillStyleList       maBgFillStyleList;
@@ -99,8 +98,7 @@ private:
     Shape               maSpDef;
     Shape               maLnDef;
     Shape               maTxDef;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::dom::XDocument> mxFragment;
+    css::uno::Reference< css::xml::dom::XDocument> mxFragment;
 };
 
 
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index d3ec9236f4d7..3fe5512c81cb 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -111,27 +111,27 @@ public:
 
     // input streams ----------------------------------------------------------
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+    static css::uno::Reference< css::io::XInputStream >
                         openInputStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                             const OUString& rFileName );
 
     // output streams ---------------------------------------------------------
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
+    static css::uno::Reference< css::io::XOutputStream >
                         openOutputStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                             const OUString& rFileName );
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream2 >
+    static css::uno::Reference< css::io::XTextOutputStream2 >
                         openTextOutputStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rxOutStrm,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::io::XOutputStream >& rxOutStrm,
                             rtl_TextEncoding eTextEnc );
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream2 >
+    static css::uno::Reference< css::io::XTextOutputStream2 >
                         openTextOutputStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                             const OUString& rFileName,
                             rtl_TextEncoding eTextEnc );
 };
@@ -146,7 +146,7 @@ public:
     /*implicit*/ BinaryInputStreamRef( BinaryInputStream* pInStrm ) :
                             ::oox::BinaryInputStreamRef( pInStrm ) {}
 
-    /*implicit*/ BinaryInputStreamRef( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm ) :
+    /*implicit*/ BinaryInputStreamRef( const css::uno::Reference< css::io::XInputStream >& rxInStrm ) :
                             ::oox::BinaryInputStreamRef( new BinaryXInputStream( rxInStrm, true ) ) {}
 
     template< typename StreamType >
@@ -829,18 +829,18 @@ class SharedConfigData : public Base, public ConfigItemBase
 public:
     explicit            SharedConfigData(
                             const OUString& rFileName,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                             const StorageRef& rxRootStrg,
                             const OUString& rSysFileName );
 
     virtual             ~SharedConfigData();
 
-    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getContext() const { return mxContext; }
+    const css::uno::Reference< css::uno::XComponentContext >& getContext() const { return mxContext; }
     const StorageRef& getRootStorage() const { return mxRootStrg; }
     const OUString& getSysFileName() const { return maSysFileName; }
 
     void                setOption( const OUString& rKey, const OUString& rData );
-    const OUString* getOption( const OUString& rKey ) const;
+    const OUString*      getOption( const OUString& rKey ) const;
 
     template< typename ListType >
     std::shared_ptr< ListType > createNameList( const OUString& rListName );
@@ -869,13 +869,13 @@ private:
     typedef ::std::map< OUString, OUString >  ConfigDataMap;
     typedef ::std::map< OUString, NameListRef >      NameListMap;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
+    css::uno::Reference< css::uno::XComponentContext > mxContext;
     StorageRef          mxRootStrg;
-    OUString     maSysFileName;
+    OUString            maSysFileName;
     ConfigFileSet       maConfigFiles;
     ConfigDataMap       maConfigData;
     NameListMap         maNameLists;
-    OUString     maConfigPath;
+    OUString            maConfigPath;
     bool                mbLoaded;
     bool                mbPwCancelled;
 };
@@ -913,13 +913,13 @@ public:
                             const ::oox::core::FilterBase& rFilter );
     explicit            Config(
                             const sal_Char* pcEnvVar,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                             const StorageRef& rxRootStrg,
                             const OUString& rSysFileName );
 
     virtual             ~Config();
 
-    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getContext() const { return mxCfgData->getContext(); }
+    const css::uno::Reference< css::uno::XComponentContext >& getContext() const { return mxCfgData->getContext(); }
     const StorageRef& getRootStorage() const { return mxCfgData->getRootStorage(); }
     const OUString& getSysFileName() const { return mxCfgData->getSysFileName(); }
 
@@ -953,7 +953,7 @@ protected:
                             const ::oox::core::FilterBase& rFilter );
     void                construct(
                             const sal_Char* pcEnvVar,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                             const StorageRef& rxRootStrg,
                             const OUString& rSysFileName );
 
@@ -1006,7 +1006,7 @@ class Output : public Base
 {
 public:
     explicit            Output(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                             const OUString& rFileName );
 
 
@@ -1038,7 +1038,7 @@ public:
     void                writeString( const OUString& rStr );
     void                writeArray( const sal_uInt8* pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP );
     void                writeBool( bool bData );
-    void                writeDateTime( const ::com::sun::star::util::DateTime& rDateTime );
+    void                writeDateTime( const css::util::DateTime& rDateTime );
 
     template< typename Type >
     void                writeDec( Type nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' )
@@ -1072,10 +1072,10 @@ private:
 private:
     typedef ::std::vector< sal_Int32 > StringLenVec;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream2 > mxStrm;
-    OUString     maIndent;
-    OUStringBuffer maLine;
-    OUString     maLastItem;
+    css::uno::Reference< css::io::XTextOutputStream2 > mxStrm;
+    OUString            maIndent;
+    OUStringBuffer      maLine;
+    OUString            maLastItem;
     StringLenVec        maColPos;
     size_t              mnCol;
     size_t              mnItemLevel;
@@ -1184,7 +1184,7 @@ class ObjectBase : public Base
 public:
     virtual             ~ObjectBase();
 
-    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
+    const css::uno::Reference< css::uno::XComponentContext >&
                         getContext() const { return mxConfig->getContext(); }
 
     void                dump();
@@ -1226,7 +1226,7 @@ protected:
     virtual void        implDump() override;
 
     virtual void        implDumpStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
+                            const css::uno::Reference< css::io::XInputStream >& rxStrm,
                             const OUString& rStrgPath,
                             const OUString& rStrmName,
                             const OUString& rSysFileName );
@@ -1307,7 +1307,7 @@ protected:
     void                writeCharItem( const String& rName, sal_Unicode cData );
     void                writeStringItem( const String& rName, const OUString& rData );
     void                writeArrayItem( const String& rName, const sal_uInt8* pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP );
-    void                writeDateTimeItem( const String& rName, const ::com::sun::star::util::DateTime& rDateTime );
+    void                writeDateTimeItem( const String& rName, const css::util::DateTime& rDateTime );
     void                writeGuidItem( const String& rName, const OUString& rGuid );
 
     template< typename Type >
@@ -1487,7 +1487,7 @@ protected:
     OUString     dumpCharArray( const String& rName, sal_Int32 nLen, rtl_TextEncoding eTextEnc, bool bHideTrailingNul = false );
     OUString     dumpUnicodeArray( const String& rName, sal_Int32 nLen, bool bHideTrailingNul = false );
 
-    ::com::sun::star::util::DateTime dumpFileTime( const String& rName = EMPTY_STRING );
+    css::util::DateTime dumpFileTime( const String& rName = EMPTY_STRING );
     OUString     dumpGuid( const String& rName = EMPTY_STRING );
 
     void                dumpItem( const ItemFormat& rItemFmt );
diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx
index 629de0f40858..e3940fe57d3f 100644
--- a/include/oox/dump/oledumper.hxx
+++ b/include/oox/dump/oledumper.hxx
@@ -149,7 +149,7 @@ protected:
     void                construct( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath );
 
     virtual void        implDumpStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
+                            const css::uno::Reference< css::io::XInputStream >& rxStrm,
                             const OUString& rStrgPath,
                             const OUString& rStrmName,
                             const OUString& rSysFileName ) override;
@@ -726,7 +726,7 @@ public:
 
 protected:
     virtual void        implDumpStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
+                            const css::uno::Reference< css::io::XInputStream >& rxStrm,
                             const OUString& rStrgPath,
                             const OUString& rStrmName,
                             const OUString& rSysFileName ) override;
@@ -821,7 +821,7 @@ public:
 
 protected:
     virtual void        implDumpStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
+                            const css::uno::Reference< css::io::XInputStream >& rxStrm,
                             const OUString& rStrgPath,
                             const OUString& rStrmName,
                             const OUString& rSysFileName ) override;
@@ -843,7 +843,7 @@ public:
 
 protected:
     virtual void        implDumpStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
+                            const css::uno::Reference< css::io::XInputStream >& rxStrm,
                             const OUString& rStrgPath,
                             const OUString& rStrmName,
                             const OUString& rSysFileName ) override;
@@ -861,7 +861,7 @@ public:
 
 protected:
     virtual void        implDumpStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
+                            const css::uno::Reference< css::io::XInputStream >& rxStrm,
                             const OUString& rStrgPath,
                             const OUString& rStrmName,
                             const OUString& rSysFileName ) override;
diff --git a/include/oox/dump/pptxdumper.hxx b/include/oox/dump/pptxdumper.hxx
index 82f6a022872d..5390df05c0e7 100644
--- a/include/oox/dump/pptxdumper.hxx
+++ b/include/oox/dump/pptxdumper.hxx
@@ -37,7 +37,7 @@ public:
 
 protected:
     virtual void        implDumpStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
+                            const css::uno::Reference< css::io::XInputStream >& rxStrm,
                             const OUString& rStrgPath,
                             const OUString& rStrmName,
                             const OUString& rSysFileName ) override;
@@ -51,8 +51,8 @@ public:
     explicit            Dumper( const ::oox::core::FilterBase& rFilter );
 
     explicit            Dumper(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::io::XInputStream >& rxInStrm,
                             const OUString& rSysFileName );
 
 protected:
diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx
index d7c1ef6eea5e..a4651a1cabf5 100644
--- a/include/oox/dump/xlsbdumper.hxx
+++ b/include/oox/dump/xlsbdumper.hxx
@@ -63,7 +63,7 @@ public:
 
 protected:
     virtual void        implDumpStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
+                            const css::uno::Reference< css::io::XInputStream >& rxStrm,
                             const OUString& rStrgPath,
                             const OUString& rStrmName,
                             const OUString& rSysFileName ) override;
@@ -77,8 +77,8 @@ public:
     explicit            Dumper( const ::oox::core::FilterBase& rFilter );
 
     explicit            Dumper(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::io::XInputStream >& rxInStrm,
                             const OUString& rSysFileName );
 
 protected:
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 378ae5e5a20d..b7eafa33ae44 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -98,28 +98,28 @@ private:
     DMLTextExport* mpTextExport;
 
 protected:
-    ::com::sun::star::uno::Any mAny;
-    ::sax_fastparser::FSHelperPtr mpFS;
-    ::oox::core::XmlFilterBase* mpFB;
+    css::uno::Any                             mAny;
+    ::sax_fastparser::FSHelperPtr             mpFS;
+    ::oox::core::XmlFilterBase*               mpFB;
     /// If set, this is the parent of the currently handled shape.
-    com::sun::star::uno::Reference<com::sun::star::drawing::XShape> m_xParent;
-    bool mbIsBackgroundDark;
+    css::uno::Reference<css::drawing::XShape> m_xParent;
+    bool                                      mbIsBackgroundDark;
 
-    bool GetProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, const OUString& aName );
-    bool GetPropertyAndState( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
-                  ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > rXPropState,
-                  const OUString& aName, ::com::sun::star::beans::PropertyState& eState );
-    OUString GetFieldValue( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun, bool& bIsURLField );
+    bool GetProperty( css::uno::Reference< css::beans::XPropertySet > rXPropSet, const OUString& aName );
+    bool GetPropertyAndState( css::uno::Reference< css::beans::XPropertySet > rXPropSet,
+                  css::uno::Reference< css::beans::XPropertyState > rXPropState,
+                  const OUString& aName, css::beans::PropertyState& eState );
+    OUString GetFieldValue( css::uno::Reference< css::text::XTextRange > rRun, bool& bIsURLField );
 
 
     /// If bRelPathToMedia is true add "../" to image folder path while adding the image relationship
     OUString WriteImage( const OUString& rURL, bool bRelPathToMedia = false);
-    void WriteStyleProperties( sal_Int32 nTokenId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties );
+    void WriteStyleProperties( sal_Int32 nTokenId, const css::uno::Sequence< css::beans::PropertyValue >& aProperties );
 
     const char* GetComponentDir();
     const char* GetRelationCompPrefix();
 
-    static bool EqualGradients( ::com::sun::star::awt::Gradient aGradient1, ::com::sun::star::awt::Gradient aGradient2 );
+    static bool EqualGradients( css::awt::Gradient aGradient1, css::awt::Gradient aGradient2 );
 
 public:
     DrawingML( ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX, DMLTextExport* pTextExport = 0 )
@@ -136,69 +136,69 @@ public:
     OUString WriteImage( const Graphic &rGraphic , bool bRelPathToMedia = false);
 
     void WriteColor( sal_uInt32 nColor, sal_Int32 nAlpha = MAX_PERCENT );
-    void WriteColor( const OUString& sColorSchemeName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aTransformations );
-    void WriteColorTransformations( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aTransformations );
+    void WriteColor( const OUString& sColorSchemeName, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations );
+    void WriteColorTransformations( const css::uno::Sequence< css::beans::PropertyValue >& aTransformations );
     void WriteGradientStop( sal_uInt16 nStop, sal_uInt32 nColor );
-    void WriteLineArrow( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, bool bLineStart );
+    void WriteLineArrow( css::uno::Reference< css::beans::XPropertySet > rXPropSet, bool bLineStart );
     void WriteConnectorConnections( EscherConnectorListEntry& rConnectorEntry, sal_Int32 nStartID, sal_Int32 nEndID );
 
     void WriteSolidFill( sal_uInt32 nColor, sal_Int32 nAlpha = MAX_PERCENT );
-    void WriteSolidFill( const OUString& sSchemeName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aTransformations );
-    void WriteSolidFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
-    void WriteGradientFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
-    void WriteGradientFill( ::com::sun::star::awt::Gradient rGradient );
-    void WriteGrabBagGradientFill( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aGradientStops, ::com::sun::star::awt::Gradient rGradient);
+    void WriteSolidFill( const OUString& sSchemeName, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations );
+    void WriteSolidFill( css::uno::Reference< css::beans::XPropertySet > rXPropSet );
+    void WriteGradientFill( css::uno::Reference< css::beans::XPropertySet > rXPropSet );
+    void WriteGradientFill( css::awt::Gradient rGradient );
+    void WriteGrabBagGradientFill( const css::uno::Sequence< css::beans::PropertyValue >& aGradientStops, css::awt::Gradient rGradient);
 
-    void WriteBlipOrNormalFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
+    void WriteBlipOrNormalFill( css::uno::Reference< css::beans::XPropertySet > rXPropSet,
             const OUString& rURLPropName );
-    void WriteBlipFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
+    void WriteBlipFill( css::uno::Reference< css::beans::XPropertySet > rXPropSet,
                          const OUString& sBitmapURL, sal_Int32 nXmlNamespace,
                          bool bWriteMode, bool bRelPathToMedia = false );
-    void WriteBlipFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
+    void WriteBlipFill( css::uno::Reference< css::beans::XPropertySet > rXPropSet,
             const OUString& sURLPropName );
-    void WriteBlipFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
+    void WriteBlipFill( css::uno::Reference< css::beans::XPropertySet > rXPropSet,
                          const OUString& sURLPropName, sal_Int32 nXmlNamespace );
-    void WritePattFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
-    void WriteSrcRect( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, const OUString& );
-    void WriteOutline( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
-    void WriteStretch( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, const OUString& rURL );
-    void WriteLinespacing( ::com::sun::star::style::LineSpacing& rLineSpacing );
+    void WritePattFill( css::uno::Reference< css::beans::XPropertySet > rXPropSet );
+    void WriteSrcRect( css::uno::Reference< css::beans::XPropertySet >, const OUString& );
+    void WriteOutline( css::uno::Reference< css::beans::XPropertySet > rXPropSet );
+    void WriteStretch( css::uno::Reference< css::beans::XPropertySet > rXPropSet, const OUString& rURL );
+    void WriteLinespacing( css::style::LineSpacing& rLineSpacing );
 
-    OUString WriteBlip( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
+    OUString WriteBlip( css::uno::Reference< css::beans::XPropertySet > rXPropSet,
             const OUString& rURL, bool bRelPathToMedia = false , const Graphic *pGraphic=NULL );
-    void WriteBlipMode( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, const OUString& rURL );
+    void WriteBlipMode( css::uno::Reference< css::beans::XPropertySet > rXPropSet, const OUString& rURL );
 
-    void WriteShapeTransformation( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rXShape,
+    void WriteShapeTransformation( css::uno::Reference< css::drawing::XShape > rXShape,
                   sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = false, bool bSuppressRotation = false );
     void WriteTransformation( const Rectangle& rRectangle,
                   sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = false, sal_Int32 nRotation = 0 );
 
-    void WriteText( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > rXIface, const OUString& presetWarp, bool bBodyPr = true, bool bText = true, sal_Int32 nXmlNamespace = 0);
-    void WriteParagraph( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > rParagraph );
-    void WriteParagraphProperties( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > rParagraph );
-    void WriteParagraphNumbering( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
+    void WriteText( css::uno::Reference< css::uno::XInterface > rXIface, const OUString& presetWarp, bool bBodyPr = true, bool bText = true, sal_Int32 nXmlNamespace = 0);
+    void WriteParagraph( css::uno::Reference< css::text::XTextContent > rParagraph );
+    void WriteParagraphProperties( css::uno::Reference< css::text::XTextContent > rParagraph );
+    void WriteParagraphNumbering( css::uno::Reference< css::beans::XPropertySet > rXPropSet,
                                   sal_Int16 nLevel );
-    void WriteRun( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun );
-    void WriteRunProperties( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rRun, bool bIsField, sal_Int32 nElement = XML_rPr ,bool bCheckDirect = true);
+    void WriteRun( css::uno::Reference< css::text::XTextRange > rRun );
+    void WriteRunProperties( css::uno::Reference< css::beans::XPropertySet > rRun, bool bIsField, sal_Int32 nElement = XML_rPr ,bool bCheckDirect = true);
 
     void WritePresetShape( const char* pShape );
-    void WritePresetShape( const char* pShape, MSO_SPT eShapeType, bool bPredefinedHandlesUsed, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, const ::com::sun::star::beans::PropertyValue& rProp );
+    void WritePresetShape( const char* pShape, MSO_SPT eShapeType, bool bPredefinedHandlesUsed, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, const css::beans::PropertyValue& rProp );
     void WriteCustomGeometry( css::uno::Reference<css::drawing::XShape> rXShape );
     void WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon );
-    void WriteFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropSet );
-    void WriteShapeStyle( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
-    void WriteShapeEffects( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
+    void WriteFill( css::uno::Reference< css::beans::XPropertySet > xPropSet );
+    void WriteShapeStyle( css::uno::Reference< css::beans::XPropertySet > rXPropSet );
+    void WriteShapeEffects( css::uno::Reference< css::beans::XPropertySet > rXPropSet );
     void WriteShapeEffect( const OUString& sName, const css::uno::Sequence< css::beans::PropertyValue >& aEffectProps );
-    void WriteShape3DEffects( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
-    void WriteArtisticEffect( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
-    OString WriteWdpPicture( const OUString& rFileId, const ::com::sun::star::uno::Sequence< sal_Int8 >& rPictureData );
-    sal_Int32 getBulletMarginIndentation (::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,sal_Int16 nLevel, const OUString& propName);
+    void WriteShape3DEffects( css::uno::Reference< css::beans::XPropertySet > rXPropSet );
+    void WriteArtisticEffect( css::uno::Reference< css::beans::XPropertySet > rXPropSet );
+    OString WriteWdpPicture( const OUString& rFileId, const css::uno::Sequence< sal_Int8 >& rPictureData );
+    sal_Int32 getBulletMarginIndentation (css::uno::Reference< css::beans::XPropertySet > rXPropSet,sal_Int16 nLevel, const OUString& propName);
 
     static void ResetCounters();
 
     static OString GetUUID();
 
-    static sal_Unicode SubstituteBullet( sal_Unicode cBulletId, ::com::sun::star::awt::FontDescriptor& rFontDesc );
+    static sal_Unicode SubstituteBullet( sal_Unicode cBulletId, css::awt::FontDescriptor& rFontDesc );
 
     static sal_uInt32 ColorWithIntensity( sal_uInt32 nColor, sal_uInt32 nIntensity );
 
@@ -207,7 +207,7 @@ public:
     sax_fastparser::FSHelperPtr     CreateOutputStream (
                                         const OUString& sFullStream,
                                         const OUString& sRelativeStream,
-                                        const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xParentRelation,
+                                        const css::uno::Reference< css::io::XOutputStream >& xParentRelation,
                                         const char* sContentType,
                                         const char* sRelationshipType,
                                         OUString* pRelationshipId = NULL );
diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index eccda13e3899..3a9ccbec4ff0 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -56,7 +56,7 @@ private:
     static int mnEmbeddeDocumentCounter;
     struct ShapeCheck
     {
-        bool operator()( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& s1, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& s2 ) const
+        bool operator()( const css::uno::Reference< css::drawing::XShape>& s1, const css::uno::Reference< css::drawing::XShape>& s2 ) const
         {
             return s1 == s2;
         }
@@ -64,7 +64,7 @@ private:
 
     struct ShapeHash
     {
-        size_t operator()( const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > ) const;
+        size_t operator()( const css::uno::Reference < css::drawing::XShape > ) const;
     };
 
 public:
@@ -73,7 +73,7 @@ public:
 protected:
     sal_Int32           mnShapeIdMax, mnPictureIdMax;
 
-    void WriteGraphicObjectShapePart( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, const Graphic *pGraphic=NULL );
+    void WriteGraphicObjectShapePart( css::uno::Reference< css::drawing::XShape > xShape, const Graphic *pGraphic=NULL );
 
 private:
     sal_Int32           mnXmlNamespace;
@@ -81,7 +81,7 @@ private:
     MapMode             maMapModeSrc, maMapModeDest;
     std::shared_ptr<URLTransformer> mpURLTransformer;
 
-    ::com::sun::star::awt::Size MapSize( const ::com::sun::star::awt::Size& ) const;
+    css::awt::Size MapSize( const css::awt::Size& ) const;
 
     ShapeHashMap maShapeMap;
     ShapeHashMap* mpShapeMap;
@@ -94,32 +94,32 @@ public:
 
     void SetURLTranslator(std::shared_ptr<URLTransformer> pTransformer);
 
-    static bool     NonEmptyText( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xIface );
+    static bool         NonEmptyText( css::uno::Reference< css::uno::XInterface > xIface );
 
     ShapeExport&
-                        WriteBezierShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, bool bClosed );
+                        WriteBezierShape( css::uno::Reference< css::drawing::XShape > xShape, bool bClosed );
     ShapeExport&
-                        WriteClosedBezierShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
+                        WriteClosedBezierShape( css::uno::Reference< css::drawing::XShape > xShape );
     ShapeExport&
-                        WriteConnectorShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
+                        WriteConnectorShape( css::uno::Reference< css::drawing::XShape > xShape );
     ShapeExport&
-                        WriteCustomShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
+                        WriteCustomShape( css::uno::Reference< css::drawing::XShape > xShape );
     ShapeExport&
-                        WriteEllipseShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
+                        WriteEllipseShape( css::uno::Reference< css::drawing::XShape > xShape );
     ShapeExport&
-                        WriteGraphicObjectShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
+                        WriteGraphicObjectShape( css::uno::Reference< css::drawing::XShape > xShape );
     ShapeExport&
-                        WriteGroupShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
+                        WriteGroupShape( css::uno::Reference< css::drawing::XShape > xShape );
     ShapeExport&
-                        WriteLineShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
+                        WriteLineShape( css::uno::Reference< css::drawing::XShape > xShape );
     ShapeExport&
-                        WriteNonVisualDrawingProperties( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, const char* sName );
+                        WriteNonVisualDrawingProperties( css::uno::Reference< css::drawing::XShape > xShape, const char* sName );
     virtual ShapeExport&
-                        WriteNonVisualProperties( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
+                        WriteNonVisualProperties( css::uno::Reference< css::drawing::XShape > xShape );
     ShapeExport&
-                        WriteOpenBezierShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
+                        WriteOpenBezierShape( css::uno::Reference< css::drawing::XShape > xShape );
     ShapeExport&
-                        WriteRectangleShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
+                        WriteRectangleShape( css::uno::Reference< css::drawing::XShape > xShape );
 
     /**
      * Write the DrawingML for a particular shape.
@@ -158,29 +158,27 @@ public:
      * @param xShape    The shape to export as DrawingML.
      * @return   <tt>*this</tt>
      */
-    ShapeExport&
-                        WriteShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
-    ShapeExport&
-        WriteTextBox( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xIface, sal_Int32 nXmlNamespace );
+    ShapeExport&       WriteShape( css::uno::Reference< css::drawing::XShape > xShape );
+    ShapeExport&       WriteTextBox( css::uno::Reference< css::uno::XInterface > xIface, sal_Int32 nXmlNamespace );
     virtual ShapeExport&
-                        WriteTextShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
+                        WriteTextShape( css::uno::Reference< css::drawing::XShape > xShape );
     ShapeExport&
-                        WriteTableShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
+                        WriteTableShape( css::uno::Reference< css::drawing::XShape > xShape );
     ShapeExport&
-                        WriteOLE2Shape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
+                        WriteOLE2Shape( css::uno::Reference< css::drawing::XShape > xShape );
     virtual ShapeExport&
-                        WriteUnknownShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
+                        WriteUnknownShape( css::uno::Reference< css::drawing::XShape > xShape );
 
-    void WriteTable( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rXShape );
+    void WriteTable( css::uno::Reference< css::drawing::XShape > rXShape );
 
-    void WriteTableCellProperties(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet);
+    void WriteTableCellProperties(css::uno::Reference< css::beans::XPropertySet > rXPropSet);
 
-    void WriteTableCellBorders(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet);
+    void WriteTableCellBorders(css::uno::Reference< css::beans::XPropertySet > rXPropSet);
 
-    sal_Int32 GetNewShapeID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rShape );
-    sal_Int32 GetNewShapeID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rShape, ::oox::core::XmlFilterBase* pFB );
-    sal_Int32 GetShapeID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rShape );
-    static sal_Int32 GetShapeID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rShape, ShapeHashMap* pShapeMap );
+    sal_Int32 GetNewShapeID( const css::uno::Reference< css::drawing::XShape > rShape );
+    sal_Int32 GetNewShapeID( const css::uno::Reference< css::drawing::XShape > rShape, ::oox::core::XmlFilterBase* pFB );
+    sal_Int32 GetShapeID( const css::uno::Reference< css::drawing::XShape > rShape );
+    static sal_Int32 GetShapeID( const css::uno::Reference< css::drawing::XShape > rShape, ShapeHashMap* pShapeMap );
 };
 
 }}
diff --git a/include/oox/helper/attributelist.hxx b/include/oox/helper/attributelist.hxx
index edcf194b124c..427e4d63994b 100644
--- a/include/oox/helper/attributelist.hxx
+++ b/include/oox/helper/attributelist.hxx
@@ -73,10 +73,10 @@ class OOX_DLLPUBLIC AttributeList
 {
 public:
     explicit            AttributeList(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs );
+                            const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs );
 
     /** Returns the wrapped com.sun.star.xml.sax.XFastAttributeList object. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >
+    css::uno::Reference< css::xml::sax::XFastAttributeList >
                         getFastAttributeList() const { return mxAttribs; }
 
     /** Returns true, if the specified attribute is present. */
@@ -113,7 +113,7 @@ public:
     OptValue< bool >    getBool( sal_Int32 nAttrToken ) const;
 
     /** Returns the date/time value of the specified attribute. */
-    OptValue< ::com::sun::star::util::DateTime > getDateTime( sal_Int32 nAttrToken ) const;
+    OptValue< css::util::DateTime > getDateTime( sal_Int32 nAttrToken ) const;
 
     // defaulted return values ------------------------------------------------
 
@@ -160,10 +160,10 @@ public:
 
     /** Returns the date/time value of the specified attribute, or the default
         value if the attribute is missing or not convertible to a date/time value. */
-    ::com::sun::star::util::DateTime getDateTime( sal_Int32 nAttrToken, const ::com::sun::star::util::DateTime& rDefault ) const;
+    css::util::DateTime getDateTime( sal_Int32 nAttrToken, const css::util::DateTime& rDefault ) const;
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >
+    css::uno::Reference< css::xml::sax::XFastAttributeList >
                         mxAttribs;
     mutable sax_fastparser::FastAttributeList *mpAttribList;
     sax_fastparser::FastAttributeList *getAttribList() const;
diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx
index af4cf4a3c8af..1baf584f0f75 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -254,7 +254,7 @@ public:
             of this wrapper or when close() is called.
      */
     explicit            BinaryXInputStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
+                            const css::uno::Reference< css::io::XInputStream >& rxInStrm,
                             bool bAutoClose );
 
     virtual             ~BinaryXInputStream();
@@ -277,7 +277,7 @@ public:
 
 private:
     StreamDataSequence  maBuffer;       ///< Data buffer used in readMemory() function.
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+    css::uno::Reference< css::io::XInputStream >
                         mxInStrm;       ///< Reference to the input stream.
     bool                mbAutoClose;    ///< True = automatically close stream on destruction.
 };
diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx
index ac17f292226e..ae5496d924fe 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -133,7 +133,7 @@ public:
             of this wrapper or when close() is called.
      */
     explicit            BinaryXOutputStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rxOutStrm,
+                            const css::uno::Reference< css::io::XOutputStream >& rxOutStrm,
                             bool bAutoClose );
 
     virtual             ~BinaryXOutputStream();
@@ -150,7 +150,7 @@ public:
 
 private:
     StreamDataSequence  maBuffer;       ///< Data buffer used in writeMemory() function.
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
+    css::uno::Reference< css::io::XOutputStream >
                         mxOutStrm;      ///< Reference to the output stream.
     bool                mbAutoClose;    ///< True = automatically close stream on destruction.
 };
diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx
index 38a9d67e3c9c..8492049283ce 100644
--- a/include/oox/helper/binarystreambase.hxx
+++ b/include/oox/helper/binarystreambase.hxx
@@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star {
 
 namespace oox {
 
-typedef ::com::sun::star::uno::Sequence< sal_Int8 > StreamDataSequence;
+typedef css::uno::Sequence< sal_Int8 > StreamDataSequence;
 
 
 
@@ -138,10 +138,10 @@ public:
 
 protected:
     explicit            BinaryXSeekableStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable >& rxSeekable );
+                            const css::uno::Reference< css::io::XSeekable >& rxSeekable );
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable >
+    css::uno::Reference< css::io::XSeekable >
                         mxSeekable;     ///< Stream seeking interface.
 };
 
diff --git a/include/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx
index a1a8d541fe27..9894c0040d18 100644
--- a/include/oox/helper/containerhelper.hxx
+++ b/include/oox/helper/containerhelper.hxx
@@ -165,7 +165,7 @@ public:
             contained, otherwise a numerical index will be appended.
      */
     static OUString getUnusedName(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxNameAccess,
+                            const css::uno::Reference< css::container::XNameAccess >& rxNameAccess,
                             const OUString& rSuggestedName,
                             sal_Unicode cSeparator,
                             sal_Int32 nFirstIndexToAppend = 1 );
@@ -182,9 +182,9 @@ public:
         @return  True = object successfully inserted.
      */
     static bool         insertByName(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxNameContainer,
+                            const css::uno::Reference< css::container::XNameContainer >& rxNameContainer,
                             const OUString& rName,
-                            const ::com::sun::star::uno::Any& rObject,
+                            const css::uno::Any& rObject,
                             bool bReplaceOldExisting = true );
 
     /** Inserts an object into a name container.
@@ -214,10 +214,10 @@ public:
             true.
      */
     static OUString insertByUnusedName(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxNameContainer,
+                            const css::uno::Reference< css::container::XNameContainer >& rxNameContainer,
                             const OUString& rSuggestedName,
                             sal_Unicode cSeparator,
-                            const ::com::sun::star::uno::Any& rObject,
+                            const css::uno::Any& rObject,
                             bool bRenameOldExisting = false );
 
     // std::vector and std::map element access --------------------------------
@@ -280,7 +280,7 @@ public:
             contained in the passed vector.
      */
     template< typename VectorType >
-    static ::com::sun::star::uno::Sequence< typename VectorType::value_type >
+    static css::uno::Sequence< typename VectorType::value_type >
                             vectorToSequence( const VectorType& rVector );
 
     /** Creates a UNO sequence of sequences from a matrix with copies of all elements.
@@ -292,7 +292,7 @@ public:
             contained in the passed matrix.
      */
     template< typename MatrixType >
-    static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< typename MatrixType::value_type > >
+    static css::uno::Sequence< css::uno::Sequence< typename MatrixType::value_type > >
                             matrixToSequenceSequence( const MatrixType& rMatrix );
 };
 
@@ -351,25 +351,25 @@ template< typename MapType >
 }
 
 template< typename VectorType >
-/*static*/ ::com::sun::star::uno::Sequence< typename VectorType::value_type > ContainerHelper::vectorToSequence( const VectorType& rVector )
+/*static*/ css::uno::Sequence< typename VectorType::value_type > ContainerHelper::vectorToSequence( const VectorType& rVector )
 {
     typedef typename VectorType::value_type ValueType;
     if( rVector.empty() )
-        return ::com::sun::star::uno::Sequence< ValueType >();
-    return ::com::sun::star::uno::Sequence< ValueType >( &rVector.front(), static_cast< sal_Int32 >( rVector.size() ) );
+        return css::uno::Sequence< ValueType >();
+    return css::uno::Sequence< ValueType >( &rVector.front(), static_cast< sal_Int32 >( rVector.size() ) );
 }
 
 template< typename MatrixType >
-/*static*/ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< typename MatrixType::value_type > > ContainerHelper::matrixToSequenceSequence( const MatrixType& rMatrix )
+/*static*/ css::uno::Sequence< css::uno::Sequence< typename MatrixType::value_type > > ContainerHelper::matrixToSequenceSequence( const MatrixType& rMatrix )
 {
     typedef typename MatrixType::value_type ValueType;
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ValueType > > aSeq;
+    css::uno::Sequence< css::uno::Sequence< ValueType > > aSeq;
     if( !rMatrix.empty() )
     {
         aSeq.realloc( static_cast< sal_Int32 >( rMatrix.height() ) );
         for( size_t nRow = 0, nHeight = rMatrix.height(); nRow < nHeight; ++nRow )
             aSeq[ static_cast< sal_Int32 >( nRow ) ] =
-                ::com::sun::star::uno::Sequence< ValueType >( &rMatrix.row_front( nRow ), static_cast< sal_Int32 >( rMatrix.width() ) );
+                css::uno::Sequence< ValueType >( &rMatrix.row_front( nRow ), static_cast< sal_Int32 >( rMatrix.width() ) );
     }
     return aSeq;
 }
diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx
index e8be96cc9236..0e7ebc931017 100644
--- a/include/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
@@ -62,8 +62,8 @@ class OOX_DLLPUBLIC GraphicHelper
 {
 public:
     explicit            GraphicHelper(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxTargetFrame,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::frame::XFrame >& rxTargetFrame,
                             const StorageRef& rxStorage );
     virtual             ~GraphicHelper();
 
@@ -81,43 +81,43 @@ public:
     // Device info and device dependent unit conversion -----------------------
 
     /** Returns information about the output device. */
-    const ::com::sun::star::awt::DeviceInfo& getDeviceInfo() const { return maDeviceInfo;}
+    const css::awt::DeviceInfo& getDeviceInfo() const { return maDeviceInfo;}
 
     /** Converts the passed value from horizontal screen pixels to 1/100 mm. */
     sal_Int32           convertScreenPixelXToHmm( double fPixelX ) const;
     /** Converts the passed value from vertical screen pixels to 1/100 mm. */
     sal_Int32           convertScreenPixelYToHmm( double fPixelY ) const;
     /** Converts the passed size from screen pixels to 1/100 mm. */
-    ::com::sun::star::awt::Size convertScreenPixelToHmm( const ::com::sun::star::awt::Size& rPixel ) const;
+    css::awt::Size convertScreenPixelToHmm( const css::awt::Size& rPixel ) const;
 
     /** Converts the passed value from 1/100 mm to horizontal screen pixels. */
     double              convertHmmToScreenPixelX( sal_Int32 nHmmX ) const;
     /** Converts the passed value from 1/100 mm to vertical screen pixels. */
     double              convertHmmToScreenPixelY( sal_Int32 nHmmY ) const;
     /** Converts the passed point from 1/100 mm to screen pixels. */
-    ::com::sun::star::awt::Point convertHmmToScreenPixel( const ::com::sun::star::awt::Point& rHmm ) const;
+    css::awt::Point convertHmmToScreenPixel( const css::awt::Point& rHmm ) const;
     /** Converts the passed size from 1/100 mm to screen pixels. */
-    ::com::sun::star::awt::Size convertHmmToScreenPixel( const ::com::sun::star::awt::Size& rHmm ) const;
+    css::awt::Size convertHmmToScreenPixel( const css::awt::Size& rHmm ) const;
 
     /** Converts the passed point from 1/100 mm to AppFont units. */
-    ::com::sun::star::awt::Point convertHmmToAppFont( const ::com::sun::star::awt::Point& rHmm ) const;
+    css::awt::Point convertHmmToAppFont( const css::awt::Point& rHmm ) const;
     /** Converts the passed size from 1/100 mm to AppFont units. */
-    ::com::sun::star::awt::Size convertHmmToAppFont( const ::com::sun::star::awt::Size& rHmm ) const;
+    css::awt::Size convertHmmToAppFont( const css::awt::Size& rHmm ) const;
 
     // Graphics and graphic objects  ------------------------------------------
 
     /** Imports a graphic from the passed input stream. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >
+    css::uno::Reference< css::graphic::XGraphic >
                         importGraphic(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
+                            const css::uno::Reference< css::io::XInputStream >& rxInStrm,
                             const WMF_EXTERNALHEADER* pExtHeader = NULL ) const;
 
     /** Imports a graphic from the passed binary memory block. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >
+    css::uno::Reference< css::graphic::XGraphic >
                         importGraphic( const StreamDataSequence& rGraphicData ) const;
 
     /** Imports a graphic from the storage stream with the passed path and name. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >
+    css::uno::Reference< css::graphic::XGraphic >
                         importEmbeddedGraphic(
                             const OUString& rStreamName,
                             const WMF_EXTERNALHEADER* pExtHeader = NULL ) const;
@@ -125,12 +125,12 @@ public:
     /** Creates a persistent graphic object from the passed graphic.
         @return  The URL of the created and internally cached graphic object. */
     OUString     createGraphicObject(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rxGraphic ) const;
+                            const css::uno::Reference< css::graphic::XGraphic >& rxGraphic ) const;
 
     /** Creates a persistent graphic object from the passed input stream.
         @return  The URL of the created and internally cached graphic object. */
     OUString     importGraphicObject(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
+                            const css::uno::Reference< css::io::XInputStream >& rxInStrm,
                             const WMF_EXTERNALHEADER* pExtHeader = NULL ) const;
 
     /** Creates a persistent graphic object from the passed binary memory block.
@@ -143,23 +143,23 @@ public:
 
     /** calculates the orignal size of a graphic which is necessary to be able to calculate cropping values
         @return The original Graphic size in 100thmm */
-    ::com::sun::star::awt::Size getOriginalSize( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rxGraphic ) const;
+    css::awt::Size getOriginalSize( const css::uno::Reference< css::graphic::XGraphic >& rxGraphic ) const;
 
 
 private:
     typedef ::std::map< sal_Int32, sal_Int32 > SystemPalette;
-    typedef ::std::deque< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > > GraphicObjectDeque;
-    typedef ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > EmbeddedGraphicMap;
+    typedef ::std::deque< css::uno::Reference< css::graphic::XGraphicObject > > GraphicObjectDeque;
+    typedef ::std::map< OUString, css::uno::Reference< css::graphic::XGraphic > > EmbeddedGraphicMap;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
-    ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicProvider > mxGraphicProvider;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XUnitConversion > mxUnitConversion;
-    ::com::sun::star::awt::DeviceInfo maDeviceInfo; ///< Current output device info.
+    css::uno::Reference< css::uno::XComponentContext > mxContext;
+    css::uno::Reference< css::graphic::XGraphicProvider > mxGraphicProvider;
+    css::uno::Reference< css::awt::XUnitConversion > mxUnitConversion;
+    css::awt::DeviceInfo maDeviceInfo; ///< Current output device info.
     SystemPalette       maSystemPalette;            ///< Maps system colors (XML tokens) to RGB color values.
     StorageRef          mxStorage;                  ///< Storage containing embedded graphics.
     mutable GraphicObjectDeque maGraphicObjects;    ///< Caches all created graphic objects to keep them alive.
     mutable EmbeddedGraphicMap maEmbeddedGraphics;  ///< Maps all embedded graphics by their storage path.
-    const OUString maGraphicObjScheme;       ///< The URL scheme name for graphic objects.
+    const OUString      maGraphicObjScheme;       ///< The URL scheme name for graphic objects.
     double              mfPixelPerHmmX;             ///< Number of screen pixels per 1/100 mm in X direction.
     double              mfPixelPerHmmY;             ///< Number of screen pixels per 1/100 mm in Y direction.
 };
diff --git a/include/oox/helper/modelobjecthelper.hxx b/include/oox/helper/modelobjecthelper.hxx
index 7455215f8d23..1f530fd6af48 100644
--- a/include/oox/helper/modelobjecthelper.hxx
+++ b/include/oox/helper/modelobjecthelper.hxx
@@ -41,30 +41,30 @@ class OOX_DLLPUBLIC ObjectContainer
 {
 public:
     explicit            ObjectContainer(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory,
+                            const css::uno::Reference< css::lang::XMultiServiceFactory >& rxModelFactory,
                             const OUString& rServiceName );
                         ~ObjectContainer();
 
     /** Returns true, if the object with the passed name exists in the container. */
     bool                hasObject( const OUString& rObjName ) const;
 
-    ::com::sun::star::uno::Any getObject( const OUString& rObjName ) const;
+    css::uno::Any getObject( const OUString& rObjName ) const;
 
     /** Inserts the passed object into the container, returns its final name. */
     OUString     insertObject(
                             const OUString& rObjName,
-                            const ::com::sun::star::uno::Any& rObj,
+                            const css::uno::Any& rObj,
                             bool bInsertByUnusedName );
 
 private:
     void                createContainer() const;
 
 private:
-    mutable ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
+    mutable css::uno::Reference< css::lang::XMultiServiceFactory >
                         mxModelFactory;         ///< Factory to create the container.
-    mutable ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
+    mutable css::uno::Reference< css::container::XNameContainer >
                         mxContainer;            ///< Container for the objects.
-    OUString     maServiceName;          ///< Service name to create the container.
+    OUString            maServiceName;          ///< Service name to create the container.
     sal_Int32           mnIndex;                ///< Index to create unique identifiers.
 };
 
@@ -81,7 +81,7 @@ class OOX_DLLPUBLIC ModelObjectHelper
 {
 public:
     explicit            ModelObjectHelper(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory );
+                            const css::uno::Reference< css::lang::XMultiServiceFactory >& rxModelFactory );
 
     /** Returns true, if the model contains a line marker with the passed name. */
     bool                hasLineMarker( const OUString& rMarkerName ) const;
@@ -90,17 +90,17 @@ public:
         with the same name. Returns true, if the marker could be inserted. */
     bool                insertLineMarker(
                             const OUString& rMarkerName,
-                            const ::com::sun::star::drawing::PolyPolygonBezierCoords& rMarker );
+                            const css::drawing::PolyPolygonBezierCoords& rMarker );
 
     /** Inserts a new named line dash, returns the line dash name, based on an
         internal constant name with a new unused index appended. */
-    OUString     insertLineDash( const ::com::sun::star::drawing::LineDash& rDash );
+    OUString     insertLineDash( const css::drawing::LineDash& rDash );
 
     /** Inserts a new named fill gradient, returns the gradient name, based on
         an internal constant name with a new unused index appended. */
-    OUString     insertFillGradient( const ::com::sun::star::awt::Gradient& rGradient );
+    OUString     insertFillGradient( const css::awt::Gradient& rGradient );
 
-    OUString     insertTransGrandient( const ::com::sun::star::awt::Gradient& rGradient );
+    OUString     insertTransGrandient( const css::awt::Gradient& rGradient );
 
     /** Inserts a new named fill bitmap URL, returns the bitmap name, based on
         an internal constant name with a new unused index appended. */
@@ -114,10 +114,10 @@ private:
     ObjectContainer     maGradientContainer;    ///< Contains all named fill gradients.
     ObjectContainer     maTransGradContainer;   ///< Contains all named transparency Gradients.
     ObjectContainer     maBitmapUrlContainer;   ///< Contains all named fill bitmap URLs.
-    const OUString maDashNameBase;       ///< Base name for all named line dashes.
-    const OUString maGradientNameBase;   ///< Base name for all named fill gradients.
-    const OUString maTransGradNameBase;   ///< Base name for all named fill gradients.
-    const OUString maBitmapUrlNameBase;  ///< Base name for all named fill bitmap URLs.
+    const OUString      maDashNameBase;       ///< Base name for all named line dashes.
+    const OUString      maGradientNameBase;   ///< Base name for all named fill gradients.
+    const OUString      maTransGradNameBase;   ///< Base name for all named fill gradients.
+    const OUString      maBitmapUrlNameBase;  ///< Base name for all named fill bitmap URLs.
 };
 
 
diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx
index 02e0dcead04b..faabe22bec2b 100644
--- a/include/oox/helper/progressbar.hxx
+++ b/include/oox/helper/progressbar.hxx
@@ -86,7 +86,7 @@ class OOX_DLLPUBLIC ProgressBar : public IProgressBar
 {
 public:
     explicit            ProgressBar(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >& rxIndicator,
+                            const css::uno::Reference< css::task::XStatusIndicator >& rxIndicator,
                             const OUString& rText );
 
     virtual             ~ProgressBar();
@@ -97,7 +97,7 @@ public:
     virtual void        setPosition( double fPosition ) override;
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >
+    css::uno::Reference< css::task::XStatusIndicator >
                         mxIndicator;
     double              mfPosition;
 };
@@ -110,7 +110,7 @@ class OOX_DLLPUBLIC SegmentProgressBar : public ISegmentProgressBar
 {
 public:
     explicit            SegmentProgressBar(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >& rxIndicator,
+                            const css::uno::Reference< css::task::XStatusIndicator >& rxIndicator,
                             const OUString& rText );
 
     /** Returns the current position of the progress bar segment. */
diff --git a/include/oox/helper/propertymap.hxx b/include/oox/helper/propertymap.hxx
index 4e38627e7553..99412d145687 100644
--- a/include/oox/helper/propertymap.hxx
+++ b/include/oox/helper/propertymap.hxx
@@ -39,8 +39,8 @@ struct PropertyNameVector;
 
 
 
-typedef ::std::map< sal_Int32, ::com::sun::star::uno::Any > PropertyMapType;
-typedef ::std::map< OUString, ::com::sun::star::uno::Any > PropertyNameMap;
+typedef ::std::map< sal_Int32, css::uno::Any > PropertyMapType;
+typedef ::std::map< OUString, css::uno::Any > PropertyNameMap;
 
 /** A helper that maps property identifiers to property values.
 
@@ -62,7 +62,7 @@ public:
 
     /** Sets the specified property to the passed value. Does nothing, if the
         identifier is invalid. */
-    bool                setAnyProperty( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
+    bool                setAnyProperty( sal_Int32 nPropId, const css::uno::Any& rValue );
 
     /** Sets the specified property to the passed value. Does nothing, if the
         identifier is invalid. */
@@ -76,7 +76,7 @@ public:
         return true;
     }
 
-    com::sun::star::uno::Any getProperty( sal_Int32 nPropId );
+    css::uno::Any       getProperty( sal_Int32 nPropId );
 
     void                erase( sal_Int32 nPropId );
 
@@ -89,26 +89,26 @@ public:
     void                assignAll( const PropertyMap& rPropMap );
 
     /** Returns a sequence of property values, filled with all contained properties. */
-    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
+    css::uno::Sequence< css::beans::PropertyValue >
                         makePropertyValueSequence() const;
 
     /** Fills the passed sequences of names and anys with all contained properties. */
     void                fillSequences(
-                            ::com::sun::star::uno::Sequence< OUString >& rNames,
-                            ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) const;
+                            css::uno::Sequence< OUString >& rNames,
+                            css::uno::Sequence< css::uno::Any >& rValues ) const;
 
     void                fillPropertyNameMap(PropertyNameMap& rMap) const;
 
     /** Creates a property set supporting the XPropertySet interface and inserts all properties. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
+    css::uno::Reference< css::beans::XPropertySet >
                         makePropertySet() const;
 
 #if OSL_DEBUG_LEVEL > 0
 #ifdef DBG_UTIL
-  static void dump( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet);
+  static void dump( css::uno::Reference< css::beans::XPropertySet > rXPropSet);
 #endif
-  static void dumpCode( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet);
-  static void dumpData(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> rXPropSet);
+  static void dumpCode( css::uno::Reference< css::beans::XPropertySet > rXPropSet);
+  static void dumpData(css::uno::Reference<css::beans::XPropertySet> rXPropSet);
 #endif
 private:
     const PropertyNameVector* mpPropNames;
diff --git a/include/oox/helper/propertyset.hxx b/include/oox/helper/propertyset.hxx
index 359d27db4351..db1a5aa83226 100644
--- a/include/oox/helper/propertyset.hxx
+++ b/include/oox/helper/propertyset.hxx
@@ -53,7 +53,7 @@ public:
 
     /** Constructs a property set wrapper with the passed UNO property set. */
     explicit     PropertySet(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rxPropSet )
+                            const css::uno::Reference< css::beans::XPropertySet >& rxPropSet )
                                 { set( rxPropSet ); }
 
     /** Constructs a property set wrapper after querying the XPropertySet interface. */
@@ -61,18 +61,18 @@ public:
     explicit     PropertySet( const Type& rObject ) { set( rObject ); }
 
     /** Sets the passed UNO property set and releases the old UNO property set. */
-    void                set( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rxPropSet );
+    void                set( const css::uno::Reference< css::beans::XPropertySet >& rxPropSet );
 
     /** Queries the passed object (interface or any) for an XPropertySet and releases the old UNO property set. */
     template< typename Type >
     void         set( const Type& rObject )
-                            { set( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >( rObject, ::com::sun::star::uno::UNO_QUERY ) ); }
+                            { set( css::uno::Reference< css::beans::XPropertySet >( rObject, css::uno::UNO_QUERY ) ); }
 
     /** Returns true, if the contained XPropertySet interface is valid. */
     bool         is() const { return mxPropSet.is(); }
 
     /** Returns the contained XPropertySet interface. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
+    css::uno::Reference< css::beans::XPropertySet >
                         getXPropertySet() const { return mxPropSet; }
 
     /** Returns true, if the specified property is supported by the property set. */
@@ -82,7 +82,7 @@ public:
 
     /** Gets the specified property from the property set.
         @return  the property value, or an empty Any, if the property is missing. */
-    ::com::sun::star::uno::Any getAnyProperty( sal_Int32 nPropId ) const;
+    css::uno::Any getAnyProperty( sal_Int32 nPropId ) const;
 
     /** Gets the specified property from the property set.
         @return  true, if the passed variable could be filled with the property value. */
@@ -97,19 +97,19 @@ public:
     // Set properties ---------------------------------------------------------
 
     /** Puts the passed any into the property set. */
-    bool                setAnyProperty( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
+    bool                setAnyProperty( sal_Int32 nPropId, const css::uno::Any& rValue );
 
     /** Puts the passed value into the property set. */
     template< typename Type >
     bool         setProperty( sal_Int32 nPropId, const Type& rValue )
-                            { return setAnyProperty( nPropId, ::com::sun::star::uno::Any( rValue ) ); }
+                            { return setAnyProperty( nPropId, css::uno::Any( rValue ) ); }
 
     /** Puts the passed properties into the property set. Tries to use the XMultiPropertySet interface.
         @param rPropNames  The property names. MUST be ordered alphabetically.
         @param rValues  The related property values. */
     void                setProperties(
-                            const ::com::sun::star::uno::Sequence< OUString >& rPropNames,
-                            const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues );
+                            const css::uno::Sequence< OUString >& rPropNames,
+                            const css::uno::Sequence< css::uno::Any >& rValues );
 
     /** Puts the passed property map into the property set. Tries to use the XMultiPropertySet interface.
         @param rPropertyMap  The property map. */
@@ -123,17 +123,17 @@ public:
 private:
     /** Gets the specified property from the property set.
         @return  true, if the any could be filled with the property value. */
-    bool                implGetPropertyValue( ::com::sun::star::uno::Any& orValue, const OUString& rPropName ) const;
+    bool                implGetPropertyValue( css::uno::Any& orValue, const OUString& rPropName ) const;
 
     /** Puts the passed any into the property set. */
-    bool                implSetPropertyValue( const OUString& rPropName, const ::com::sun::star::uno::Any& rValue );
+    bool                implSetPropertyValue( const OUString& rPropName, const css::uno::Any& rValue );
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
+    css::uno::Reference< css::beans::XPropertySet >
                         mxPropSet;          ///< The mandatory property set interface.
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet >
+    css::uno::Reference< css::beans::XMultiPropertySet >
                         mxMultiPropSet;     ///< The optional multi property set interface.
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
+    css::uno::Reference< css::beans::XPropertySetInfo >
                         mxPropSetInfo;      ///< Property information.
 };
 
diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx
index f073b292de2d..c1264d9eb11b 100644
--- a/include/oox/helper/storagebase.hxx
+++ b/include/oox/helper/storagebase.hxx
@@ -49,11 +49,11 @@ class OOX_DLLPUBLIC StorageBase
 {
 public:
     explicit            StorageBase(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream,
+                            const css::uno::Reference< css::io::XInputStream >& rxInStream,
                             bool bBaseStreamAccess );
 
     explicit            StorageBase(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream,
+                            const css::uno::Reference< css::io::XStream >& rxOutStream,
                             bool bBaseStreamAccess );
 
     virtual             ~StorageBase();
@@ -69,7 +69,7 @@ public:
     bool                isReadOnly() const { return mbReadOnly;}
 
     /** Returns the com.sun.star.embed.XStorage interface of the current storage. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
+    css::uno::Reference< css::embed::XStorage >
                         getXStorage() const;
 
     /** Returns the element name of this storage. */
@@ -101,7 +101,7 @@ public:
             access has been enabled in the constructor, the base stream can be
             accessed by passing an empty string as stream name.
      */
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+    css::uno::Reference< css::io::XInputStream >
                         openInputStream( const OUString& rStreamName );
 
     /** Opens and returns the specified output stream from the storage.
@@ -112,7 +112,7 @@ public:
             stream access has been enabled in the constructor, the base stream
             can be accessed by passing an empty string as stream name.
      */
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
+    css::uno::Reference< css::io::XOutputStream >
                         openOutputStream( const OUString& rStreamName );
 
     /** Copies the specified element from this storage to the passed
@@ -145,7 +145,7 @@ private:
     virtual bool        implIsStorage() const = 0;
 
     /** Returns the com.sun.star.embed.XStorage interface of the current storage. */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
+    virtual css::uno::Reference< css::embed::XStorage >
                         implGetXStorage() const = 0;
 
     /** Returns the names of all elements of this storage. */
@@ -155,11 +155,11 @@ private:
     virtual StorageRef  implOpenSubStorage( const OUString& rElementName, bool bCreate ) = 0;
 
     /** Implementation of opening an input stream element. */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+    virtual css::uno::Reference< css::io::XInputStream >
                         implOpenInputStream( const OUString& rElementName ) = 0;
 
     /** Implementation of opening an output stream element. */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
+    virtual css::uno::Reference< css::io::XOutputStream >
                         implOpenOutputStream( const OUString& rElementName ) = 0;
 
     /** Commits the current storage. */
@@ -172,12 +172,12 @@ private:
     typedef RefMap< OUString, StorageBase > SubStorageMap;
 
     SubStorageMap       maSubStorages;      ///< Map of direct sub storages.
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+    css::uno::Reference< css::io::XInputStream >
                         mxInStream;         ///< Cached base input stream (to keep it alive).
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
+    css::uno::Reference< css::io::XStream >
                         mxOutStream;        ///< Cached base output stream (to keep it alive).
-    OUString     maParentPath;       ///< Full path of parent storage.
-    OUString     maStorageName;      ///< Name of this storage, if it is a substorage.
+    OUString            maParentPath;       ///< Full path of parent storage.
+    OUString            maStorageName;      ///< Name of this storage, if it is a substorage.
     bool                mbBaseStreamAccess; ///< True = access base streams with empty stream name.
     bool                mbReadOnly;         ///< True = storage opened read-only (based on input stream).
 };
diff --git a/include/oox/helper/textinputstream.hxx b/include/oox/helper/textinputstream.hxx
index 3158d88379b0..71018569c154 100644
--- a/include/oox/helper/textinputstream.hxx
+++ b/include/oox/helper/textinputstream.hxx
@@ -39,12 +39,12 @@ class TextInputStream
 {
 public:
     explicit            TextInputStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::io::XInputStream >& rxInStrm,
                             rtl_TextEncoding eTextEnc );
 
     explicit            TextInputStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                             BinaryInputStream& rInStrm,
                             rtl_TextEncoding eTextEnc );
 
@@ -91,24 +91,24 @@ public:
 
     /** Creates a UNO text input stream object from the passed UNO input stream.
      */
-    static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream2 >
+    static css::uno::Reference< css::io::XTextInputStream2 >
                         createXTextInputStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::io::XInputStream >& rxInStrm,
                             rtl_TextEncoding eTextEnc );
 
 
 private:
     void                init(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::io::XInputStream >& rxInStrm,
                             rtl_TextEncoding eTextEnc );
 
     /** Adds the pending character in front of the passed string, if existing. */
     OUString     createFinalString( const OUString& rString );
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream2 >
+    css::uno::Reference< css::io::XTextInputStream2 >
                         mxTextStrm;
     sal_Unicode         mcPendingChar;
 };
diff --git a/include/oox/helper/zipstorage.hxx b/include/oox/helper/zipstorage.hxx
index baf8d1241752..9b5328f74560 100644
--- a/include/oox/helper/zipstorage.hxx
+++ b/include/oox/helper/zipstorage.hxx
@@ -35,26 +35,26 @@ class ZipStorage : public StorageBase
 {
 public:
     explicit            ZipStorage(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream );
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::io::XInputStream >& rxInStream );
 
     explicit            ZipStorage(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxStream );
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::io::XStream >& rxStream );
 
     virtual             ~ZipStorage();
 
 private:
     explicit            ZipStorage(
                             const ZipStorage& rParentStorage,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage,
+                            const css::uno::Reference< css::embed::XStorage >& rxStorage,
                             const OUString& rElementName );
 
     /** Returns true, if the object represents a valid storage. */
     virtual bool        implIsStorage() const override;
 
     /** Returns the com.sun.star.embed.XStorage interface of the current storage. */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
+    virtual css::uno::Reference< css::embed::XStorage >
                         implGetXStorage() const override;
 
     /** Returns the names of all elements of this storage. */
@@ -64,18 +64,18 @@ private:
     virtual StorageRef  implOpenSubStorage( const OUString& rElementName, bool bCreateMissing ) override;
 
     /** Opens and returns the specified input stream from the storage. */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+    virtual css::uno::Reference< css::io::XInputStream >
                         implOpenInputStream( const OUString& rElementName ) override;
 
     /** Opens and returns the specified output stream from the storage. */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
+    virtual css::uno::Reference< css::io::XOutputStream >
                         implOpenOutputStream( const OUString& rElementName ) override;
 
     /** Commits the current storage. */
     virtual void        implCommit() const override;
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
+    css::uno::Reference< css::embed::XStorage >
                         mxStorage;      ///< Storage based on input or output stream.
 };
 
diff --git a/include/oox/mathml/importutils.hxx b/include/oox/mathml/importutils.hxx
index 86751a6edde4..d9f78284e09b 100644
--- a/include/oox/mathml/importutils.hxx
+++ b/include/oox/mathml/importutils.hxx
@@ -127,7 +127,7 @@ public:
     struct OOX_DLLPUBLIC Tag
     {
         Tag( int token = XML_TOKEN_INVALID,
-            const com::sun::star::uno::Reference< com::sun::star::xml::sax::XFastAttributeList >& attributes = com::sun::star::uno::Reference< com::sun::star::xml::sax::XFastAttributeList >(),
+            const css::uno::Reference< css::xml::sax::XFastAttributeList >& attributes = css::uno::Reference< css::xml::sax::XFastAttributeList >(),
             const OUString& text = OUString());
         Tag( int token,
             const AttributeList& attribs);
@@ -219,7 +219,7 @@ class OOX_DLLPUBLIC XmlStreamBuilder
 {
 public:
     void appendOpeningTag( int token,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XFastAttributeList >& attributes = com::sun::star::uno::Reference< com::sun::star::xml::sax::XFastAttributeList >());
+        const css::uno::Reference< css::xml::sax::XFastAttributeList >& attributes = css::uno::Reference< css::xml::sax::XFastAttributeList >());
     void appendOpeningTag( int token,
         const AttributeList& attribs );
     void appendClosingTag( int token );
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index 8a3c6bcd2907..442c5f32124f 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -193,7 +193,7 @@ class OOX_DLLPUBLIC ControlConverter
 {
 public:
     explicit            ControlConverter(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
+                            const css::uno::Reference< css::frame::XModel >& rxDocModel,
                             const GraphicHelper& rGraphicHelper,
                             bool bDefaultColorBgr = true );
     virtual             ~ControlConverter();
@@ -257,7 +257,7 @@ public:
     /** Binds the passed control model to the passed data sources. The
         implementation will check which source types are supported. */
     void                bindToSources(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxCtrlModel,
+                            const css::uno::Reference< css::awt::XControlModel >& rxCtrlModel,
                             const OUString& rCtrlSource,
                             const OUString& rRowSource,
                             sal_Int32 nRefSheet = 0 ) const;
@@ -337,7 +337,7 @@ public:
                             sal_Int32& nOrientation );
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxDocModel;
+    css::uno::Reference< css::frame::XModel > mxDocModel;
     const GraphicHelper& mrGraphicHelper;
     mutable PropertySet maAddressConverter;
     mutable PropertySet maRangeConverter;
@@ -905,8 +905,8 @@ public:
 
 class HtmlSelectModel : public AxListBoxModel
 {
-    com::sun::star::uno::Sequence< OUString > msListData;
-    com::sun::star::uno::Sequence< sal_Int16 > msIndices;
+    css::uno::Sequence< OUString > msListData;
+    css::uno::Sequence< sal_Int16 > msIndices;
 public:
     HtmlSelectModel();
     virtual bool        importBinaryModel( BinaryInputStream& rInStrm ) override;
@@ -953,11 +953,11 @@ public:
 
     /** Converts all control properties and inserts them into the passed model. */
     bool                convertProperties(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxCtrlModel,
+                            const css::uno::Reference< css::awt::XControlModel >& rxCtrlModel,
                             const ControlConverter& rConv ) const;
 
     bool                convertFromProperties(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxCtrlModel,
+                            const css::uno::Reference< css::awt::XControlModel >& rxCtrlModel,
                             const ControlConverter& rConv );
 
 private:
@@ -992,30 +992,30 @@ class EmbeddedForm
 {
 public:
     explicit            EmbeddedForm(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& rxDrawPage,
+                            const css::uno::Reference< css::frame::XModel >& rxDocModel,
+                            const css::uno::Reference< css::drawing::XDrawPage >& rxDrawPage,
                             const GraphicHelper& rGraphicHelper,
                             bool bDefaultColorBgr = true );
 
     /** Converts the passed control and inserts the control model into the form.
         @return  The API control model, if conversion was successful. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >
+    css::uno::Reference< css::awt::XControlModel >
                         convertAndInsert( const EmbeddedControl& rControl, sal_Int32& rnCtrlIndex );
 
     /** Returns the XIndexContainer interface of the UNO control form, if existing. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >
+    css::uno::Reference< css::container::XIndexContainer >
                         getXForm() const { return mxFormIC; }
 
 private:
     /** Creates the form that will hold the form controls. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >
+    css::uno::Reference< css::container::XIndexContainer >
                         createXForm();
 
 private:
-    ControlConverter    maControlConv;
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxModelFactory;
-    ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormsSupplier > mxFormsSupp;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > mxFormIC;
+    ControlConverter                                       maControlConv;
+    css::uno::Reference< css::lang::XMultiServiceFactory > mxModelFactory;
+    css::uno::Reference< css::form::XFormsSupplier >       mxFormsSupp;
+    css::uno::Reference< css::container::XIndexContainer > mxFormIC;
 };
 
 
diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index f82cd2b681e3..974e6ce6f7cb 100644
--- a/include/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
@@ -150,24 +150,24 @@ namespace OleHelper
 class OOX_DLLPUBLIC MSConvertOCXControls : public SvxMSConvertOCXControls
 {
 protected:
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxCtx;
+    css::uno::Reference< css::uno::XComponentContext > mxCtx;
     ::oox::GraphicHelper maGrfHelper;
 
     bool importControlFromStream( ::oox::BinaryInputStream& rInStrm,
-                                  ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp,
+                                  css::uno::Reference< css::form::XFormComponent > & rxFormComp,
                                   const OUString& rGuidString );
     bool importControlFromStream( ::oox::BinaryInputStream& rInStrm,
-                                  ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp,
+                                  css::uno::Reference< css::form::XFormComponent > & rxFormComp,
                                   const OUString& rGuidString,
                                   sal_Int32 nSize );
 public:
-    MSConvertOCXControls( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel );
+    MSConvertOCXControls( const css::uno::Reference< css::frame::XModel >& rxModel );
     virtual ~MSConvertOCXControls();
-    bool ReadOCXStorage( tools::SvRef<SotStorage>& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp );
-    bool ReadOCXCtlsStream(tools::SvRef<SotStorageStream>& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp,
+    bool ReadOCXStorage( tools::SvRef<SotStorage>& rSrc1, css::uno::Reference< css::form::XFormComponent > & rxFormComp );
+    bool ReadOCXCtlsStream(tools::SvRef<SotStorageStream>& rSrc1, css::uno::Reference< css::form::XFormComponent > & rxFormComp,
                                    sal_Int32 nPos, sal_Int32 nSize );
-    static bool WriteOCXStream( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, tools::SvRef<SotStorage> &rSrc1, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > &rControlModel, const com::sun::star::awt::Size& rSize,OUString &rName);
-    static bool WriteOCXExcelKludgeStream( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutStrm, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > &rControlModel, const com::sun::star::awt::Size& rSize,OUString &rName);
+    static bool WriteOCXStream( const css::uno::Reference< css::frame::XModel >& rxModel, tools::SvRef<SotStorage> &rSrc1, const css::uno::Reference< css::awt::XControlModel > &rControlModel, const css::awt::Size& rSize,OUString &rName);
+    static bool WriteOCXExcelKludgeStream( const css::uno::Reference< css::frame::XModel >& rxModel, const css::uno::Reference< css::io::XOutputStream >& xOutStrm, const css::uno::Reference< css::awt::XControlModel > &rControlModel, const css::awt::Size& rSize,OUString &rName);
 };
 
 
diff --git a/include/oox/ole/oleobjecthelper.hxx b/include/oox/ole/oleobjecthelper.hxx
index ef32483d74ab..868cd0c449bf 100644
--- a/include/oox/ole/oleobjecthelper.hxx
+++ b/include/oox/ole/oleobjecthelper.hxx
@@ -56,18 +56,18 @@ class OleObjectHelper
 {
 public:
     explicit            OleObjectHelper(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory );
+                            const css::uno::Reference< css::lang::XMultiServiceFactory >& rxModelFactory );
                         ~OleObjectHelper();
 
     bool                importOleObject(
                             PropertyMap& rPropMap,
                             const OleObjectInfo& rOleObject,
-                            const ::com::sun::star::awt::Size& rObjSize );
+                            const css::awt::Size& rObjSize );
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedObjectResolver > mxResolver;
-    const OUString maEmbeddedObjScheme;
-    sal_Int32           mnObjectId;
+    css::uno::Reference< css::document::XEmbeddedObjectResolver > mxResolver;
+    const OUString                                                maEmbeddedObjScheme;
+    sal_Int32                                                     mnObjectId;
 };
 
 
diff --git a/include/oox/ole/olestorage.hxx b/include/oox/ole/olestorage.hxx
index af0e51c218b7..6b00ada1b61a 100644
--- a/include/oox/ole/olestorage.hxx
+++ b/include/oox/ole/olestorage.hxx
@@ -37,13 +37,13 @@ class OOX_DLLPUBLIC OleStorage : public StorageBase
 {
 public:
     explicit            OleStorage(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::io::XInputStream >& rxInStream,
                             bool bBaseStreamAccess );
 
     explicit            OleStorage(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::io::XStream >& rxOutStream,
                             bool bBaseStreamAccess );
 
     virtual             ~OleStorage();
@@ -51,18 +51,18 @@ public:
 private:
     explicit            OleStorage(
                             const OleStorage& rParentStorage,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxStorage,
+                            const css::uno::Reference< css::container::XNameContainer >& rxStorage,
                             const OUString& rElementName,
                             bool bReadOnly );
     explicit            OleStorage(
                             const OleStorage& rParentStorage,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream,
+                            const css::uno::Reference< css::io::XStream >& rxOutStream,
                             const OUString& rElementName );
 
     /** Initializes the API storage object for input. */
-    void                initStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream );
+    void                initStorage( const css::uno::Reference< css::io::XInputStream >& rxInStream );
     /** Initializes the API storage object for input/output. */
-    void                initStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream );
+    void                initStorage( const css::uno::Reference< css::io::XStream >& rxOutStream );
 
     /** Returns true, if the object represents a valid storage. */
     virtual bool        implIsStorage() const override;
@@ -72,7 +72,7 @@ private:
         @attention
             This function is not implemented for binary OLE storages.
      */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
+    virtual css::uno::Reference< css::embed::XStorage >
                         implGetXStorage() const override;
 
     /** Returns the names of all elements of this storage. */
@@ -82,20 +82,20 @@ private:
     virtual StorageRef  implOpenSubStorage( const OUString& rElementName, bool bCreateMissing ) override;
 
     /** Opens and returns the specified input stream from the storage. */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+    virtual css::uno::Reference< css::io::XInputStream >
                         implOpenInputStream( const OUString& rElementName ) override;
 
     /** Opens and returns the specified output stream from the storage. */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
+    virtual css::uno::Reference< css::io::XOutputStream >
                         implOpenOutputStream( const OUString& rElementName ) override;
 
     /** Commits the current storage. */
     virtual void        implCommit() const override;
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
+    css::uno::Reference< css::uno::XComponentContext >
                         mxContext;          ///< Component context with service manager.
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
+    css::uno::Reference< css::container::XNameContainer >
                         mxStorage;          ///< Access to elements of this sub storage.
     const OleStorage*   mpParentStorage;    ///< Parent OLE storage that contains this storage.
 };
diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx
index dfc4d0a6f53a..a17513c9f383 100644
--- a/include/oox/ole/vbacontrol.hxx
+++ b/include/oox/ole/vbacontrol.hxx
@@ -123,7 +123,7 @@ public:
         and converts all control properties. */
     void                createAndConvert(
                             sal_Int32 nCtrlIndex,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxParentNC,
+                            const css::uno::Reference< css::container::XNameContainer >& rxParentNC,
                             const ControlConverter& rConv ) const;
 
 protected:
@@ -135,7 +135,7 @@ protected:
 
     /** Converts all control properties, and inserts and converts embedded controls. */
     bool                convertProperties(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxCtrlModel,
+                            const css::uno::Reference< css::awt::XControlModel >& rxCtrlModel,
                             const ControlConverter& rConv,
                             sal_Int32 nCtrlIndex ) const;
 
@@ -177,23 +177,23 @@ class VbaUserForm : public VbaFormControl
 {
 public:
     explicit            VbaUserForm(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::frame::XModel >& rxDocModel,
                             const GraphicHelper& rGraphicHelper,
                             bool bDefaultColorBgr = true );
 
     /** Imports the form and its embedded controls, and inserts the form with
         all its controls into the passed dialog library. */
     void                importForm(
-                           const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxDialogLib,
+                           const css::uno::Reference< css::container::XNameContainer >& rxDialogLib,
                            StorageBase& rVbaFormStrg,
                            const OUString& rModuleName,
                            rtl_TextEncoding eTextEnc );
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxDocModel;
-    ControlConverter    maConverter;
+    css::uno::Reference< css::uno::XComponentContext > mxContext;
+    css::uno::Reference< css::frame::XModel >          mxDocModel;
+    ControlConverter                                   maConverter;
 };
 
 
diff --git a/include/oox/ole/vbamodule.hxx b/include/oox/ole/vbamodule.hxx
index 03d64f6ecd9e..9fa2de0408fe 100644
--- a/include/oox/ole/vbamodule.hxx
+++ b/include/oox/ole/vbamodule.hxx
@@ -44,8 +44,8 @@ class VbaModule
 {
 public:
     explicit            VbaModule(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::frame::XModel >& rxDocModel,
                             const OUString& rName,
                             rtl_TextEncoding eTextEnc,
                             bool bExecutable );
@@ -66,12 +66,12 @@ public:
     /** Imports the VBA source code into the passed Basic library. */
     void                createAndImportModule(
                             StorageBase& rVbaStrg,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxBasicLib,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxDocObjectNA ) const;
+                            const css::uno::Reference< css::container::XNameContainer >& rxBasicLib,
+                            const css::uno::Reference< css::container::XNameAccess >& rxDocObjectNA ) const;
     /** Creates an empty Basic module in the passed Basic library. */
     void                createEmptyModule(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxBasicLib,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxDocObjectNA ) const;
+                            const css::uno::Reference< css::container::XNameContainer >& rxBasicLib,
+                            const css::uno::Reference< css::container::XNameAccess >& rxDocObjectNA ) const;
 
 private:
     /** Reads and returns the VBA source code from the passed storage. */
@@ -80,17 +80,17 @@ private:
     /** Creates a new Basic module and inserts it into the passed Basic library. */
     void                createModule(
                             const OUString& rVBASourceCode,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxBasicLib,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxDocObjectNA ) const;
+                            const css::uno::Reference< css::container::XNameContainer >& rxBasicLib,
+                            const css::uno::Reference< css::container::XNameAccess >& rxDocObjectNA ) const;
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
+    css::uno::Reference< css::uno::XComponentContext >
                         mxContext;          ///< Component context with service manager.
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
+    css::uno::Reference< css::frame::XModel >
                         mxDocModel;         ///< Document model used to import/export the VBA project.
-    OUString     maName;
-    OUString     maStreamName;
-    OUString     maDocString;
+    OUString            maName;
+    OUString            maStreamName;
+    OUString            maDocString;
     rtl_TextEncoding    meTextEnc;
     sal_Int32           mnType;
     sal_uInt32          mnOffset;
diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index dac147affb23..9478c9adde96 100644
--- a/include/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
@@ -47,7 +47,7 @@ class OOX_DLLPUBLIC VbaFilterConfig
 {
 public:
     explicit            VbaFilterConfig(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                             const OUString& rConfigCompName );
                         ~VbaFilterConfig();
 
@@ -59,7 +59,7 @@ public:
     bool                isExportVba() const;
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
+    css::uno::Reference< css::uno::XInterface >
                         mxConfigAccess;
 };
 
@@ -91,7 +91,7 @@ public:
     /** Resolves the internal macro name to the related macro URL, and attaches
         the macro to the object. */
     void                resolveAndAttachMacro(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::script::vba::XVBAMacroResolver >& rxResolver );
+                            const css::uno::Reference< css::script::vba::XVBAMacroResolver >& rxResolver );
 
 private:
     /** Called after the VBA project has been imported. Derived classes will
@@ -110,8 +110,8 @@ class OOX_DLLPUBLIC VbaProject : public VbaFilterConfig
 {
 public:
     explicit            VbaProject(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::frame::XModel >& rxDocModel,
                             const OUString& rConfigCompName );
     virtual             ~VbaProject();
 
@@ -142,7 +142,7 @@ public:
     /** Returns true, if the document contains at least one dialog. */
     bool                hasDialogs() const;
 
-    void                setOleOverridesSink( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >&  rxOleOverridesSink ){ mxOleOverridesSink = rxOleOverridesSink; }
+    void                setOleOverridesSink( css::uno::Reference< css::container::XNameContainer >&  rxOleOverridesSink ){ mxOleOverridesSink = rxOleOverridesSink; }
 
 protected:
     /** Registers a dummy module that will be created when the VBA project is
@@ -157,16 +157,16 @@ private:
     VbaProject&         operator=( const VbaProject& ) = delete;
 
     /** Returns the Basic or dialog library container. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >
+    css::uno::Reference< css::script::XLibraryContainer >
                         getLibraryContainer( sal_Int32 nPropId );
     /** Opens a Basic or dialog library (creates missing if specified). */
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
+    css::uno::Reference< css::container::XNameContainer >
                         openLibrary( sal_Int32 nPropId, bool bCreateMissing );
     /** Creates and returns the Basic library of the document used for import. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
+    css::uno::Reference< css::container::XNameContainer >
                         createBasicLibrary();
     /** Creates and returns the dialog library of the document used for import. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
+    css::uno::Reference< css::container::XNameContainer >
                         createDialogLibrary();
 
     /** Imports the VBA code modules and forms. */
@@ -185,22 +185,22 @@ private:
     typedef RefVector< VbaMacroAttacherBase >           MacroAttacherVector;
     typedef ::std::map< OUString, sal_Int32 >    DummyModuleMap;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
+    css::uno::Reference< css::uno::XComponentContext >
                         mxContext;          ///< Component context with service manager.
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
+    css::uno::Reference< css::frame::XModel >
                         mxDocModel;         ///< Document model used to import/export the VBA project.
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
+    css::uno::Reference< css::container::XNameContainer >
                         mxBasicLib;         ///< The Basic library of the document used for import.
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
+    css::uno::Reference< css::container::XNameContainer >
                         mxDialogLib;        ///< The dialog library of the document used for import.
     MacroAttacherVector maMacroAttachers;   ///< Objects that want to attach a VBA macro to an action.
     DummyModuleMap      maDummyModules;     ///< Additional empty modules created on import.
-    OUString     maPrjName;          ///< Name of the VBA project.
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
+    OUString            maPrjName;          ///< Name of the VBA project.
+    css::uno::Reference< css::container::XNameContainer >
                         mxOleOverridesSink;
     typedef RefMap< rtl::OUString, VbaModule > VbaModuleMap;
-    VbaModuleMap maModules;
-    VbaModuleMap maModulesByStrm;
+    VbaModuleMap        maModules;
+    VbaModuleMap        maModulesByStrm;
 };
 
 
diff --git a/include/oox/ppt/animationspersist.hxx b/include/oox/ppt/animationspersist.hxx
index 2b27736b6dc4..72187269c90b 100644
--- a/include/oox/ppt/animationspersist.hxx
+++ b/include/oox/ppt/animationspersist.hxx
@@ -48,7 +48,7 @@ namespace oox { namespace ppt {
         _NP_SIZE
     };
 
-    typedef boost::array< ::com::sun::star::uno::Any, _NP_SIZE > NodePropertyMap;
+    typedef boost::array< css::uno::Any, _NP_SIZE > NodePropertyMap;
 
 
     /** data for CT_TLShapeTargetElement */
@@ -60,7 +60,7 @@ namespace oox { namespace ppt {
         {
             maRange.start = maRange.end = 0;
         }
-        void convert( ::com::sun::star::uno::Any & aAny, sal_Int16 & rSubType ) const;
+        void convert( css::uno::Any & aAny, sal_Int16 & rSubType ) const;
 
         sal_Int32               mnType;
         sal_Int32               mnRangeType;
@@ -76,12 +76,11 @@ namespace oox { namespace ppt {
             : mnType( 0 )
             {}
         /** convert to a set of properties */
-        ::com::sun::star::uno::Any convert(const SlidePersistPtr & pSlide, sal_Int16 & nSubType) const;
+        css::uno::Any convert(const SlidePersistPtr & pSlide, sal_Int16 & nSubType) const;
 
         sal_Int32                  mnType;
-        OUString            msValue;
-
-      ShapeTargetElement         maShapeTarget;
+        OUString                   msValue;
+        ShapeTargetElement         maShapeTarget;
     };
 
     typedef std::shared_ptr< AnimTargetElement > AnimTargetElementPtr;
@@ -97,12 +96,12 @@ namespace oox { namespace ppt {
             : mnType( 0 )
             {}
 
-        ::com::sun::star::uno::Any convert(const SlidePersistPtr & pSlide) const;
-        static ::com::sun::star::uno::Any convertList(const SlidePersistPtr & pSlide, const AnimationConditionList & l);
+        css::uno::Any convert(const SlidePersistPtr & pSlide) const;
+        static css::uno::Any convertList(const SlidePersistPtr & pSlide, const AnimationConditionList & l);
 
         AnimTargetElementPtr &     getTarget()
             { if(!mpTarget) mpTarget.reset( new AnimTargetElement ); return mpTarget; }
-        ::com::sun::star::uno::Any maValue;
+        css::uno::Any              maValue;
         sal_Int32                  mnType;
     private:
         AnimTargetElementPtr       mpTarget;
@@ -113,7 +112,7 @@ namespace oox { namespace ppt {
     {
         OUString            msFormula;
         OUString            msTime;
-        ::com::sun::star::uno::Any maValue;
+        css::uno::Any       maValue;
     };
 
     typedef ::std::list< TimeAnimationValue > TimeAnimationValueList;
diff --git a/include/oox/ppt/comments.hxx b/include/oox/ppt/comments.hxx
index cf3846bc5063..6766df27870c 100644
--- a/include/oox/ppt/comments.hxx
+++ b/include/oox/ppt/comments.hxx
@@ -50,7 +50,7 @@ class Comment
         OUString x;
         OUString y;
         OUString text;
-        ::com::sun::star::util::DateTime aDateTime;
+        css::util::DateTime aDateTime;
 
         void setDateTime (const OUString& datetime);
 
@@ -81,7 +81,7 @@ class Comment
         {
             return text;
         }
-        ::com::sun::star::util::DateTime getDateTime()
+        css::util::DateTime getDateTime()
         {
             return aDateTime;
         }
diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx
index cee93767fd68..531ab6c2dea8 100644
--- a/include/oox/ppt/dgmimport.hxx
+++ b/include/oox/ppt/dgmimport.hxx
@@ -37,7 +37,7 @@ class QuickDiagrammingImport : public oox::core::XmlFilterBase
 {
 public:
 
-    QuickDiagrammingImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+    QuickDiagrammingImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     // from FilterBase
     virtual bool importDocument() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx
index 4df5c154de22..9dcd8ae6fda9 100644
--- a/include/oox/ppt/dgmlayout.hxx
+++ b/include/oox/ppt/dgmlayout.hxx
@@ -37,7 +37,7 @@ class QuickDiagrammingLayout : public oox::core::XmlFilterBase
 {
 public:
 
-    QuickDiagrammingLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+    QuickDiagrammingLayout( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     // from FilterBase
     virtual bool importDocument() throw (css::uno::RuntimeException) override;
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx
index 476a402a98f0..9908177ea9f4 100644
--- a/include/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
@@ -37,8 +37,8 @@ class PowerPointImport : public oox::core::XmlFilterBase
 {
 public:
 
-    PowerPointImport( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext )
-        throw( ::com::sun::star::uno::RuntimeException );
+    PowerPointImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
+        throw( css::uno::RuntimeException );
     virtual ~PowerPointImport();
 
     // from FilterBase
@@ -57,8 +57,8 @@ public:
     std::vector< SlidePersistPtr >&                         getMasterPages(){ return maMasterPages; };
     std::vector< SlidePersistPtr >&                         getNotesPages(){ return maNotesPages; };
 
-    virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence<   ::com::sun::star::beans::PropertyValue >& rDescriptor )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL filter( const css::uno::Sequence<   css::beans::PropertyValue >& rDescriptor )
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     sal_Int32 getSchemeColor( sal_Int32 nToken ) const;
 
diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx
index 852b92f36f30..f4d0798257f1 100644
--- a/include/oox/ppt/pptshape.hxx
+++ b/include/oox/ppt/pptshape.hxx
@@ -44,9 +44,9 @@ public:
             oox::core::XmlFilterBase& rFilterBase,
             SlidePersist& rPersist,
             const oox::drawingml::Theme* pTheme,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+            const css::uno::Reference< css::drawing::XShapes >& rxShapes,
             basegfx::B2DHomMatrix& aTransformation,
-            const com::sun::star::awt::Rectangle* pShapeRect = 0,
+            const css::awt::Rectangle* pShapeRect = 0,
             ::oox::drawingml::ShapeIdMap* pShapeMap = 0 );
 
     virtual void applyShapeReference( const oox::drawingml::Shape& rReferencedShape, bool bUseText = true ) override;
diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx
index c476c67ae091..f745f2eab4d2 100644
--- a/include/oox/ppt/presentationfragmenthandler.hxx
+++ b/include/oox/ppt/presentationfragmenthandler.hxx
@@ -55,8 +55,8 @@ private:
     std::vector< OUString > maNotesMasterVector;
     ::oox::drawingml::TextListStylePtr mpTextListStyle;
 
-    ::com::sun::star::awt::Size maSlideSize;
-    ::com::sun::star::awt::Size maNotesSize;
+    css::awt::Size              maSlideSize;
+    css::awt::Size              maNotesSize;
 
     std::vector< CustomShow >   maCustomShowList;
 
diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx
index a97ede8906eb..3c08f6865438 100644
--- a/include/oox/ppt/slidepersist.hxx
+++ b/include/oox/ppt/slidepersist.hxx
@@ -55,14 +55,14 @@ class SlidePersist : public std::enable_shared_from_this< SlidePersist >
 
 public:
     SlidePersist( oox::core::XmlFilterBase& rFilter, bool bMaster, bool bNotes,
-                    const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >&,
+                    const css::uno::Reference< css::drawing::XDrawPage >&,
                     oox::drawingml::ShapePtr pShapesPtr, const ::oox::drawingml::TextListStylePtr & );
     ~SlidePersist();
 
-    com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >    getPage() const { return mxPage; };
+    css::uno::Reference< css::drawing::XDrawPage >    getPage() const { return mxPage; };
 
 #if OSL_DEBUG_LEVEL > 0
-    static com::sun::star::uno::WeakReference< com::sun::star::drawing::XDrawPage > mxDebugPage;
+    static css::uno::WeakReference< css::drawing::XDrawPage > mxDebugPage;
 #endif
 
     void setMasterPersist( SlidePersistPtr pMasterPersistPtr ){ mpMasterPagePtr = pMasterPersistPtr; }
@@ -109,7 +109,7 @@ public:
     void createBackground( const oox::core::XmlFilterBase& rFilterBase );
     void applyTextStyles( const oox::core::XmlFilterBase& rFilterBase );
 
-    std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >& getAnimNodesMap() { return maAnimNodesMap; };
+    std::map< OUString, css::uno::Reference< css::animations::XAnimationNode > >& getAnimNodesMap() { return maAnimNodesMap; };
     ::oox::drawingml::ShapePtr getShape( const OUString & id ) { return maShapeMap[ id ]; }
     ::oox::drawingml::ShapeIdMap& getShapeMap() { return maShapeMap; }
 
@@ -117,10 +117,10 @@ public:
     CommentAuthorList& getCommentAuthors() { return maCommentAuthors; }
 
 private:
-    OUString                                                           maPath;
-    OUString                                                           maLayoutPath;
-    std::shared_ptr< oox::vml::Drawing >                                mpDrawingPtr;
-    com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >    mxPage;
+    OUString                                                                maPath;
+    OUString                                                                maLayoutPath;
+    std::shared_ptr< oox::vml::Drawing >                                    mpDrawingPtr;
+    css::uno::Reference< css::drawing::XDrawPage >                          mxPage;
     oox::drawingml::ThemePtr                                                mpThemePtr;         // the theme that is used
     oox::drawingml::ClrSchemePtr                                            mpClrSchemePtr;     // the local color scheme (if any)
     oox::drawingml::ClrMapPtr                                               mpClrMapPtr;        // color mapping (if any)
@@ -129,7 +129,7 @@ private:
     oox::drawingml::ShapePtr                                                maShapesPtr;
     oox::drawingml::Color                                                   maBackgroundColor;
     oox::drawingml::FillPropertiesPtr                                       mpBackgroundPropertiesPtr;
-    ::std::list< std::shared_ptr< TimeNode > >                            maTimeNodeList;
+    ::std::list< std::shared_ptr< TimeNode > >                              maTimeNodeList;
 
     oox::ppt::HeaderFooter                                                  maHeaderFooter;
     sal_Int32                                                               mnLayoutValueToken;
@@ -142,8 +142,8 @@ private:
     oox::drawingml::TextListStylePtr                                        maNotesTextStylePtr;
     oox::drawingml::TextListStylePtr                                        maOtherTextStylePtr;
 
-    std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > > maAnimNodesMap;
-    std::map< OUString, ::oox::drawingml::ShapePtr > maShapeMap;
+    std::map< OUString, css::uno::Reference< css::animations::XAnimationNode > > maAnimNodesMap;
+    std::map< OUString, ::oox::drawingml::ShapePtr >                        maShapeMap;
 
     // slide comments
     CommentList                                                             maCommentsList;
diff --git a/include/oox/ppt/slidetransition.hxx b/include/oox/ppt/slidetransition.hxx
index 9e48dde82f29..b0e235189af3 100644
--- a/include/oox/ppt/slidetransition.hxx
+++ b/include/oox/ppt/slidetransition.hxx
@@ -36,7 +36,7 @@ namespace oox { namespace ppt {
         explicit SlideTransition(const OUString & );
 
         void setSlideProperties( PropertyMap& props );
-        void setTransitionFilterProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTransitionFilter > & xFilter );
+        void setTransitionFilterProperties( const css::uno::Reference< css::animations::XTransitionFilter > & xFilter );
 
         void setOoxTransitionSpeed( sal_Int32 nToken );
         void setMode( bool bMode )
diff --git a/include/oox/ppt/timenode.hxx b/include/oox/ppt/timenode.hxx
index 9e671c85118e..c04d4f526deb 100644
--- a/include/oox/ppt/timenode.hxx
+++ b/include/oox/ppt/timenode.hxx
@@ -44,7 +44,7 @@ namespace oox { namespace ppt {
     class TimeNode
     {
     public:
-        typedef ::std::map< OUString, ::com::sun::star::uno::Any > UserDataMap;
+        typedef ::std::map< OUString, css::uno::Any > UserDataMap;
 
         TimeNode( sal_Int16 nNodeType );
         virtual ~TimeNode();
@@ -58,18 +58,18 @@ namespace oox { namespace ppt {
 
         void addNode(
             const ::oox::core::XmlFilterBase& rFilter,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rxNode,
+            const css::uno::Reference< css::animations::XAnimationNode >& rxNode,
             const SlidePersistPtr & slide);
         // data setters
-        void setTo( const ::com::sun::star::uno::Any & aTo );
-        void setFrom( const ::com::sun::star::uno::Any & aFrom );
-        void setBy( const ::com::sun::star::uno::Any & aBy );
+        void setTo( const css::uno::Any & aTo );
+        void setFrom( const css::uno::Any & aFrom );
+        void setBy( const css::uno::Any & aBy );
         void setTransitionFilter( const SlideTransition & aTransition)
             { maTransitionFilter = aTransition; }
 
         void setNode(
             const ::oox::core::XmlFilterBase& rFilter,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode,
+            const css::uno::Reference< css::animations::XAnimationNode >& xNode,
             const SlidePersistPtr & pSlide );
 
         AnimTargetElementPtr getTarget()
@@ -93,11 +93,11 @@ namespace oox { namespace ppt {
 
         static OUString getServiceName( sal_Int16 nNodeType );
 
-        static ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >
+        static css::uno::Reference< css::animations::XAnimationNode >
         createAndInsert(
             const ::oox::core::XmlFilterBase& rFilter,
             const OUString& rServiceName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rxNode );
+            const css::uno::Reference< css::animations::XAnimationNode >& rxNode );
 
     private:
         const sal_Int16 mnNodeType;
diff --git a/include/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx
index 1656234c6844..af0d6f6cba07 100644
--- a/include/oox/ppt/timenodelistcontext.hxx
+++ b/include/oox/ppt/timenodelistcontext.hxx
@@ -33,10 +33,10 @@ namespace oox { namespace ppt {
     public:
         virtual ~TimeNodeContext() throw();
 
-        static TimeNodeContext * SAL_CALL makeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32  aElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode );
+        static TimeNodeContext * SAL_CALL makeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32  aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode );
 
     protected:
-        TimeNodeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32  aElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw();
+        TimeNodeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32  aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw();
 
         sal_Int32 mnElement;
         TimeNodePtr mpNode;
diff --git a/include/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx
index fc07093d3ccf..686b8316284c 100644
--- a/include/oox/token/tokenmap.hxx
+++ b/include/oox/token/tokenmap.hxx
@@ -41,7 +41,7 @@ public:
     static sal_Int32    getTokenFromUnicode( const OUString& rUnicodeName );
 
     /** Returns the UTF8 name of the passed token identifier as byte sequence. */
-    ::com::sun::star::uno::Sequence< sal_Int8 >
+    css::uno::Sequence< sal_Int8 >
                         getUtf8TokenName( sal_Int32 nToken ) const
     {
         SAL_WARN_IF(nToken < 0 || nToken >= XML_TOKEN_COUNT, "oox", "Wrong nToken parameter");
@@ -52,7 +52,7 @@ public:
 
     /** Returns the token identifier for the passed UTF8 token name. */
     sal_Int32           getTokenFromUtf8(
-                            const ::com::sun::star::uno::Sequence< sal_Int8 >& rUtf8Name ) const
+                            const css::uno::Sequence< sal_Int8 >& rUtf8Name ) const
     {
         return getTokenFromUTF8( reinterpret_cast< const char * >(
                                 rUtf8Name.getConstArray() ),
@@ -75,7 +75,7 @@ public:
 private:
     static sal_Int32 getTokenPerfectHash( const char *pToken, sal_Int32 nLength );
 
-    typedef ::std::vector< ::com::sun::star::uno::Sequence< sal_Int8 > > TokenNameVector;
+    typedef ::std::vector< css::uno::Sequence< sal_Int8 > > TokenNameVector;
 
     TokenNameVector     maTokenNames;
     sal_Int32           mnAlphaTokens[26];
diff --git a/include/oox/vml/vmldrawing.hxx b/include/oox/vml/vmldrawing.hxx
index 1fbdf23b9bce..ad34652a1d79 100644
--- a/include/oox/vml/vmldrawing.hxx
+++ b/include/oox/vml/vmldrawing.hxx
@@ -96,7 +96,7 @@ class OOX_DLLPUBLIC Drawing
 public:
     explicit            Drawing(
                             ::oox::core::XmlFilterBase& rFilter,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& rxDrawPage,
+                            const css::uno::Reference< css::drawing::XDrawPage >& rxDrawPage,
                             DrawingType eType );
 
     virtual             ~Drawing();
@@ -138,19 +138,19 @@ public:
 
     /** Creates a new UNO shape object, inserts it into the passed UNO shape
         container, and sets the shape position and size. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+    css::uno::Reference< css::drawing::XShape >
                         createAndInsertXShape(
                             const OUString& rService,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
-                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
+                            const css::uno::Reference< css::drawing::XShapes >& rxShapes,
+                            const css::awt::Rectangle& rShapeRect ) const;
 
     /** Creates a new UNO shape object for a form control, inserts the control
         model into the form, and the shape into the passed UNO shape container. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+    css::uno::Reference< css::drawing::XShape >
                         createAndInsertXControlShape(
                             const ::oox::ole::EmbeddedControl& rControl,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
-                            const ::com::sun::star::awt::Rectangle& rShapeRect,
+                            const css::uno::Reference< css::drawing::XShapes >& rxShapes,
+                            const css::awt::Rectangle& rShapeRect,
                             sal_Int32& rnCtrlIndex ) const;
 
     /** Derived classes may disable conversion of specific shapes. */
@@ -163,24 +163,24 @@ public:
     /** Derived classes may calculate the shape rectangle from a non-standard
         anchor information string. */
     virtual bool        convertClientAnchor(
-                            ::com::sun::star::awt::Rectangle& orShapeRect,
+                            css::awt::Rectangle& orShapeRect,
                             const OUString& rShapeAnchor ) const;
 
     /** Derived classes create a UNO shape according to the passed shape model.
         Called for shape models that specify being under host control. */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+    virtual css::uno::Reference< css::drawing::XShape >
                         createAndInsertClientXShape(
                             const ShapeBase& rShape,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
-                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
+                            const css::uno::Reference< css::drawing::XShapes >& rxShapes,
+                            const css::awt::Rectangle& rShapeRect ) const;
 
     /** Derived classes may want to know that a UNO shape has been inserted.
         Will be called from the convertAndInsert() implementation.
         @param bGroupChild  True = inserted into a group shape,
             false = inserted directly into this drawing. */
     virtual void        notifyXShapeInserted(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape,
-                            const ::com::sun::star::awt::Rectangle& rShapeRect,
+                            const css::uno::Reference< css::drawing::XShape >& rxShape,
+                            const css::awt::Rectangle& rShapeRect,
                             const ShapeBase& rShape, bool bGroupChild );
 
 private:
@@ -191,7 +191,7 @@ private:
     typedef ::std::map< OUString, ControlInfo >      ControlInfoMap;
 
     ::oox::core::XmlFilterBase& mrFilter;   ///< Filter object that imports/exports the VML drawing.
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >
+    css::uno::Reference< css::drawing::XDrawPage >
                         mxDrawPage;         ///< UNO draw page used to insert the shapes.
     mutable EmbeddedFormPtr mxCtrlForm;     ///< The control form used to process embedded controls.
     mutable BlockIdVector maBlockIds;       ///< Block identifiers used by this drawing.
diff --git a/include/oox/vml/vmldrawingfragment.hxx b/include/oox/vml/vmldrawingfragment.hxx
index 6851f582c398..7e0d4c474a46 100644
--- a/include/oox/vml/vmldrawingfragment.hxx
+++ b/include/oox/vml/vmldrawingfragment.hxx
@@ -38,7 +38,7 @@ public:
                             const OUString& rFragmentPath,
                             Drawing& rDrawing );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+    virtual css::uno::Reference< css::io::XInputStream >
                         openFragmentStream() const override;
 
     virtual ::oox::core::ContextHandlerRef
diff --git a/include/oox/vml/vmlformatting.hxx b/include/oox/vml/vmlformatting.hxx
index 7cf3bca61285..8df59acf4eaf 100644
--- a/include/oox/vml/vmlformatting.hxx
+++ b/include/oox/vml/vmlformatting.hxx
@@ -152,8 +152,8 @@ namespace ConversionHelper
         @param rGraphicHelper  See above.
     */
     OOX_DLLPUBLIC void         decodeVmlPath(
-                            ::std::vector< ::std::vector< ::com::sun::star::awt::Point > >& rPoints,
-                            ::std::vector< ::std::vector< ::com::sun::star::drawing::PolygonFlags > >& rFlags,
+                            ::std::vector< ::std::vector< css::awt::Point > >& rPoints,
+                            ::std::vector< ::std::vector< css::drawing::PolygonFlags > >& rFlags,
                             const OUString& rPath );
 }
 
@@ -244,7 +244,7 @@ struct OOX_DLLPUBLIC TextpathModel
     TextpathModel();
 
     /** Writes the properties to the passed property map. */
-    void pushToPropMap(oox::drawingml::ShapePropertyMap& rPropMap, com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape) const;
+    void pushToPropMap(oox::drawingml::ShapePropertyMap& rPropMap, css::uno::Reference<css::drawing::XShape> xShape) const;
 };
 
 } // namespace vml
diff --git a/include/oox/vml/vmlinputstream.hxx b/include/oox/vml/vmlinputstream.hxx
index e4a6130b276b..0197cff6278e 100644
--- a/include/oox/vml/vmlinputstream.hxx
+++ b/include/oox/vml/vmlinputstream.hxx
@@ -51,38 +51,38 @@ namespace vml {
     3)  Line breaks represented by a single <br> element (without matching
         </br> element) are replaced by a literal LF character.
  */
-class InputStream : public ::cppu::WeakImplHelper< ::com::sun::star::io::XInputStream >
+class InputStream : public ::cppu::WeakImplHelper< css::io::XInputStream >
 {
 public:
     explicit            InputStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm );
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                            const css::uno::Reference< css::io::XInputStream >& rxInStrm );
     virtual             ~InputStream();
 
-    virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead )
-                        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead )
-                        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead )
+                        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead )
+                        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-                        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+                        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
     virtual sal_Int32 SAL_CALL available()
-                        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+                        throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL closeInput()
-                        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+                        throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
 
 private:
-    void                updateBuffer() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    OString      readToElementBegin() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    OString      readToElementEnd() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    void                updateBuffer() throw (css::io::IOException, css::uno::RuntimeException);
+    OString      readToElementBegin() throw (css::io::IOException, css::uno::RuntimeException);
+    OString      readToElementEnd() throw (css::io::IOException, css::uno::RuntimeException);
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream2 >
+    css::uno::Reference< css::io::XTextInputStream2 >
                         mxTextStrm;
-    ::com::sun::star::uno::Sequence< sal_Unicode > maOpeningBracket;
-    ::com::sun::star::uno::Sequence< sal_Unicode > maClosingBracket;
-    const OString maOpeningCData;
-    const OString maClosingCData;
-    OString      maBuffer;
+    css::uno::Sequence< sal_Unicode > maOpeningBracket;
+    css::uno::Sequence< sal_Unicode > maClosingBracket;
+    const OString       maOpeningCData;
+    const OString       maClosingCData;
+    OString             maBuffer;
     sal_Int32           mnBufferPos;
 };
 
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index c14ea4c11d11..7ccead9ad043 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -137,13 +137,13 @@ public:
 
 protected:
     /** Returns the coordinate system of this shape. */
-    ::com::sun::star::awt::Rectangle getCoordSystem() const;
+    css::awt::Rectangle getCoordSystem() const;
     /** Returns the absolute shape rectangle according to the passed anchor. */
-    ::com::sun::star::awt::Rectangle getRectangle( const ShapeParentAnchor* pParentAnchor ) const;
+    css::awt::Rectangle getRectangle( const ShapeParentAnchor* pParentAnchor ) const;
     /** Returns the absolute shape rectangle. */
-    virtual ::com::sun::star::awt::Rectangle getAbsRectangle() const;
+    virtual css::awt::Rectangle getAbsRectangle() const;
     /** Returns the rectangle relative to the parent coordinate system. */
-    virtual ::com::sun::star::awt::Rectangle getRelRectangle() const;
+    virtual css::awt::Rectangle getRelRectangle() const;
 
 protected:
     Drawing&            mrDrawing;          ///< The VML drawing page that contains this shape.
@@ -192,7 +192,7 @@ struct ClientData
 
 struct ShapeModel
 {
-    typedef ::std::vector< ::com::sun::star::awt::Point >   PointVector;
+    typedef ::std::vector< css::awt::Point >   PointVector;
     typedef ::std::unique_ptr< TextBox >                    TextBoxPtr;
     typedef ::std::unique_ptr< ClientData >                 ClientDataPtr;
 
@@ -246,33 +246,33 @@ public:
     virtual const ShapeBase* getChildById( const OUString& rShapeId ) const;
 
     /** Creates the corresponding XShape and inserts it into the passed container. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+    css::uno::Reference< css::drawing::XShape >
                         convertAndInsert(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+                            const css::uno::Reference< css::drawing::XShapes >& rxShapes,
                             const ShapeParentAnchor* pParentAnchor = 0 ) const;
 
     /** Converts position and formatting into the passed existing XShape. */
     void                convertFormatting(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape,
+                            const css::uno::Reference< css::drawing::XShape >& rxShape,
                             const ShapeParentAnchor* pParentAnchor = 0 ) const;
 
 protected:
     explicit            ShapeBase( Drawing& rDrawing );
 
     /** Derived classes create the corresponding XShape and insert it into the passed container. */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+    virtual css::uno::Reference< css::drawing::XShape >
                         implConvertAndInsert(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
-                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const = 0;
+                            const css::uno::Reference< css::drawing::XShapes >& rxShapes,
+                            const css::awt::Rectangle& rShapeRect ) const = 0;
 
     /** Calculates the final shape rectangle according to the passed anchor,
         if present, otherwise according to the own anchor settings. */
-    ::com::sun::star::awt::Rectangle calcShapeRectangle(
+    css::awt::Rectangle calcShapeRectangle(
                             const ShapeParentAnchor* pParentAnchor ) const;
 
     /** Converts common shape properties such as formatting attributes. */
     void                convertShapeProperties(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape ) const;
+                            const css::uno::Reference< css::drawing::XShape >& rxShape ) const;
 
 protected:
     ShapeModel          maShapeModel;       ///< The model structure containing shape data.
@@ -290,14 +290,14 @@ public:
 
 protected:
     /** Creates the corresponding XShape and inserts it into the passed container. */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+    virtual css::uno::Reference< css::drawing::XShape >
                         implConvertAndInsert(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
-                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const override;
+                            const css::uno::Reference< css::drawing::XShapes >& rxShapes,
+                            const css::awt::Rectangle& rShapeRect ) const override;
     /** Used by both RectangleShape and ComplexShape. */
-    com::sun::star::uno::Reference<com::sun::star::drawing::XShape>createPictureObject(
-            const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rxShapes,
-            const com::sun::star::awt::Rectangle& rShapeRect, OUString& rGraphicPath ) const;
+    css::uno::Reference<css::drawing::XShape>createPictureObject(
+            const css::uno::Reference< css::drawing::XShapes >& rxShapes,
+            const css::awt::Rectangle& rShapeRect, OUString& rGraphicPath ) const;
 
 private:
     OUString     maService;          ///< Name of the UNO shape service.
@@ -312,10 +312,10 @@ public:
     explicit            RectangleShape( Drawing& rDrawing );
 protected:
     /** Creates the corresponding XShape and inserts it into the passed container. */
-    virtual com::sun::star::uno::Reference<com::sun::star::drawing::XShape>
+    virtual css::uno::Reference<css::drawing::XShape>
                         implConvertAndInsert(
-                            const com::sun::star::uno::Reference<com::sun::star::drawing::XShapes>& rxShapes,
-                            const com::sun::star::awt::Rectangle& rShapeRect) const override;
+                            const css::uno::Reference<css::drawing::XShapes>& rxShapes,
+                            const css::awt::Rectangle& rShapeRect) const override;
 };
 
 
@@ -337,10 +337,10 @@ public:
 
 protected:
     /** Creates the corresponding XShape and inserts it into the passed container. */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+    virtual css::uno::Reference< css::drawing::XShape >
                         implConvertAndInsert(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
-                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const override;
+                            const css::uno::Reference< css::drawing::XShapes >& rxShapes,
+                            const css::awt::Rectangle& rShapeRect ) const override;
 };
 
 /** A Line shape object. */
@@ -351,9 +351,9 @@ public:
 
 protected:
     /** Returns the absolute shape rectangle. */
-    virtual ::com::sun::star::awt::Rectangle getAbsRectangle() const override;
+    virtual css::awt::Rectangle getAbsRectangle() const override;
     /** Returns the rectangle relative to the parent coordinate system. */
-    virtual ::com::sun::star::awt::Rectangle getRelRectangle() const override;
+    virtual css::awt::Rectangle getRelRectangle() const override;
 };
 
 /** Bezier shape object that supports to, from, control1 and control2
@@ -365,10 +365,10 @@ public:
 
 protected:
     /** Creates the corresponding XShape and inserts it into the passed container. */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+    virtual css::uno::Reference< css::drawing::XShape >
                         implConvertAndInsert(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
-                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const override;
+                            const css::uno::Reference< css::drawing::XShapes >& rxShapes,
+                            const css::awt::Rectangle& rShapeRect ) const override;
 };
 
 
@@ -381,10 +381,10 @@ public:
 
 protected:
     /** Creates the corresponding XShape and inserts it into the passed container. */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+    virtual css::uno::Reference< css::drawing::XShape >
                         implConvertAndInsert(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
-                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const override;
+                            const css::uno::Reference< css::drawing::XShapes >& rxShapes,
+                            const css::awt::Rectangle& rShapeRect ) const override;
 };
 
 
@@ -398,10 +398,10 @@ public:
 
 protected:
     /** Creates the corresponding XShape and inserts it into the passed container. */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+    virtual css::uno::Reference< css::drawing::XShape >
                         implConvertAndInsert(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
-                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const override;
+                            const css::uno::Reference< css::drawing::XShapes >& rxShapes,
+                            const css::awt::Rectangle& rShapeRect ) const override;
 };
 
 
@@ -428,10 +428,10 @@ public:
 
 protected:
     /** Creates the corresponding XShape and inserts it into the passed container. */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+    virtual css::uno::Reference< css::drawing::XShape >
                         implConvertAndInsert(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
-                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const override;
+                            const css::uno::Reference< css::drawing::XShapes >& rxShapes,
+                            const css::awt::Rectangle& rShapeRect ) const override;
 
 private:
     typedef ::std::unique_ptr< ShapeContainer > ShapeContainerPtr;
diff --git a/include/oox/vml/vmlshapecontainer.hxx b/include/oox/vml/vmlshapecontainer.hxx
index 4335580ee903..6b2c3c67940f 100644
--- a/include/oox/vml/vmlshapecontainer.hxx
+++ b/include/oox/vml/vmlshapecontainer.hxx
@@ -40,8 +40,8 @@ class ShapeBase;
 
 struct ShapeParentAnchor
 {
-    ::com::sun::star::awt::Rectangle maShapeRect;
-    ::com::sun::star::awt::Rectangle maCoordSys;
+    css::awt::Rectangle maShapeRect;
+    css::awt::Rectangle maCoordSys;
 };
 
 
@@ -104,7 +104,7 @@ public:
 
     /** Creates and inserts all UNO shapes into the passed container. */
     void                convertAndInsert(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+                            const css::uno::Reference< css::drawing::XShapes >& rxShapes,
                             const ShapeParentAnchor* pParentAnchor = 0 ) const;
 
 private:
diff --git a/include/oox/vml/vmltextbox.hxx b/include/oox/vml/vmltextbox.hxx
index 6b14c4c900b3..1aa06db3f484 100644
--- a/include/oox/vml/vmltextbox.hxx
+++ b/include/oox/vml/vmltextbox.hxx
@@ -88,7 +88,7 @@ public:
     const TextFontModel* getFirstFont() const;
     /** Returns the entire text of all text portions. */
     OUString     getText() const;
-    void convert(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape) const;
+    void convert(css::uno::Reference<css::drawing::XShape> xShape) const;
 
     ShapeTypeModel&     mrTypeModel;
     /// Text distance from the border (inset attribute of v:textbox), valid only if set.