com::sun::star->css in include/ucbhelper to include/xmlscript

Change-Id: Iaa7f0b8455a601d3992c08cde0943c709c417256

73 files changed, 776 insertions, 1017 deletions

diff --git a/include/xmloff/DashStyle.hxx b/include/xmloff/DashStyle.hxx
index eafe70e16399..060d81932a48 100644
--- a/include/xmloff/DashStyle.hxx
+++ b/include/xmloff/DashStyle.hxx
@@ -42,9 +42,8 @@ public:
     ~XMLDashStyleImport();
 
     void importXML(
-        const ::com::sun::star::uno::Reference<
-                ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
-        ::com::sun::star::uno::Any& rValue,
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
+        css::uno::Any& rValue,
         OUString& rStrName );
 };
 
@@ -58,7 +57,7 @@ public:
     ~XMLDashStyleExport();
 
     bool exportXML( const OUString& rStrName,
-                        const ::com::sun::star::uno::Any& rValue );
+                        const css::uno::Any& rValue );
 };
 
 #endif // INCLUDED_XMLOFF_DASHSTYLE_HXX
diff --git a/include/xmloff/DocumentSettingsContext.hxx b/include/xmloff/DocumentSettingsContext.hxx
index ec0f6544ce98..968acc1564b8 100644
--- a/include/xmloff/DocumentSettingsContext.hxx
+++ b/include/xmloff/DocumentSettingsContext.hxx
@@ -36,14 +36,12 @@ class XMLOFF_DLLPUBLIC XMLDocumentSettingsContext : public SvXMLImportContext
 
 public:
     XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
-                                    const ::com::sun::star::uno::Reference<
-                                    ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
+                                    const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList);
     virtual ~XMLDocumentSettingsContext();
 
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const OUString& rLocalName,
-                                                    const ::com::sun::star::uno::Reference<
-                                          ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
+                                                    const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
     virtual void EndElement() override;
 
 private:
diff --git a/include/xmloff/EnumPropertyHdl.hxx b/include/xmloff/EnumPropertyHdl.hxx
index 935d317400e3..521b8fa0a87e 100644
--- a/include/xmloff/EnumPropertyHdl.hxx
+++ b/include/xmloff/EnumPropertyHdl.hxx
@@ -31,14 +31,14 @@ class XMLOFF_DLLPUBLIC XMLEnumPropertyHdl : public XMLPropertyHandler
 {
 private:
     const SvXMLEnumMapEntry* mpEnumMap;
-    const ::com::sun::star::uno::Type & mrType;
+    const css::uno::Type & mrType;
 
 public:
-    XMLEnumPropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const ::com::sun::star::uno::Type & rType ) : mpEnumMap( pEnumMap ), mrType( rType ) {}
+    XMLEnumPropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const css::uno::Type & rType ) : mpEnumMap( pEnumMap ), mrType( rType ) {}
     virtual ~XMLEnumPropertyHdl();
 
-    virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
-    virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
+    virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
+    virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
 #endif // INCLUDED_XMLOFF_ENUMPROPERTYHDL_HXX
diff --git a/include/xmloff/GradientStyle.hxx b/include/xmloff/GradientStyle.hxx
index ef3eaf87b894..84fdb9be105c 100644
--- a/include/xmloff/GradientStyle.hxx
+++ b/include/xmloff/GradientStyle.hxx
@@ -43,9 +43,8 @@ public:
     ~XMLGradientStyleImport();
 
     bool importXML(
-        const ::com::sun::star::uno::Reference<
-           ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
-        ::com::sun::star::uno::Any& rValue,
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
+        css::uno::Any& rValue,
         OUString& rStrName );
 };
 
@@ -60,7 +59,7 @@ public:
 
     bool exportXML(
         const OUString& rStrName,
-        const ::com::sun::star::uno::Any& rValue );
+        const css::uno::Any& rValue );
 };
 
 #endif // INCLUDED_XMLOFF_GRADIENTSTYLE_HXX
diff --git a/include/xmloff/HatchStyle.hxx b/include/xmloff/HatchStyle.hxx
index 44721e0fe126..e5e9e403d551 100644
--- a/include/xmloff/HatchStyle.hxx
+++ b/include/xmloff/HatchStyle.hxx
@@ -43,9 +43,8 @@ public:
     ~XMLHatchStyleImport();
 
     bool importXML(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
-        ::com::sun::star::uno::Any& rValue,
+        const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
+        css::uno::Any& rValue,
         OUString& rStrName );
 };
 
@@ -57,7 +56,7 @@ public:
     XMLHatchStyleExport( SvXMLExport& rExport );
     ~XMLHatchStyleExport();
 
-    bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue );
+    bool exportXML( const OUString& rStrName, const css::uno::Any& rValue );
 };
 
 #endif // _XMLOFF_HATCHELEMENT_HXX
diff --git a/include/xmloff/ImageStyle.hxx b/include/xmloff/ImageStyle.hxx
index d3fa5c2d2142..6bf64718e7c3 100644
--- a/include/xmloff/ImageStyle.hxx
+++ b/include/xmloff/ImageStyle.hxx
@@ -37,15 +37,15 @@ public:
     XMLImageStyle();
     ~XMLImageStyle();
 
-    void exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue, SvXMLExport& rExport );
-    bool importXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport );
+    void exportXML( const OUString& rStrName, const css::uno::Any& rValue, SvXMLExport& rExport );
+    bool importXML( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, css::uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport );
 
 private:
 
-    SAL_DLLPRIVATE void ImpExportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue,
+    SAL_DLLPRIVATE void ImpExportXML( const OUString& rStrName, const css::uno::Any& rValue,
                            SvXMLExport& rExport );
-    SAL_DLLPRIVATE bool ImpImportXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
-                           ::com::sun::star::uno::Any& rValue, OUString& rStrName,
+    SAL_DLLPRIVATE bool ImpImportXML( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
+                           css::uno::Any& rValue, OUString& rStrName,
                            SvXMLImport& rImport );
 };
 
diff --git a/include/xmloff/MarkerStyle.hxx b/include/xmloff/MarkerStyle.hxx
index 7ec72d1cbc1f..3779202ce658 100644
--- a/include/xmloff/MarkerStyle.hxx
+++ b/include/xmloff/MarkerStyle.hxx
@@ -43,9 +43,8 @@ public:
     ~XMLMarkerStyleImport();
 
     bool importXML(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
-        ::com::sun::star::uno::Any& rValue,
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
+        css::uno::Any& rValue,
         OUString& rStrName );
 };
 
@@ -59,7 +58,7 @@ public:
 
     void exportXML(
         const OUString& rStrName,
-        const ::com::sun::star::uno::Any& rValue );
+        const css::uno::Any& rValue );
 };
 
 #endif // INCLUDED_XMLOFF_MARKERSTYLE_HXX
diff --git a/include/xmloff/NamedBoolPropertyHdl.hxx b/include/xmloff/NamedBoolPropertyHdl.hxx
index 7bd8a35f2a3c..2a9471bdd5ee 100644
--- a/include/xmloff/NamedBoolPropertyHdl.hxx
+++ b/include/xmloff/NamedBoolPropertyHdl.hxx
@@ -47,8 +47,8 @@ public:
 
     virtual ~XMLNamedBoolPropertyHdl();
 
-    virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
-    virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
+    virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
+    virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
 #endif // INCLUDED_XMLOFF_NAMEDBOOLPROPERTYHDL_HXX
diff --git a/include/xmloff/ProgressBarHelper.hxx b/include/xmloff/ProgressBarHelper.hxx
index 6de978c8cb56..7eeed4ebc7c1 100644
--- a/include/xmloff/ProgressBarHelper.hxx
+++ b/include/xmloff/ProgressBarHelper.hxx
@@ -32,19 +32,19 @@
 
 class XMLOFF_DLLPUBLIC ProgressBarHelper
 {
-            ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator >   xStatusIndicator;
-            sal_Int32                                                                       nRange;
-            sal_Int32                                                                       nReference;
-            sal_Int32                                                                       nValue;
-            bool                                                                            bStrict;
+            css::uno::Reference < css::task::XStatusIndicator >   xStatusIndicator;
+            sal_Int32                                             nRange;
+            sal_Int32                                             nReference;
+            sal_Int32                                             nValue;
+            bool                                                  bStrict;
             // #96469#; if the value goes over the Range the progressbar starts again
-            bool                                                                            bRepeat;
+            bool                                                  bRepeat;
 
 #ifdef DBG_UTIL
-            bool                                                                            bFailure;
+            bool                                                  bFailure;
 #endif
 public:
-            ProgressBarHelper(const ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator>& xStatusIndicator,
+            ProgressBarHelper(const css::uno::Reference < css::task::XStatusIndicator>& xStatusIndicator,
                                 const bool bStrict);
             ~ProgressBarHelper();
 
diff --git a/include/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx
index e96b500b30a6..79f4d1dc05af 100644
--- a/include/xmloff/SchXMLImportHelper.hxx
+++ b/include/xmloff/SchXMLImportHelper.hxx
@@ -64,7 +64,7 @@ class SvXMLImport;
 class SchXMLImportHelper : public salhelper::SimpleReferenceObject
 {
 private:
-    com::sun::star::uno::Reference< com::sun::star::chart::XChartDocument > mxChartDoc;
+    css::uno::Reference< css::chart::XChartDocument > mxChartDoc;
     SvXMLStylesContext* mpAutoStyles;
 
     SvXMLTokenMap* mpChartDocElemTokenMap;
@@ -93,10 +93,8 @@ public:
     SvXMLImportContext* CreateChartContext(
         SvXMLImport& rImport,
         sal_uInt16 nPrefix, const OUString& rLocalName,
-        const com::sun::star::uno::Reference<
-            com::sun::star::frame::XModel >& rChartModel,
-        const com::sun::star::uno::Reference<
-            com::sun::star::xml::sax::XAttributeList >& rAttrList );
+        const css::uno::Reference< css::frame::XModel >& rChartModel,
+        const css::uno::Reference< css::xml::sax::XAttributeList >& rAttrList );
 
     /** set the auto-style context that will be used to retrieve auto-styles
         used inside the following <chart:chart> element to parse
@@ -104,8 +102,7 @@ public:
     void SetAutoStylesContext( SvXMLStylesContext* pAutoStyles ) { mpAutoStyles = pAutoStyles; }
     SvXMLStylesContext* GetAutoStylesContext() const { return mpAutoStyles; }
 
-    const com::sun::star::uno::Reference<
-        com::sun::star::chart::XChartDocument >& GetChartDocument()
+    const css::uno::Reference< css::chart::XChartDocument >& GetChartDocument()
         { return mxChartDoc; }
 
     const SvXMLTokenMap& GetDocElemTokenMap();
@@ -135,19 +132,15 @@ public:
                following new chart types are again be added at the end (by
                passing false).
      */
-    static ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDataSeries > GetNewDataSeries(
-                    const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::chart2::XChartDocument > & xDoc,
+    static css::uno::Reference< css::chart2::XDataSeries > GetNewDataSeries(
+                    const css::uno::Reference< css::chart2::XChartDocument > & xDoc,
                     sal_Int32 nCoordinateSystemIndex,
                     const OUString & rChartTypeName,
                     bool bPushLastChartType = false );
 
     static void DeleteDataSeries(
-                    const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::chart2::XDataSeries >& xSeries,
-                    const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::chart2::XChartDocument > & xDoc );
+                    const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
+                    const css::uno::Reference< css::chart2::XChartDocument > & xDoc );
 };
 
 #endif // INCLUDED_XMLOFF_SCHXMLIMPORTHELPER_HXX
diff --git a/include/xmloff/SchXMLSeriesHelper.hxx b/include/xmloff/SchXMLSeriesHelper.hxx
index e8e56393c54a..567ad0c4c2b6 100644
--- a/include/xmloff/SchXMLSeriesHelper.hxx
+++ b/include/xmloff/SchXMLSeriesHelper.hxx
@@ -35,36 +35,25 @@
 class XMLOFF_DLLPUBLIC SchXMLSeriesHelper
 {
 public:
-    static ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >
+    static ::std::vector< css::uno::Reference< css::chart2::XDataSeries > >
             getDataSeriesFromDiagram(
-                const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XDiagram > & xDiagram );
-    static ::std::map< ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDataSeries >, sal_Int32 >
+                const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
+    static ::std::map< css::uno::Reference< css::chart2::XDataSeries >, sal_Int32 >
             getDataSeriesIndexMapFromDiagram(
-                const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XDiagram > & xDiagram );
+                const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
 
     static bool isCandleStickSeries(
-                  const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XDataSeries >& xSeries
-                , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::frame::XModel >& xChartModel  );
+                  const css::uno::Reference< css::chart2::XDataSeries >& xSeries
+                , const css::uno::Reference< css::frame::XModel >& xChartModel  );
 
-    static ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet > createOldAPISeriesPropertySet(
-                    const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::chart2::XDataSeries >& xSeries
-                    , const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::frame::XModel >& xChartModel );
+    static css::uno::Reference< css::beans::XPropertySet > createOldAPISeriesPropertySet(
+                    const css::uno::Reference< css::chart2::XDataSeries >& xSeries
+                    , const css::uno::Reference< css::frame::XModel >& xChartModel );
 
-    static ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet > createOldAPIDataPointPropertySet(
-                    const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::chart2::XDataSeries >& xSeries
+    static css::uno::Reference< css::beans::XPropertySet > createOldAPIDataPointPropertySet(
+                    const css::uno::Reference< css::chart2::XDataSeries >& xSeries
                     , sal_Int32 nPointIndex
-                    , const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::frame::XModel >& xChartModel );
+                    , const css::uno::Reference< css::frame::XModel >& xChartModel );
 };
 
 // INCLUDED_XMLOFF_SCHXMLSERIESHELPER_HXX
diff --git a/include/xmloff/SettingsExportHelper.hxx b/include/xmloff/SettingsExportHelper.hxx
index 97cacb5dbba6..1c454d7ac91b 100644
--- a/include/xmloff/SettingsExportHelper.hxx
+++ b/include/xmloff/SettingsExportHelper.hxx
@@ -44,7 +44,7 @@ class XMLOFF_DLLPUBLIC XMLSettingsExportHelper
 {
     ::xmloff::XMLSettingsExportContext& m_rContext;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringSubstitution > mxStringSubsitution;
+    css::uno::Reference< css::util::XStringSubstitution > mxStringSubsitution;
 
     const OUString msPrinterIndependentLayout;
     const OUString msColorTableURL;
@@ -54,9 +54,9 @@ class XMLOFF_DLLPUBLIC XMLSettingsExportHelper
     const OUString msGradientTableURL;
     const OUString msBitmapTableURL;
 
-    void ManipulateSetting( com::sun::star::uno::Any& rAny, const OUString& rName ) const;
+    void ManipulateSetting( css::uno::Any& rAny, const OUString& rName ) const;
 
-    void CallTypeFunction(const com::sun::star::uno::Any& rAny,
+    void CallTypeFunction(const css::uno::Any& rAny,
                         const OUString& rName) const;
 
     void exportBool(const bool bValue, const OUString& rName) const;
@@ -66,28 +66,28 @@ class XMLOFF_DLLPUBLIC XMLSettingsExportHelper
     void exportLong(const sal_Int64 nValue, const OUString& rName) const;
     void exportDouble(const double fValue, const OUString& rName) const;
     void exportString(const OUString& sValue, const OUString& rName) const;
-    void exportDateTime(const com::sun::star::util::DateTime& aValue, const OUString& rName) const;
+    void exportDateTime(const css::util::DateTime& aValue, const OUString& rName) const;
     void exportSequencePropertyValue(
-        const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps,
+        const css::uno::Sequence<css::beans::PropertyValue>& aProps,
         const OUString& rName) const;
     void exportbase64Binary(
-        const com::sun::star::uno::Sequence<sal_Int8>& aProps,
+        const css::uno::Sequence<sal_Int8>& aProps,
         const OUString& rName) const;
-    void exportMapEntry(const com::sun::star::uno::Any& rAny,
+    void exportMapEntry(const css::uno::Any& rAny,
                         const OUString& rName,
                         const bool bNameAccess) const;
     void exportNameAccess(
-        const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& rNamed,
+        const css::uno::Reference<css::container::XNameAccess>& rNamed,
         const OUString& rName) const;
     void exportIndexAccess(
-        const com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess>& rIndexed,
+        const css::uno::Reference<css::container::XIndexAccess>& rIndexed,
         const OUString& rName) const;
 
     void exportSymbolDescriptors(
-                    const com::sun::star::uno::Sequence < com::sun::star::formula::SymbolDescriptor > &rProps,
+                    const css::uno::Sequence < css::formula::SymbolDescriptor > &rProps,
                     const OUString& rName) const;
     void exportForbiddenCharacters(
-                    const com::sun::star::uno::Any &rAny,
+                    const css::uno::Any &rAny,
                     const OUString& rName) const;
 
 public:
@@ -95,7 +95,7 @@ public:
     ~XMLSettingsExportHelper();
 
     void exportAllSettings(
-        const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps,
+        const css::uno::Sequence<css::beans::PropertyValue>& aProps,
         const OUString& rName) const;
 };
 
diff --git a/include/xmloff/SinglePropertySetInfoCache.hxx b/include/xmloff/SinglePropertySetInfoCache.hxx
index 28ed54698556..04b42fcb12b1 100644
--- a/include/xmloff/SinglePropertySetInfoCache.hxx
+++ b/include/xmloff/SinglePropertySetInfoCache.hxx
@@ -40,14 +40,11 @@ public:
     ~SinglePropertySetInfoCache() {};
 
     bool hasProperty(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet >& rPropSet,
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySetInfo >& rPropSetInfo );
+            const css::uno::Reference< css::beans::XPropertySet >& rPropSet,
+            css::uno::Reference< css::beans::XPropertySetInfo >& rPropSetInfo );
 
     inline bool hasProperty(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet>& rPropSet );
+            const css::uno::Reference< css::beans::XPropertySet>& rPropSet );
 };
 
 inline SinglePropertySetInfoCache::SinglePropertySetInfoCache(
@@ -57,11 +54,9 @@ inline SinglePropertySetInfoCache::SinglePropertySetInfoCache(
 }
 
 inline bool SinglePropertySetInfoCache::hasProperty(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet>& rPropSet )
+        const css::uno::Reference< css::beans::XPropertySet>& rPropSet )
 {
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySetInfo > xInfo;
+    css::uno::Reference< css::beans::XPropertySetInfo > xInfo;
     return hasProperty( rPropSet, xInfo );
 }
 
diff --git a/include/xmloff/WordWrapPropertyHdl.hxx b/include/xmloff/WordWrapPropertyHdl.hxx
index a5e6cec6dea7..51cbaa9f3dad 100644
--- a/include/xmloff/WordWrapPropertyHdl.hxx
+++ b/include/xmloff/WordWrapPropertyHdl.hxx
@@ -38,8 +38,8 @@ public:
     XMLWordWrapPropertyHdl( SvXMLImport* pImport );
     virtual ~XMLWordWrapPropertyHdl();
 
-    virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
-    virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
+    virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
+    virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
 #endif // INCLUDED_XMLOFF_WORDWRAPPROPERTYHDL_HXX
diff --git a/include/xmloff/XMLBase64ImportContext.hxx b/include/xmloff/XMLBase64ImportContext.hxx
index ed561138c874..435dead747e2 100644
--- a/include/xmloff/XMLBase64ImportContext.hxx
+++ b/include/xmloff/XMLBase64ImportContext.hxx
@@ -30,8 +30,7 @@ namespace com { namespace sun { namespace star { namespace io {
 
 class XMLOFF_DLLPUBLIC XMLBase64ImportContext : public SvXMLImportContext
 {
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::io::XOutputStream > xOut;
+    css::uno::Reference< css::io::XOutputStream > xOut;
     OUString sBase64CharsLeft;
 
 public:
@@ -39,10 +38,8 @@ public:
 
     XMLBase64ImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                             const OUString& rLName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::io::XOutputStream >& rOut );
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
+        const css::uno::Reference< css::io::XOutputStream >& rOut );
 
     virtual ~XMLBase64ImportContext();
 
diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx
index 4c9627bee03b..415c5730923c 100644
--- a/include/xmloff/XMLCharContext.hxx
+++ b/include/xmloff/XMLCharContext.hxx
@@ -39,14 +39,14 @@ public:
             SvXMLImport& rImport,
             sal_uInt16 nPrfx,
             const OUString& rLName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+            const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
             sal_Unicode c,
             bool bCount );
     XMLCharContext(
             SvXMLImport& rImport,
             sal_uInt16 nPrfx,
             const OUString& rLName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+            const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
             sal_Int16 nControl );
 
     virtual ~XMLCharContext();
diff --git a/include/xmloff/XMLConstantsPropertyHandler.hxx b/include/xmloff/XMLConstantsPropertyHandler.hxx
index 76f422435532..b8a0da555c66 100644
--- a/include/xmloff/XMLConstantsPropertyHandler.hxx
+++ b/include/xmloff/XMLConstantsPropertyHandler.hxx
@@ -48,13 +48,13 @@ public:
     /// Imports the given value in cas of the given XML-data-type
     virtual bool importXML(
             const OUString& rStrImpValue,
-            ::com::sun::star::uno::Any& rValue,
+            css::uno::Any& rValue,
             const SvXMLUnitConverter& rUnitConverter ) const override;
 
     /// Exports the given value in cas of the given XML-data-type
     virtual bool exportXML(
             OUString& rStrExpValue,
-            const ::com::sun::star::uno::Any& rValue,
+            const css::uno::Any& rValue,
             const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
diff --git a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx
index 3609e6780f98..ad0a9a662063 100644
--- a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx
+++ b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx
@@ -26,57 +26,54 @@
 #include <cppuhelper/implbase3.hxx>
 
 class XMLEmbeddedObjectExportFilter : public ::cppu::WeakImplHelper3<
-             ::com::sun::star::xml::sax::XExtendedDocumentHandler,
-             ::com::sun::star::lang::XServiceInfo,
-             ::com::sun::star::lang::XInitialization>
+             css::xml::sax::XExtendedDocumentHandler,
+             css::lang::XServiceInfo,
+             css::lang::XInitialization>
 {
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XDocumentHandler > xHandler;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XExtendedDocumentHandler > xExtHandler;
+    css::uno::Reference< css::xml::sax::XDocumentHandler >         xHandler;
+    css::uno::Reference< css::xml::sax::XExtendedDocumentHandler > xExtHandler;
 
 public:
-    XMLEmbeddedObjectExportFilter( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XDocumentHandler > & rHandler ) throw();
+    XMLEmbeddedObjectExportFilter( const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler ) throw();
     virtual ~XMLEmbeddedObjectExportFilter () throw();
 
-    // ::com::sun::star::xml::sax::XDocumentHandler
+    // css::xml::sax::XDocumentHandler
     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;
     virtual void SAL_CALL startElement(const OUString& aName,
-                              const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs)
-        throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+                              const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs)
+        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL endElement(const OUString& aName)
-        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 characters(const OUString& aChars)
-        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 ignorableWhitespace(const OUString& aWhitespaces)
-        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 processingInstruction(const OUString& aTarget,
                                        const OUString& aData)
-        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;
+        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;
 
-    // ::com::sun::star::xml::sax::XExtendedDocumentHandler
-    virtual void SAL_CALL startCDATA() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL endCDATA() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    // css::xml::sax::XExtendedDocumentHandler
+    virtual void SAL_CALL startCDATA() throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL endCDATA() throw( css::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL comment(const OUString& sComment)
-        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 allowLineBreak()
-        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 unknown(const OUString& sString)
-        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;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
 
 };
 
diff --git a/include/xmloff/XMLEventExport.hxx b/include/xmloff/XMLEventExport.hxx
index a65aa5d60a87..58740e0752b7 100644
--- a/include/xmloff/XMLEventExport.hxx
+++ b/include/xmloff/XMLEventExport.hxx
@@ -84,30 +84,25 @@ public:
     void AddTranslationTable( const XMLEventNameTranslation* pTransTable );
 
     /// export the events (calls EventExport::Export(Reference<XNameAcess>) )
-    void Export( ::com::sun::star::uno::Reference<
-                     ::com::sun::star::document::XEventsSupplier> & xAccess,
+    void Export( css::uno::Reference<css::document::XEventsSupplier> & xAccess,
                 bool bUseWhitespace = true);
 
     /// export the events (calls EventExport::Export(Reference<XNameAcess>) )
-    void Export( ::com::sun::star::uno::Reference<
-                     ::com::sun::star::container::XNameReplace> & xAccess,
+    void Export( css::uno::Reference<css::container::XNameReplace> & xAccess,
                 bool bUseWhitespace = true);
 
     /// export the events (writes <office:events> element)
-    void Export( ::com::sun::star::uno::Reference<
-                     ::com::sun::star::container::XNameAccess> & xAccess,
+    void Export( css::uno::Reference<css::container::XNameAccess> & xAccess,
                 bool bUseWhitespace = true);
 
     /// export the events, but write <officeooo:events> element
     /// (for new file format additions)
-    void ExportExt( ::com::sun::star::uno::Reference<
-                     ::com::sun::star::container::XNameAccess> & xAccess,
+    void ExportExt( css::uno::Reference<css::container::XNameAccess> & xAccess,
                 bool bUseWhitespace = true);
 
     /// export a single event (writes <office:events> element)
     void ExportSingleEvent(
-        ::com::sun::star::uno::Sequence<
-            ::com::sun::star::beans::PropertyValue>& rEventValues,
+        css::uno::Sequence<css::beans::PropertyValue>& rEventValues,
         const OUString& rApiEventName,
         bool bUseWhitespace = true );
 
@@ -115,8 +110,7 @@ private:
 
     /// export one event (start container-element if necessary)
     SAL_DLLPRIVATE void ExportEvent(
-        ::com::sun::star::uno::Sequence<
-            ::com::sun::star::beans::PropertyValue>& rEventValues,
+        css::uno::Sequence<css::beans::PropertyValue>& rEventValues,
         const XMLEventName& rXmlEventName,
         bool bUseWhitespace,
         bool& rExported);
diff --git a/include/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx
index a30b8e816b05..2e8b1fbc0534 100644
--- a/include/xmloff/XMLEventsImportContext.hxx
+++ b/include/xmloff/XMLEventsImportContext.hxx
@@ -39,8 +39,7 @@ namespace com { namespace sun { namespace star {
 
 typedef ::std::pair<
             OUString,
-            ::com::sun::star::uno::Sequence<
-                ::com::sun::star::beans::PropertyValue> > EventNameValuesPair;
+            css::uno::Sequence<css::beans::PropertyValue> > EventNameValuesPair;
 
 typedef ::std::vector< EventNameValuesPair > EventsVector;
 
@@ -56,8 +55,7 @@ class XMLOFF_DLLPUBLIC XMLEventsImportContext : public SvXMLImportContext
 {
 protected:
     // the event XNameReplace; may be empty
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::container::XNameReplace> xEvents;
+    css::uno::Reference<css::container::XNameReplace> xEvents;
 
     // if no XNameReplace is given, use this vector to collect events
     EventsVector aCollectEvents;
@@ -75,55 +73,47 @@ public:
         SvXMLImport& rImport,
         sal_uInt16 nPrfx,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::document::XEventsSupplier> & xEventsSupplier);
+        const css::uno::Reference<css::document::XEventsSupplier> & xEventsSupplier);
 
     XMLEventsImportContext(
         SvXMLImport& rImport,
         sal_uInt16 nPrfx,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::container::XNameReplace> & xNameRepl);
+        const css::uno::Reference<css::container::XNameReplace> & xNameRepl);
 
     virtual ~XMLEventsImportContext();
 
     void AddEventValues(
         const OUString& rEventName,
-        const ::com::sun::star::uno::Sequence<
-            ::com::sun::star::beans::PropertyValue> & rValues);
+        const css::uno::Sequence<css::beans::PropertyValue> & rValues);
 
     /// if the import operates in delayed mode, you can use this method
     /// to set all events that have been read on the XEventsSupplier
     void SetEvents(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::document::XEventsSupplier> & xEventsSupplier);
+        const css::uno::Reference<css::document::XEventsSupplier> & xEventsSupplier);
 
     /// if the import operates in delayed mode, you can use this method
     /// to set all events that have been read on the XNameReplace
     void SetEvents(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::container::XNameReplace> & xNameRepl);
+        const css::uno::Reference<css::container::XNameReplace> & xNameRepl);
 
     /// if the import operates indelayed mode, you can use this method
     /// to obtain the value sequence for a specific event
     bool GetEventSequence(
         const OUString& rName,
-        ::com::sun::star::uno::Sequence<
-        ::com::sun::star::beans::PropertyValue> & rSequence );
+        css::uno::Sequence<css::beans::PropertyValue> & rSequence );
 
 protected:
 
     virtual void StartElement(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override;
 
     virtual void EndElement() override;
 
     virtual SvXMLImportContext *CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override;
 };
 
 #endif
diff --git a/include/xmloff/XMLFontStylesContext.hxx b/include/xmloff/XMLFontStylesContext.hxx
index a2de6a8fed7f..62755475553e 100644
--- a/include/xmloff/XMLFontStylesContext.hxx
+++ b/include/xmloff/XMLFontStylesContext.hxx
@@ -48,8 +48,7 @@ protected:
 
     virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
 
 public:
 
@@ -57,8 +56,7 @@ public:
 
     XMLFontStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+            const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
             rtl_TextEncoding eDfltEnc );
     virtual ~XMLFontStylesContext();
 
diff --git a/include/xmloff/XMLGraphicsDefaultStyle.hxx b/include/xmloff/XMLGraphicsDefaultStyle.hxx
index f8a19d267471..b1a6d806e806 100644
--- a/include/xmloff/XMLGraphicsDefaultStyle.hxx
+++ b/include/xmloff/XMLGraphicsDefaultStyle.hxx
@@ -36,16 +36,15 @@ public:
 
     XMLGraphicsDefaultStyle( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
-            SvXMLStylesContext& rStyles);
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
+        SvXMLStylesContext& rStyles);
 
     virtual ~XMLGraphicsDefaultStyle();
 
     virtual SvXMLImportContext *CreateChildContext(
             sal_uInt16 nPrefix,
             const OUString& rLocalName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+            const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
 
     // This method is called for every default style
     virtual void SetDefaults() override;
diff --git a/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx
index f2ec924bcfa5..d52f1bf50ec4 100644
--- a/include/xmloff/XMLPageExport.hxx
+++ b/include/xmloff/XMLPageExport.hxx
@@ -58,8 +58,7 @@ class XMLOFF_DLLPUBLIC XMLPageExport : public salhelper::SimpleReferenceObject
     const OUString sIsPhysical;
     const OUString sFollowStyle;
 
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::container::XNameAccess > xPageStyles;
+    css::uno::Reference< css::container::XNameAccess > xPageStyles;
 
     ::std::vector< XMLPageExportNameEntry > aNameVector;
     SAL_DLLPRIVATE bool findPageMasterName( const OUString& rStyleName, OUString& rPMName ) const;
@@ -73,18 +72,15 @@ protected:
     SvXMLExport& GetExport() { return rExport; }
 
     void collectPageMasterAutoStyle(
-                const ::com::sun::star::uno::Reference <
-                    ::com::sun::star::beans::XPropertySet > & rPropSet,
+                const css::uno::Reference< css::beans::XPropertySet > & rPropSet,
                 OUString& rPageMasterName );
 
     virtual void exportMasterPageContent(
-                const ::com::sun::star::uno::Reference <
-                    ::com::sun::star::beans::XPropertySet > & rPropSet,
+                const css::uno::Reference< css::beans::XPropertySet > & rPropSet,
                  bool bAutoStyles );
 
     bool exportStyle(
-                const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::style::XStyle >& rStyle,
+                const css::uno::Reference< css::style::XStyle >& rStyle,
                 bool bAutoStyles );
 
     void exportStyles( bool bUsed, bool bAutoStyles );
diff --git a/include/xmloff/XMLSettingsExportContext.hxx b/include/xmloff/XMLSettingsExportContext.hxx
index b79104a29dff..346553a0a057 100644
--- a/include/xmloff/XMLSettingsExportContext.hxx
+++ b/include/xmloff/XMLSettingsExportContext.hxx
@@ -46,7 +46,7 @@ namespace xmloff
 
         virtual void    Characters( const OUString& i_rCharacters ) = 0;
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
+        virtual css::uno::Reference< css::uno::XComponentContext >
                         GetComponentContext() const = 0;
 
     protected:
diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx
index 3f0728869378..0047d99e0b48 100644
--- a/include/xmloff/XMLShapeStyleContext.hxx
+++ b/include/xmloff/XMLShapeStyleContext.hxx
@@ -48,7 +48,7 @@ public:
         SvXMLImport& rImport,
         sal_uInt16 nPrfx,
         const OUString& rLName,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList,
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
         SvXMLStylesContext& rStyles,
         sal_uInt16 nFamily = XML_STYLE_FAMILY_SD_GRAPHICS_ID);
     virtual ~XMLShapeStyleContext();
@@ -56,13 +56,12 @@ public:
     SvXMLImportContext * CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
 
     virtual void Finish( bool bOverwrite ) override;
 
     virtual void FillPropertySet(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet > & rPropSet ) override;
+            const css::uno::Reference< css::beans::XPropertySet > & rPropSet ) override;
 };
 
 #endif // INCLUDED_XMLOFF_XMLSHAPESTYLECONTEXT_HXX
diff --git a/include/xmloff/XMLTextListAutoStylePool.hxx b/include/xmloff/XMLTextListAutoStylePool.hxx
index 87eee3238241..cb0b90c0c0fc 100644
--- a/include/xmloff/XMLTextListAutoStylePool.hxx
+++ b/include/xmloff/XMLTextListAutoStylePool.hxx
@@ -48,7 +48,7 @@ class XMLOFF_DLLPUBLIC XMLTextListAutoStylePool
 
     /** this is an optional NumRule compare component for applications where
         the NumRules don't have names */
-    ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > mxNumRuleCompare;
+    css::uno::Reference< css::ucb::XAnyCompare > mxNumRuleCompare;
 
     SAL_DLLPRIVATE sal_uInt32 Find( XMLTextListAutoStylePoolEntry_Impl* pEntry )
         const;
@@ -60,12 +60,10 @@ public:
     void RegisterName( const OUString& rName );
 
     OUString Add(
-            const ::com::sun::star::uno::Reference <
-                ::com::sun::star::container::XIndexReplace > & rNumRules );
+            const css::uno::Reference< css::container::XIndexReplace > & rNumRules );
 
     OUString Find(
-            const ::com::sun::star::uno::Reference <
-                ::com::sun::star::container::XIndexReplace > & rNumRules ) const;
+            const css::uno::Reference< css::container::XIndexReplace > & rNumRules ) const;
     OUString Find( const OUString& rInternalName ) const;
 
     void exportXML() const;
diff --git a/include/xmloff/XMLTextMasterPageContext.hxx b/include/xmloff/XMLTextMasterPageContext.hxx
index 5680238b652a..1a8e2c94530e 100644
--- a/include/xmloff/XMLTextMasterPageContext.hxx
+++ b/include/xmloff/XMLTextMasterPageContext.hxx
@@ -36,7 +36,7 @@ class XMLOFF_DLLPUBLIC XMLTextMasterPageContext : public SvXMLStyleContext
     OUString       sFollow;
     OUString       sPageMasterName;
 
-    ::com::sun::star::uno::Reference < ::com::sun::star::style::XStyle > xStyle;
+    css::uno::Reference < css::style::XStyle > xStyle;
 
     bool bInsertHeader;
     bool bInsertFooter;
@@ -51,31 +51,28 @@ class XMLOFF_DLLPUBLIC XMLTextMasterPageContext : public SvXMLStyleContext
     bool bHeaderFirstInserted;
     bool bFooterFirstInserted;
 
-    SAL_DLLPRIVATE ::com::sun::star::uno::Reference <
-        ::com::sun::star::style::XStyle > Create();
+    SAL_DLLPRIVATE css::uno::Reference< css::style::XStyle > Create();
 protected:
-    ::com::sun::star::uno::Reference <
-        ::com::sun::star::style::XStyle > GetStyle() { return xStyle; }
+    css::uno::Reference< css::style::XStyle > GetStyle() { return xStyle; }
 public:
 
     TYPEINFO_OVERRIDE();
 
     XMLTextMasterPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+            const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
             bool bOverwrite );
     virtual ~XMLTextMasterPageContext();
 
     virtual SvXMLImportContext *CreateChildContext(
             sal_uInt16 nPrefix,
             const OUString& rLocalName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+            const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
 
     virtual SvXMLImportContext *CreateHeaderFooterContext(
             sal_uInt16 nPrefix,
             const OUString& rLocalName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+            const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
             const bool bFooter,
             const bool bLeft,
             const bool bFirst );
diff --git a/include/xmloff/XMLTextMasterPageExport.hxx b/include/xmloff/XMLTextMasterPageExport.hxx
index 6ca0eee0eff0..77b06468b568 100644
--- a/include/xmloff/XMLTextMasterPageExport.hxx
+++ b/include/xmloff/XMLTextMasterPageExport.hxx
@@ -49,13 +49,11 @@ class XMLOFF_DLLPUBLIC XMLTextMasterPageExport : public XMLPageExport
 protected:
 
     virtual void exportHeaderFooterContent(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::text::XText >& rText,
+            const css::uno::Reference< css::text::XText >& rText,
             bool bAutoStyles, bool bExportParagraph = true );
 
     virtual void exportMasterPageContent(
-                const ::com::sun::star::uno::Reference <
-                    ::com::sun::star::beans::XPropertySet > & rPropSet,
+                const css::uno::Reference< css::beans::XPropertySet > & rPropSet,
                  bool bAutoStyles ) override;
 
 public:
diff --git a/include/xmloff/XMLTextMasterStylesContext.hxx b/include/xmloff/XMLTextMasterStylesContext.hxx
index dad9700dc432..a922bf91baab 100644
--- a/include/xmloff/XMLTextMasterStylesContext.hxx
+++ b/include/xmloff/XMLTextMasterStylesContext.hxx
@@ -29,13 +29,12 @@ class XMLOFF_DLLPUBLIC XMLTextMasterStylesContext : public SvXMLStylesContext
 protected:
     virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
 
     virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily,
-        sal_uInt16 nPrefix, const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+        sal_uInt16 nPrefix,
+        const OUString& rLocalName,
+        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
 
     virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const override;
 
@@ -44,8 +43,7 @@ public:
 
     XMLTextMasterStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList > & xAttrList);
+        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList);
 
     virtual ~XMLTextMasterStylesContext();
 };
diff --git a/include/xmloff/XMLTextShapeImportHelper.hxx b/include/xmloff/XMLTextShapeImportHelper.hxx
index a6754ab26b28..7480da16b1c8 100644
--- a/include/xmloff/XMLTextShapeImportHelper.hxx
+++ b/include/xmloff/XMLTextShapeImportHelper.hxx
@@ -38,12 +38,9 @@ public:
     virtual ~XMLTextShapeImportHelper();
 
     virtual void addShape(
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::drawing::XShape >& rShape,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::drawing::XShapes >& rShapes ) override;
+        css::uno::Reference< css::drawing::XShape >& rShape,
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
+        css::uno::Reference< css::drawing::XShapes >& rShapes ) override;
 };
 
 #endif
diff --git a/include/xmloff/XMLTextShapeStyleContext.hxx b/include/xmloff/XMLTextShapeStyleContext.hxx
index 61a13bc56f5c..e140c1ff5be4 100644
--- a/include/xmloff/XMLTextShapeStyleContext.hxx
+++ b/include/xmloff/XMLTextShapeStyleContext.hxx
@@ -43,8 +43,7 @@ public:
 
     XMLTextShapeStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+            const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
             SvXMLStylesContext& rStyles, sal_uInt16 nFamily,
             bool bDefaultStyle = false );
     virtual ~XMLTextShapeStyleContext();
@@ -52,7 +51,7 @@ public:
     virtual SvXMLImportContext *CreateChildContext(
             sal_uInt16 nPrefix,
             const OUString& rLocalName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+            const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
 
     virtual void CreateAndInsert( bool bOverwrite ) override;
 
diff --git a/include/xmloff/animationexport.hxx b/include/xmloff/animationexport.hxx
index f6641447563b..4142910edfb2 100644
--- a/include/xmloff/animationexport.hxx
+++ b/include/xmloff/animationexport.hxx
@@ -39,11 +39,11 @@ class XMLOFF_DLLPUBLIC AnimationsExporter : public salhelper::SimpleReferenceObj
     AnimationsExporterImpl*	mpImpl;
 
 public:
-    AnimationsExporter( SvXMLExport& rExport, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPageProps  );
+    AnimationsExporter( SvXMLExport& rExport, const css::uno::Reference< css::beans::XPropertySet >& xPageProps  );
     virtual ~AnimationsExporter();
 
-    void prepare( ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > xRootNode );
-    void exportAnimations( ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > xRootNode );
+    void prepare( css::uno::Reference< css::animations::XAnimationNode > xRootNode );
+    void exportAnimations( css::uno::Reference< css::animations::XAnimationNode > xRootNode );
 };
 
 }
diff --git a/include/xmloff/animexp.hxx b/include/xmloff/animexp.hxx
index b5a575c05d2e..3b44a18370fe 100644
--- a/include/xmloff/animexp.hxx
+++ b/include/xmloff/animexp.hxx
@@ -35,8 +35,8 @@ public:
     XMLAnimationsExporter( XMLShapeExport* pShapeExp );
     virtual ~XMLAnimationsExporter();
 
-    void prepare( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, SvXMLExport& rExport );
-    void collect( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, SvXMLExport& rExport );
+    void prepare( css::uno::Reference< css::drawing::XShape > xShape, SvXMLExport& rExport );
+    void collect( css::uno::Reference< css::drawing::XShape > xShape, SvXMLExport& rExport );
     void exportAnimations( SvXMLExport& rExport );
 };
 
diff --git a/include/xmloff/attrlist.hxx b/include/xmloff/attrlist.hxx
index 1daea8d313e5..6eca0ce7af17 100644
--- a/include/xmloff/attrlist.hxx
+++ b/include/xmloff/attrlist.hxx
@@ -36,41 +36,41 @@
 struct SvXMLAttributeList_Impl;
 
 class XMLOFF_DLLPUBLIC SvXMLAttributeList : public ::cppu::WeakImplHelper3<
-        ::com::sun::star::xml::sax::XAttributeList,
-        ::com::sun::star::util::XCloneable,
-        ::com::sun::star::lang::XUnoTunnel>
+        css::xml::sax::XAttributeList,
+        css::util::XCloneable,
+        css::lang::XUnoTunnel>
 {
     SvXMLAttributeList_Impl *m_pImpl;
 
 public:
     SvXMLAttributeList();
     SvXMLAttributeList( const SvXMLAttributeList& );
-    SvXMLAttributeList( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & rAttrList );
+    SvXMLAttributeList( const css::uno::Reference<
+        css::xml::sax::XAttributeList> & rAttrList );
     virtual ~SvXMLAttributeList();
 
-    static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
-    static SvXMLAttributeList* getImplementation( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ) throw();
+    static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
+    static SvXMLAttributeList* getImplementation( css::uno::Reference< css::uno::XInterface > ) throw();
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
 
-    // ::com::sun::star::xml::sax::XAttributeList
-    virtual sal_Int16 SAL_CALL getLength() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getValueByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    // css::xml::sax::XAttributeList
+    virtual sal_Int16 SAL_CALL getLength() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getValueByName(const OUString& aName) throw( css::uno::RuntimeException, std::exception ) override;
 
-    // ::com::sun::star::util::XCloneable
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()   throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    // css::util::XCloneable
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()   throw( css::uno::RuntimeException, std::exception ) override;
 
     // methods that are not contained in any interface
     void AddAttribute( const OUString &sName , const OUString &sValue );
     void Clear();
     void RemoveAttribute( const OUString& sName );
-    void AppendAttributeList( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & );
+    void AppendAttributeList( const css::uno::Reference< css::xml::sax::XAttributeList > & );
     void SetValueByIndex( sal_Int16 i, const OUString& rValue );
     void RemoveAttributeByIndex( sal_Int16 i );
     void RenameAttributeByIndex( sal_Int16 i, const OUString& rNewName );
diff --git a/include/xmloff/controlpropertyhdl.hxx b/include/xmloff/controlpropertyhdl.hxx
index 41fdec36a82e..685f4078e411 100644
--- a/include/xmloff/controlpropertyhdl.hxx
+++ b/include/xmloff/controlpropertyhdl.hxx
@@ -46,8 +46,8 @@ namespace xmloff
     public:
         ORotationAngleHandler();
 
-        virtual bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
-        virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
+        virtual bool importXML( const OUString& _rStrImpValue, css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
+        virtual bool exportXML( OUString& _rStrExpValue, const css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
     };
 
 
@@ -58,8 +58,8 @@ namespace xmloff
     public:
         OFontWidthHandler();
 
-        virtual bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
-        virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
+        virtual bool importXML( const OUString& _rStrImpValue, css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
+        virtual bool exportXML( OUString& _rStrExpValue, const css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
     };
 
 
@@ -76,8 +76,8 @@ namespace xmloff
 
         OControlBorderHandler( const BorderFacet _eFacet );
 
-        virtual bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
-        virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
+        virtual bool importXML( const OUString& _rStrImpValue, css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
+        virtual bool exportXML( OUString& _rStrExpValue, const css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
 
     private:
         BorderFacet m_eFacet;
@@ -91,8 +91,8 @@ namespace xmloff
     public:
         OControlTextEmphasisHandler();
 
-        virtual bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
-        virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
+        virtual bool importXML( const OUString& _rStrImpValue, css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
+        virtual bool exportXML( OUString& _rStrExpValue, const css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
     };
 
 
diff --git a/include/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx
index 05c0a69792fb..1aeb85b70494 100644
--- a/include/xmloff/formlayerexport.hxx
+++ b/include/xmloff/formlayerexport.hxx
@@ -75,7 +75,7 @@ namespace xmloff
             @see examineForms
         */
         bool seekPage(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage);
+            const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage);
 
         /** get the id for the given control
 
@@ -89,7 +89,7 @@ namespace xmloff
 
         */
         OUString getControlId(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl);
+            const css::uno::Reference< css::beans::XPropertySet >& _rxControl);
 
         /** retrieves the style name for the control's number style.
 
@@ -103,7 +103,7 @@ namespace xmloff
             @see seekPage
         */
         OUString getControlNumberStyle(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl );
+            const css::uno::Reference< css::beans::XPropertySet >& _rxControl );
 
         /** examines the forms collection given.
 
@@ -113,7 +113,7 @@ namespace xmloff
                 the draw page to examine. The object will be queried for a com.sun.star.form::XFormsSupplier
                 interface to obtain the forms container.
         */
-        void examineForms(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage);
+        void examineForms(const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage);
 
         /** exports the structure of a form layer
 
@@ -134,7 +134,7 @@ namespace xmloff
                 the draw page to examine. The object will be queried for a com.sun.star.form::XFormsSupplier
                 interface to obtain the forms container.
         */
-        void exportForms(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage);
+        void exportForms(const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage);
 
         /** exports the XForms model data
         */
@@ -142,7 +142,7 @@ namespace xmloff
 
         /** determines whether the given page contains logical forms
         */
-        static bool pageContainsForms( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage );
+        static bool pageContainsForms( const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage );
 
         /** determines whether the given page contains XForm instances
         */
@@ -163,7 +163,7 @@ namespace xmloff
             to the form layer exporter.<br/>
             Of course you have to do this before calling <member>exportForms</member></p>
         */
-        void excludeFromExport( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxControl );
+        void excludeFromExport( const css::uno::Reference< css::awt::XControlModel >& _rxControl );
     };
 
 
diff --git a/include/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx
index dcb35932488a..344bd4fc39b9 100644
--- a/include/xmloff/formlayerimport.hxx
+++ b/include/xmloff/formlayerimport.hxx
@@ -61,7 +61,7 @@ namespace xmloff
             @see endPage
         */
         void startPage(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage);
+            const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage);
 
         /** creates an import context for the office:forms element
         */
@@ -81,7 +81,7 @@ namespace xmloff
         SvXMLImportContext* createContext(
             const sal_uInt16 _nPrefix,
             const OUString& _rLocalName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttribs);
+            const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttribs);
 
         /** lookup a control given by id.
 
@@ -91,7 +91,7 @@ namespace xmloff
 
             @see startPage
         */
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
+        css::uno::Reference< css::beans::XPropertySet >
                 lookupControl(const OUString& _rId);
 
         /** end importing the forms of the current page
@@ -114,7 +114,7 @@ namespace xmloff
                 the style name for the control's number style
         */
         void applyControlNumberStyle(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel,
+            const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel,
             const OUString& _rControlNumerStyleName
         );
 
diff --git a/include/xmloff/maptype.hxx b/include/xmloff/maptype.hxx
index a942b1cc3bfc..212b771ecfe2 100644
--- a/include/xmloff/maptype.hxx
+++ b/include/xmloff/maptype.hxx
@@ -106,11 +106,11 @@ struct XMLPropertyMapEntry
 struct XMLPropertyState
 {
     sal_Int32                  mnIndex;
-    ::com::sun::star::uno::Any maValue;
+    css::uno::Any              maValue;
 
     XMLPropertyState( sal_Int32 nIndex )
         : mnIndex( nIndex ) {}
-    XMLPropertyState( sal_Int32 nIndex, const ::com::sun::star::uno::Any& rValue )
+    XMLPropertyState( sal_Int32 nIndex, const css::uno::Any& rValue )
         : mnIndex( nIndex ), maValue( rValue ) {}
     XMLPropertyState( const XMLPropertyState& rPropState )
         : mnIndex( rPropState.mnIndex ), maValue( rPropState.maValue ) {}
diff --git a/include/xmloff/numehelp.hxx b/include/xmloff/numehelp.hxx
index 81477e903707..8d5aeca272a6 100644
--- a/include/xmloff/numehelp.hxx
+++ b/include/xmloff/numehelp.hxx
@@ -65,7 +65,7 @@ typedef std::set<XMLNumberFormat, LessNumberFormat> XMLNumberFormatSet;
 
 class XMLOFF_DLLPUBLIC XMLNumberFormatAttributesExportHelper
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > xNumberFormats;
+    css::uno::Reference< css::util::XNumberFormats > xNumberFormats;
     SvXMLExport*        pExport;
     const OUString sStandardFormat;
     const OUString sType;
@@ -79,8 +79,8 @@ class XMLOFF_DLLPUBLIC XMLNumberFormatAttributesExportHelper
     const OUString msCurrencyAbbreviation;
     XMLNumberFormatSet  aNumberFormats;
 public:
-    XMLNumberFormatAttributesExportHelper(::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier);
-    XMLNumberFormatAttributesExportHelper(::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier,
+    XMLNumberFormatAttributesExportHelper(css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier);
+    XMLNumberFormatAttributesExportHelper(css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier,
                                             SvXMLExport& rExport );
     ~XMLNumberFormatAttributesExportHelper();
 
@@ -91,9 +91,9 @@ public:
                                 const OUString& rCurrencySymbol,
                                 bool bExportValue = true);
     static bool GetCurrencySymbol(const sal_Int32 nNumberFormat, OUString& rCurrencySymbol,
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xNumberFormatsSupplier);
+        css::uno::Reference< css::util::XNumberFormatsSupplier > & xNumberFormatsSupplier);
     static sal_Int16 GetCellType(const sal_Int32 nNumberFormat, bool& bIsStandard,
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xNumberFormatsSupplier);
+        css::uno::Reference< css::util::XNumberFormatsSupplier > & xNumberFormatsSupplier);
     static void SetNumberFormatAttributes(SvXMLExport& rXMLExport,
                                           const sal_Int32 nNumberFormat,
                                           const double& rValue,
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index 06bf3ed09480..f0c36af90a3c 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -44,9 +44,9 @@ class XMLOFF_DLLPUBLIC XMLPropStyleContext : public SvXMLStyleContext
 private:
     const OUString msIsPhysical;
     const OUString msFollowStyle;
-    ::std::vector< XMLPropertyState > maProperties;
-    ::com::sun::star::uno::Reference < ::com::sun::star::style::XStyle > mxStyle;
-    SvXMLImportContextRef               mxStyles;
+    ::std::vector< XMLPropertyState >          maProperties;
+    css::uno::Reference < css::style::XStyle > mxStyle;
+    SvXMLImportContextRef                      mxStyles;
 
     //UUUU
     static OldFillStyleDefinitionSet maStandardSet;
@@ -92,8 +92,7 @@ protected:
     // Override this method to create a new style. It's called by
     // CreateInsert to create a style if a style with the requested family and
     // name couldn't be found.
-    virtual ::com::sun::star::uno::Reference <
-        ::com::sun::star::style::XStyle > Create();
+    virtual css::uno::Reference< css::style::XStyle > Create();
 
 public:
 
@@ -101,7 +100,7 @@ public:
 
     XMLPropStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+            const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
             SvXMLStylesContext& rStyles, sal_uInt16 nFamily = 0,
             bool bDefaultStyle=false );
     virtual ~XMLPropStyleContext();
@@ -109,21 +108,18 @@ public:
     virtual SvXMLImportContext *CreateChildContext(
             sal_uInt16 nPrefix,
             const OUString& rLocalName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+            const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
 
     virtual void FillPropertySet(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet > & rPropSet );
+            const css::uno::Reference< css::beans::XPropertySet > & rPropSet );
 
     const SvXMLStylesContext *GetStyles() const { return static_cast<const SvXMLStylesContext *>(&mxStyles); }
     const ::std::vector< XMLPropertyState > & GetProperties() const { return maProperties; }
 
-    const ::com::sun::star::uno::Reference <
-                ::com::sun::star::style::XStyle >&
+    const css::uno::Reference< css::style::XStyle >&
                GetStyle() const { return mxStyle; }
     void SetStyle(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::style::XStyle >& xStl) { mxStyle = xStl; }
+            const css::uno::Reference< css::style::XStyle >& xStl) { mxStyle = xStl; }
 
     virtual void SetDefaults() override;
 
diff --git a/include/xmloff/settingsstore.hxx b/include/xmloff/settingsstore.hxx
index 259897b18e65..151d57da8bf7 100644
--- a/include/xmloff/settingsstore.hxx
+++ b/include/xmloff/settingsstore.hxx
@@ -21,16 +21,16 @@
 class DocumentSettingsSerializer {
 public:
   // Import objects and update properties (eliding URLs)
-  virtual com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>
+  virtual css::uno::Sequence<css::beans::PropertyValue>
 	filterStreamsFromStorage(
         OUString const & referer,
-		const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > &xStorage,
-		const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps ) = 0;
+        const css::uno::Reference< css::embed::XStorage > &xStorage,
+        const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps ) = 0;
   // Export objects and update properties with relative URLs into this storage
-  virtual com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>
+  virtual css::uno::Sequence<css::beans::PropertyValue>
 	filterStreamsToStorage(
-		const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > &xStorage,
-		const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps ) = 0;
+        const css::uno::Reference< css::embed::XStorage > &xStorage,
+        const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps ) = 0;
 
 protected:
     ~DocumentSettingsSerializer() {}
diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index a7f62e40d8e4..f754282eaa40 100644
--- a/include/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
@@ -135,7 +135,7 @@ struct ImplXMLShapeExportInfo
     sal_Int32       mnFamily;
     XmlShapeType    meShapeType;
 
-    com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xCustomShapeReplacement;
+    css::uno::Reference< css::drawing::XShape > xCustomShapeReplacement;
 
     ImplXMLShapeExportInfo() : mnFamily( XML_STYLE_FAMILY_SD_GRAPHICS_ID ), meShapeType( XmlShapeTypeNotYetSet ) {}
 };
@@ -144,7 +144,7 @@ struct ImplXMLShapeExportInfo
 typedef std::vector< ImplXMLShapeExportInfo > ImplXMLShapeExportInfoVector;
 
 /** a map to store all cache data for already collected XShapes */
-typedef std::map< com::sun::star::uno::Reference < com::sun::star::drawing::XShapes >, ImplXMLShapeExportInfoVector > ShapesInfos;
+typedef std::map< css::uno::Reference < css::drawing::XShapes >, ImplXMLShapeExportInfoVector > ShapesInfos;
 
 class SvXMLExport;
 class SvXMLExportPropertyMapper;
@@ -207,66 +207,66 @@ private:
 
     OUStringBuffer msBuffer;
 
-    SAL_DLLPRIVATE void ImpCalcShapeType(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType& eShapeType);
+    SAL_DLLPRIVATE void ImpCalcShapeType(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType& eShapeType);
 
-    SAL_DLLPRIVATE void ImpExportNewTrans(const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet, XMLShapeExportFlags nFeatures, com::sun::star::awt::Point* pRefPoint);
-    SAL_DLLPRIVATE void ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix& rMatrix, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet);
-    SAL_DLLPRIVATE void ImpExportNewTrans_DecomposeAndRefPoint(const ::basegfx::B2DHomMatrix& rMat, ::basegfx::B2DTuple& rTRScale, double& fTRShear, double& fTRRotate, ::basegfx::B2DTuple& rTRTranslate, com::sun::star::awt::Point* pRefPoint);
+    SAL_DLLPRIVATE void ImpExportNewTrans(const css::uno::Reference< css::beans::XPropertySet >& xPropSet, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint);
+    SAL_DLLPRIVATE void ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix& rMatrix, const css::uno::Reference< css::beans::XPropertySet >& xPropSet);
+    SAL_DLLPRIVATE void ImpExportNewTrans_DecomposeAndRefPoint(const ::basegfx::B2DHomMatrix& rMat, ::basegfx::B2DTuple& rTRScale, double& fTRShear, double& fTRRotate, ::basegfx::B2DTuple& rTRTranslate, css::awt::Point* pRefPoint);
     SAL_DLLPRIVATE void ImpExportNewTrans_FeaturesAndWrite(::basegfx::B2DTuple& rTRScale, double fTRShear, double fTRRotate, ::basegfx::B2DTuple& rTRTranslate, const XMLShapeExportFlags nFeatures);
-    SAL_DLLPRIVATE bool ImpExportPresentationAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet, const OUString& rClass );
-    SAL_DLLPRIVATE void ImpExportText( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, TextPNS eExtensionNS = TextPNS::ODF );
-    SAL_DLLPRIVATE void ImpExportEvents( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
-    SAL_DLLPRIVATE void ImpExportDescription( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); // #i68101#
-    SAL_DLLPRIVATE void ImpExportGluePoints( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
+    SAL_DLLPRIVATE bool ImpExportPresentationAttributes( const css::uno::Reference< css::beans::XPropertySet >& xPropSet, const OUString& rClass );
+    SAL_DLLPRIVATE void ImpExportText( const css::uno::Reference< css::drawing::XShape >& xShape, TextPNS eExtensionNS = TextPNS::ODF );
+    SAL_DLLPRIVATE void ImpExportEvents( const css::uno::Reference< css::drawing::XShape >& xShape );
+    SAL_DLLPRIVATE void ImpExportDescription( const css::uno::Reference< css::drawing::XShape >& xShape ); // #i68101#
+    SAL_DLLPRIVATE void ImpExportGluePoints( const css::uno::Reference< css::drawing::XShape >& xShape );
 
     // single shape exporters
-    SAL_DLLPRIVATE void ImpExportGroupShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL );
-    SAL_DLLPRIVATE void ImpExport3DSceneShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL );
-    SAL_DLLPRIVATE void ImpExportRectangleShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL );
-    SAL_DLLPRIVATE void ImpExportLineShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL );
-    SAL_DLLPRIVATE void ImpExportEllipseShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL );
-    SAL_DLLPRIVATE void ImpExportPolygonShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL );
-    SAL_DLLPRIVATE void ImpExportTextBoxShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL );
-    SAL_DLLPRIVATE void ImpExportGraphicObjectShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL );
-    SAL_DLLPRIVATE void ImpExportChartShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL, SvXMLAttributeList* pAttrList = NULL );
-    SAL_DLLPRIVATE void ImpExportControlShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT,  com::sun::star::awt::Point* pRefPoint = NULL );
-    SAL_DLLPRIVATE void ImpExportConnectorShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL );
-    SAL_DLLPRIVATE void ImpExportMeasureShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT,  com::sun::star::awt::Point* pRefPoint = NULL );
-    SAL_DLLPRIVATE void ImpExportOLE2Shape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL, SvXMLAttributeList* pAttrList = NULL );
-    SAL_DLLPRIVATE void ImpExportPageShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL );
-    SAL_DLLPRIVATE void ImpExportCaptionShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL );
-    SAL_DLLPRIVATE void ImpExport3DShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL );
-    SAL_DLLPRIVATE void ImpExportFrameShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL );
-    SAL_DLLPRIVATE void ImpExportPluginShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL );
-    SAL_DLLPRIVATE void ImpExportAppletShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL );
-    SAL_DLLPRIVATE void ImpExportCustomShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL );
-    SAL_DLLPRIVATE void ImpExportMediaShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL );
-    SAL_DLLPRIVATE void ImpExportTableShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT,    com::sun::star::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExportGroupShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExport3DSceneShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExportRectangleShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExportLineShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExportEllipseShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExportPolygonShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExportTextBoxShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExportGraphicObjectShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExportChartShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL, SvXMLAttributeList* pAttrList = NULL );
+    SAL_DLLPRIVATE void ImpExportControlShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT,  css::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExportConnectorShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExportMeasureShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT,  css::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExportOLE2Shape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL, SvXMLAttributeList* pAttrList = NULL );
+    SAL_DLLPRIVATE void ImpExportPageShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExportCaptionShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExport3DShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExportFrameShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExportPluginShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExportAppletShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExportCustomShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExportMediaShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL );
+    SAL_DLLPRIVATE void ImpExportTableShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT,    css::awt::Point* pRefPoint = NULL );
 public:
     XMLShapeExport(SvXMLExport& rExp, SvXMLExportPropertyMapper *pExtMapper=0 );
     virtual ~XMLShapeExport();
 
     // This method collects all automatic styles for the given XShape
     void collectShapeAutoStyles(
-        const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape);
+        const css::uno::Reference < css::drawing::XShape >& xShape);
 
     // This method exports the given XShape
     void exportShape(
-        const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape,
+        const css::uno::Reference < css::drawing::XShape >& xShape,
         XMLShapeExportFlags nFeatures = SEF_DEFAULT,
-        com::sun::star::awt::Point* pRefPoint = NULL,
+        css::awt::Point* pRefPoint = NULL,
         SvXMLAttributeList* pAttrList = NULL
         );
 
     // This method collects all automatic styles for the shapes inside the given XShapes collection
     void collectShapesAutoStyles(
-        const com::sun::star::uno::Reference < com::sun::star::drawing::XShapes >& xShapes);
+        const css::uno::Reference < css::drawing::XShapes >& xShapes);
 
     // This method exports all XShape inside the given XShapes collection
     void exportShapes(
-        const com::sun::star::uno::Reference < com::sun::star::drawing::XShapes >& xShapes,
+        const css::uno::Reference < css::drawing::XShapes >& xShapes,
         XMLShapeExportFlags nFeatures = SEF_DEFAULT,
-        com::sun::star::awt::Point* pRefPoint = NULL
+        css::awt::Point* pRefPoint = NULL
         );
 
     /** initializes some internal structures for fast access to the given XShapes collection
@@ -280,7 +280,7 @@ public:
         @see exportShapes
     */
     void seekShapes(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes ) throw();
+        const css::uno::Reference< css::drawing::XShapes >& xShapes ) throw();
 
     void exportAutoStyles();
 
@@ -306,20 +306,20 @@ public:
     void setPresentationStylePrefix( const OUString& rPrefix ) { msPresentationStylePrefix = rPrefix; }
 
     /** helper for chart that adds all attributes of a 3d scene element to the export */
-    void export3DSceneAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet );
+    void export3DSceneAttributes( const css::uno::Reference< css::beans::XPropertySet >& xPropSet );
 
     /** helper for chart that exports all lamps from the propertyset */
-    void export3DLamps( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet );
+    void export3DLamps( const css::uno::Reference< css::beans::XPropertySet >& xPropSet );
 
     /** sj: replacing CustomShapes with standard objects that are also supported in OpenOffice.org format */
-    com::sun::star::uno::Reference < com::sun::star::drawing::XShape > checkForCustomShapeReplacement(
-        const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& );
+    css::uno::Reference < css::drawing::XShape > checkForCustomShapeReplacement(
+        const css::uno::Reference < css::drawing::XShape >& );
 
     /** helper to export the style for graphic defaults */
     void ExportGraphicDefaults();
 
     /** is called before a shape element for the given XShape is exported */
-    virtual void onExport( const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape );
+    virtual void onExport( const css::uno::Reference < css::drawing::XShape >& xShape );
 
     const rtl::Reference< XMLTableExport >&     GetShapeTableExport();
 };
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index ca685da25a6c..b8c34d18fac4 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -189,7 +189,7 @@ public:
         SvXMLImport& rImport,
         sal_uInt16 nPrfx,
         const OUString& rLName,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList);
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList);
     virtual ~SdXML3DLightContext();
 
     sal_Int32 GetDiffuseColor() { return maDiffuseColor; }
@@ -209,14 +209,14 @@ protected:
                                 maList;
 
     // local parameters which need to be read
-    com::sun::star::drawing::HomogenMatrix mxHomMat;
+    css::drawing::HomogenMatrix mxHomMat;
     bool                        mbSetTransform;
 
-    com::sun::star::drawing::ProjectionMode mxPrjMode;
+    css::drawing::ProjectionMode mxPrjMode;
     sal_Int32                   mnDistance;
     sal_Int32                   mnFocalLength;
     sal_Int32                   mnShadowSlant;
-    com::sun::star::drawing::ShadeMode mxShadeMode;
+    css::drawing::ShadeMode     mxShadeMode;
     sal_Int32                   maAmbientColor;
     bool                        mbLightingMode;
 
@@ -232,13 +232,13 @@ public:
     ~SdXML3DSceneAttributesHelper();
 
     /** creates a 3d light context and adds it to the internal list for later processing */
-    SvXMLImportContext * create3DLightContext( sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList);
+    SvXMLImportContext * create3DLightContext( sal_uInt16 nPrfx, const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList);
 
     /** this should be called for each scene attribute */
     void processSceneAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
 
     /** this sets the scene attributes at this propertyset */
-    void setSceneAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet );
+    void setSceneAttributes( const css::uno::Reference< css::beans::XPropertySet >& xPropSet );
 };
 
 
@@ -246,9 +246,9 @@ public:
 class SvXMLShapeContext : public SvXMLImportContext
 {
 protected:
-    com::sun::star::uno::Reference< com::sun::star::drawing::XShape >   mxShape;
-    bool                                                            mbTemporaryShape;
-    OUString                                                       msHyperlink;
+    css::uno::Reference< css::drawing::XShape >   mxShape;
+    bool                                          mbTemporaryShape;
+    OUString                                      msHyperlink;
 
 public:
     SvXMLShapeContext( SvXMLImport& rImp, sal_uInt16 nPrfx,
@@ -256,7 +256,7 @@ public:
 
     TYPEINFO_OVERRIDE();
 
-    const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& getShape() const { return mxShape; }
+    const css::uno::Reference< css::drawing::XShape >& getShape() const { return mxShape; }
 
     void setHyperlink( const OUString& rHyperlink );
 };
@@ -273,7 +273,7 @@ class XMLOFF_DLLPUBLIC XMLShapeImportHelper : public salhelper::SimpleReferenceO
 
     XMLShapeImportPageContextImpl*  mpPageContext;
 
-    com::sun::star::uno::Reference< com::sun::star::frame::XModel > mxModel;
+    css::uno::Reference< css::frame::XModel > mxModel;
 
     // PropertySetMappers and factory
     XMLSdPropHdlFactory*        mpSdPropHdlFactory;
@@ -309,30 +309,30 @@ protected:
 
 public:
     XMLShapeImportHelper( SvXMLImport& rImporter,
-        const com::sun::star::uno::Reference< com::sun::star::frame::XModel>& rModel,
+        const css::uno::Reference< css::frame::XModel>& rModel,
     SvXMLImportPropertyMapper *pExtMapper=0 );
 
     virtual ~XMLShapeImportHelper();
 
     SvXMLShapeContext* CreateGroupChildContext(
         SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList,
-        com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes,
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
+        css::uno::Reference< css::drawing::XShapes >& rShapes,
         bool bTemporaryShape = false);
 
     SvXMLShapeContext* CreateFrameChildContext(
         SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList,
-        com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xFrameAttrList);
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
+        css::uno::Reference< css::drawing::XShapes >& rShapes,
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xFrameAttrList);
     static SvXMLImportContext* CreateFrameChildContext(
         SvXMLImportContext *pThisContext, sal_uInt16 nPrefix, const OUString& rLocalName,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList );
 
     SvXMLShapeContext* Create3DSceneChildContext(
         SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList,
-        com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes);
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
+        css::uno::Reference< css::drawing::XShapes >& rShapes);
 
     const SvXMLTokenMap& GetGroupShapeElemTokenMap();
     const SvXMLTokenMap& GetFrameShapeElemTokenMap();
@@ -356,60 +356,60 @@ public:
     // this function is called whenever the implementation classes like to add this new
     // shape to the given XShapes.
     virtual void addShape(
-        com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList,
-        com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes);
+        css::uno::Reference< css::drawing::XShape >& rShape,
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
+        css::uno::Reference< css::drawing::XShapes >& rShapes);
 
     // this function is called whenever the implementation classes have finished importing
     // a shape to the given XShapes. The shape is already inserted into its XShapes and
     // all properties and styles are set.
     virtual void finishShape(
-        com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList,
-        com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes);
+        css::uno::Reference< css::drawing::XShape >& rShape,
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
+        css::uno::Reference< css::drawing::XShapes >& rShapes);
 
     // helper functions for z-order sorting
-    void pushGroupForSorting( com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes );
+    void pushGroupForSorting( css::uno::Reference< css::drawing::XShapes >& rShapes );
     void popGroupAndSort();
 
-    void shapeWithZIndexAdded( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape,
+    void shapeWithZIndexAdded( css::uno::Reference< css::drawing::XShape >& rShape,
                                sal_Int32 nZIndex );
 
-    void addShapeConnection( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rConnectorShape,
+    void addShapeConnection( css::uno::Reference< css::drawing::XShape >& rConnectorShape,
                              bool bStart,
                              const OUString& rDestShapeId,
                              sal_Int32 nDestGlueId );
 
     /** adds a mapping for a glue point identifier from an xml file to the identifier created after inserting
         the new glue point into the core. The saved mappings can be retrieved by getGluePointId() */
-    void addGluePointMapping( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape,
+    void addGluePointMapping( css::uno::Reference< css::drawing::XShape >& xShape,
                               sal_Int32 nSourceId, sal_Int32 nDestinnationId );
 
     /** find mapping for given DestinationID. This allows to extract the original draw:id imported with a draw:glue-point */
     sal_Int32 findGluePointMapping(
-        const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape,
+        const css::uno::Reference< css::drawing::XShape >& xShape,
         sal_Int32 nDestinnationId ) const;
 
     /** moves all current DestinationId's for rXShape by n */
-    void moveGluePointMapping( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, const sal_Int32 n );
+    void moveGluePointMapping( const css::uno::Reference< css::drawing::XShape >& xShape, const sal_Int32 n );
 
     /** retrieves a mapping for a glue point identifier from the current xml file to the identifier created after
         inserting the new glue point into the core. The mapping must be initialized first with addGluePointMapping() */
-    sal_Int32 getGluePointId( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, sal_Int32 nSourceId );
+    sal_Int32 getGluePointId( const css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nSourceId );
 
     /** this method must be calling before the first shape is imported for the given page.
         Calls to this method can be nested */
-    void startPage( com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes );
+    void startPage( css::uno::Reference< css::drawing::XShapes >& rShapes );
 
     /** this method must be calling after the last shape is imported for the given page
         Calls to this method can be nested */
-    void endPage( com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes );
+    void endPage( css::uno::Reference< css::drawing::XShapes >& rShapes );
 
     void restoreConnections();
 
     /** creates a property mapper for external chaining */
     static SvXMLImportPropertyMapper* CreateShapePropMapper(
-        const com::sun::star::uno::Reference< com::sun::star::frame::XModel>& rModel, SvXMLImport& rImport );
+        const css::uno::Reference< css::frame::XModel>& rModel, SvXMLImport& rImport );
 
     /** defines if the import should increment the progress bar or not */
     void enableHandleProgressBar( bool bEnable = true );
diff --git a/include/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx
index 7d9d6eedb61f..ebab3816aa0f 100644
--- a/include/xmloff/styleexp.hxx
+++ b/include/xmloff/styleexp.hxx
@@ -70,20 +70,17 @@ private:
 protected:
 
     bool exportStyle(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::style::XStyle > & rStyle,
+        const css::uno::Reference< css::style::XStyle > & rStyle,
         const OUString& rXMLFamily,
         const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xStyles,
+        const css::uno::Reference< css::container::XNameAccess > & xStyles,
         const OUString* pPrefix = 0L );
 
     virtual void exportStyleAttributes(
-        const ::com::sun::star::uno::Reference<
-                ::com::sun::star::style::XStyle > & rStyle );
+        const css::uno::Reference< css::style::XStyle > & rStyle );
 
     virtual void exportStyleContent(
-        const ::com::sun::star::uno::Reference<
-                ::com::sun::star::style::XStyle > & rStyle );
+        const css::uno::Reference< css::style::XStyle > & rStyle );
 public:
     XMLStyleExport(
         SvXMLExport& rExp,
@@ -104,8 +101,7 @@ public:
 //      const OUString* pPrefix = 0L);
 
     bool exportDefaultStyle(
-        const ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet > & xPropSet,
+        const css::uno::Reference< css::beans::XPropertySet > & xPropSet,
         const OUString& rXMLFamily,
         const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper );
 
diff --git a/include/xmloff/table/XMLTableExport.hxx b/include/xmloff/table/XMLTableExport.hxx
index 2b354b20abbe..73ad0e32e5dc 100644
--- a/include/xmloff/table/XMLTableExport.hxx
+++ b/include/xmloff/table/XMLTableExport.hxx
@@ -45,7 +45,7 @@
 class SvXMLExport;
 class SvXMLExportPropertyMapper;
 
-typedef std::map< const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >, OUString > TableStyleMap;
+typedef std::map< const css::uno::Reference< css::uno::XInterface >, OUString > TableStyleMap;
 
 struct XMLTableInfo
 {
@@ -62,10 +62,10 @@ public:
     virtual ~XMLTableExport();
 
     // This method collects all automatic styles for the given table
-    void collectTableAutoStyles(const com::sun::star::uno::Reference < com::sun::star::table::XColumnRowRange >& xColumnRowRange);
+    void collectTableAutoStyles(const css::uno::Reference < css::table::XColumnRowRange >& xColumnRowRange);
 
     // This method exports the given table
-    void exportTable(const com::sun::star::uno::Reference < com::sun::star::table::XColumnRowRange >& xColumnRowRange);
+    void exportTable(const css::uno::Reference < css::table::XColumnRowRange >& xColumnRowRange);
 
     // export the styles from the cell style family
     void exportTableStyles();
@@ -89,10 +89,10 @@ protected:
     const SvXMLExport& GetExport() const  { return mrExport; }
 private:
 
-    SAL_DLLPRIVATE void ImpExportText( const com::sun::star::uno::Reference < com::sun::star::table::XCell >& xCell );
+    SAL_DLLPRIVATE void ImpExportText( const css::uno::Reference < css::table::XCell >& xCell );
 
-    void ExportCell( const com::sun::star::uno::Reference < com::sun::star::table::XCell >& xCell, const std::shared_ptr< XMLTableInfo >& pTableInfo, const OUString& sDefaultCellStyle  );
-    void ExportTableColumns( const com::sun::star::uno::Reference < com::sun::star::container::XIndexAccess >& xtableColumns, const std::shared_ptr< XMLTableInfo >& pTableInfo );
+    void ExportCell( const css::uno::Reference < css::table::XCell >& xCell, const std::shared_ptr< XMLTableInfo >& pTableInfo, const OUString& sDefaultCellStyle  );
+    void ExportTableColumns( const css::uno::Reference < css::container::XIndexAccess >& xtableColumns, const std::shared_ptr< XMLTableInfo >& pTableInfo );
 
 };
 
diff --git a/include/xmloff/table/XMLTableImport.hxx b/include/xmloff/table/XMLTableImport.hxx
index 8e6bb2659627..81052c7c58c7 100644
--- a/include/xmloff/table/XMLTableImport.hxx
+++ b/include/xmloff/table/XMLTableImport.hxx
@@ -47,9 +47,9 @@ public:
     virtual ~XMLTableImport();
 
     SvXMLImportContext* CreateTableContext( sal_uInt16 nPrfx, const OUString& rLName,
-                                            ::com::sun::star::uno::Reference< ::com::sun::star::table::XColumnRowRange >& xColumnRowRange );
+                                            css::uno::Reference< css::table::XColumnRowRange >& xColumnRowRange );
 
-    SvXMLStyleContext* CreateTableTemplateContext( sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
+    SvXMLStyleContext* CreateTableTemplateContext( sal_uInt16 nPrfx, const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList );
 
     rtl::Reference< SvXMLImportPropertyMapper > GetCellImportPropertySetMapper() const { return mxCellImportPropertySetMapper; }
     rtl::Reference< SvXMLImportPropertyMapper > GetRowImportPropertySetMapper() const { return mxRowImportPropertySetMapper; }
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index d507e508f926..dd3afd774505 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -382,8 +382,7 @@ protected:
     virtual SvXMLImportContext *CreateTableChildContext(
                 SvXMLImport& rImport,
                 sal_uInt16 nPrefix, const OUString& rLocalName,
-                const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+                const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
 
     // access, lazy initialization and destruction of backpatchers
     // Code is implemented in XMLPropertyBackpatcher.cxx
@@ -394,8 +393,7 @@ protected:
 public:
 
     XMLTextImportHelper(
-            ::com::sun::star::uno::Reference <
-                ::com::sun::star::frame::XModel> const& rModel,
+            css::uno::Reference< css::frame::XModel > const& rModel,
             SvXMLImport& rImport,
             bool const bInsertMode = false, bool const bStylesOnlyMode = false,
             bool const bProgress = false, bool const bBlockMode = false,
@@ -404,8 +402,7 @@ public:
     virtual ~XMLTextImportHelper();
 
     void SetCursor(
-            const ::com::sun::star::uno::Reference <
-                ::com::sun::star::text::XTextCursor >& rCursor );
+            const css::uno::Reference< css::text::XTextCursor >& rCursor );
     void ResetCursor();
 
     void SetAutoStyles( SvXMLStylesContext *pStyles );
@@ -413,8 +410,7 @@ public:
     SvXMLImportContext *CreateTextChildContext(
             SvXMLImport& rImport,
             sal_uInt16 nPrefix, const OUString& rLocalName,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+            const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
             XMLTextType eType = XML_TEXT_TYPE_SHAPE );
 
     SvXMLTokenMap const& GetTextElemTokenMap();
@@ -430,12 +426,9 @@ public:
     const SvXMLTokenMap& GetTextListBlockElemTokenMap();
     const SvXMLTokenMap& GetTextFieldAttrTokenMap(); // impl: txtfldi.cxx
 
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::text::XText > & GetText();
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::text::XTextCursor > & GetCursor();
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::text::XTextRange > & GetCursorAsRange();
+    css::uno::Reference< css::text::XText > & GetText();
+    css::uno::Reference< css::text::XTextCursor > & GetCursor();
+    css::uno::Reference< css::text::XTextRange > & GetCursorAsRange();
 
     bool IsInsertMode() const;
     bool IsStylesOnlyMode() const;
@@ -457,15 +450,13 @@ public:
     void DeleteParagraph();
 
     void InsertControlCharacter( sal_Int16 nControl );
-    void InsertTextContent( ::com::sun::star::uno::Reference <
-                            ::com::sun::star::text::XTextContent > & xContent);
+    void InsertTextContent( css::uno::Reference< css::text::XTextContent > & xContent);
 
     // Add parameter <bOutlineLevelAttrFound> (#i73509#)
     // Add parameter <bSetListAttrs> in order to suppress the handling of the list attributes (#i80724#)
     OUString SetStyleAndAttrs(
             SvXMLImport& rImport,
-            const ::com::sun::star::uno::Reference <
-                ::com::sun::star::text::XTextCursor >& rCursor,
+            const css::uno::Reference< css::text::XTextCursor >& rCursor,
             const OUString& rStyleName,
             bool bPara,
             bool bOutlineLevelAttrFound = false,
@@ -488,8 +479,7 @@ public:
 
     void SetHyperlink(
             SvXMLImport& rImport,
-            const ::com::sun::star::uno::Reference <
-                ::com::sun::star::text::XTextCursor >& rCursor,
+            const css::uno::Reference< css::text::XTextCursor >& rCursor,
             const OUString& rHRef,
             const OUString& rName,
             const OUString& rTargetFrameName,
@@ -498,8 +488,7 @@ public:
             XMLEventsImportContext* pEvents = NULL);
     void SetRuby(
             SvXMLImport& rImport,
-            const ::com::sun::star::uno::Reference <
-                ::com::sun::star::text::XTextCursor >& rCursor,
+            const css::uno::Reference< css::text::XTextCursor >& rCursor,
             const OUString& rStyleName,
             const OUString& rTextStyleName,
             const OUString& rText );
@@ -519,31 +508,24 @@ public:
     XMLPropStyleContext* FindPageMaster(
             const OUString& rName ) const;
 
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::container::XNameContainer> & GetParaStyles() const;
+    const css::uno::Reference< css::container::XNameContainer> & GetParaStyles() const;
 
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::container::XNameContainer> & GetTextStyles() const;
+    const css::uno::Reference< css::container::XNameContainer> & GetTextStyles() const;
 
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::container::XNameContainer> &
+    const css::uno::Reference< css::container::XNameContainer> &
         GetNumberingStyles() const;
 
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::container::XNameContainer> & GetFrameStyles() const;
+    const css::uno::Reference< css::container::XNameContainer> & GetFrameStyles() const;
 
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::container::XNameContainer> & GetPageStyles() const;
+    const css::uno::Reference< css::container::XNameContainer> & GetPageStyles() const;
 
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::container::XIndexReplace > &
+    const css::uno::Reference< css::container::XIndexReplace > &
         GetChapterNumbering() const;
 
     bool HasFrameByName( const OUString& rName ) const;
     void ConnectFrameChains( const OUString& rFrmName,
         const OUString& rNextFrmName,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet >& rFrmPropSet );
+        const css::uno::Reference< css::beans::XPropertySet >& rFrmPropSet );
 
     rtl::Reference< SvXMLImportPropertyMapper > const&
         GetParaImportPropertySetMapper() const;
@@ -565,8 +547,7 @@ public:
     /// save the start of a range reference
     void InsertBookmarkStartRange(
         const OUString & sName,
-        const ::com::sun::star::uno::Reference<
-                ::com::sun::star::text::XTextRange> & rRange,
+        const css::uno::Reference< css::text::XTextRange> & rRange,
         OUString const& i_rXmlId,
         std::shared_ptr< ::xmloff::ParsedRDFaAttributes > &
             i_rpRDFaAttributes);
@@ -574,18 +555,16 @@ public:
     /// process the start of a range reference
     bool FindAndRemoveBookmarkStartRange(
         const OUString & sName,
-        ::com::sun::star::uno::Reference<
-                ::com::sun::star::text::XTextRange> & o_rRange,
+        css::uno::Reference< css::text::XTextRange> & o_rRange,
         OUString & o_rXmlId,
-        std::shared_ptr< ::xmloff::ParsedRDFaAttributes > &
-            o_rpRDFaAttributes);
+        std::shared_ptr< ::xmloff::ParsedRDFaAttributes > & o_rpRDFaAttributes);
 
     OUString FindActiveBookmarkName();
 
     void pushFieldCtx( const OUString& name, const OUString& type );
     void popFieldCtx();
     void addFieldParam( const OUString& name, const OUString& value );
-    void setCurrentFieldParamsTo(::com::sun::star::uno::Reference< ::com::sun::star::text::XFormField> &xFormField);
+    void setCurrentFieldParamsTo(css::uno::Reference< css::text::XFormField> &xFormField);
     OUString getCurrentFieldType();
     bool hasCurrentFieldCtx();
 
@@ -600,8 +579,7 @@ public:
     // Code is implemented in XMLPropertyBackpatcher.cxx
     void ProcessFootnoteReference(
         const OUString& sXMLId,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet> & xPropSet);
+        const css::uno::Reference< css::beans::XPropertySet> & xPropSet);
 
     /// insert new sequence ID
     /// Also fixup open references from backpatch list to this ID.
@@ -614,30 +592,26 @@ public:
     // Code is implemented in XMLPropertyBackpatcher.cxx
     void ProcessSequenceReference(
         const OUString& sXMLId,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet> & xPropSet);
+        const css::uno::Reference< css::beans::XPropertySet> & xPropSet);
 
     bool IsInFrame() const;
     virtual bool IsInHeaderFooter() const;
 
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet>
+    virtual css::uno::Reference< css::beans::XPropertySet>
             createAndInsertOLEObject( SvXMLImport& rImport,
                                       const OUString& rHRef,
                                       const OUString &rStyleName,
                                       const OUString &rTblName,
                                          sal_Int32 nWidth, sal_Int32 nHeight );
 
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet>
+    virtual css::uno::Reference< css::beans::XPropertySet>
             createAndInsertOOoLink( SvXMLImport& rImport,
                                       const OUString& rHRef,
                                       const OUString &rStyleName,
                                       const OUString &rTblName,
                                          sal_Int32 nWidth, sal_Int32 nHeight );
 
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet>
+    virtual css::uno::Reference< css::beans::XPropertySet>
         createAndInsertApplet(
             const OUString &rName,
             const OUString &rCode,
@@ -645,15 +619,13 @@ public:
             const OUString& rHRef,
             sal_Int32 nWidth, sal_Int32 nHeight );
 
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet>
+    virtual css::uno::Reference< css::beans::XPropertySet>
         createAndInsertPlugin(
             const OUString &rMimeType,
             const OUString& rHRef,
             sal_Int32 nWidth, sal_Int32 nHeight );
 
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet>
+    virtual css::uno::Reference< css::beans::XPropertySet>
         createAndInsertFloatingFrame(
             const OUString &rName,
             const OUString &rHRef,
@@ -661,8 +633,7 @@ public:
             sal_Int32 nWidth, sal_Int32 nHeight );
 
     virtual void endAppletOrPlugin(
-        const com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> &rPropSet,
+        const css::uno::Reference< css::beans::XPropertySet> &rPropSet,
         ::std::map < const OUString, OUString > &rParamMap );
 
     // applet helper methods
@@ -681,14 +652,13 @@ public:
             /// redline comment
             const OUString& rComment,
             /// date+time
-            const ::com::sun::star::util::DateTime& rDateTime,
+            const css::util::DateTime& rDateTime,
             /// merge last paras
             bool bMergeLastParagraph);
 
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::text::XTextCursor> RedlineCreateText(
+    virtual css::uno::Reference< css::text::XTextCursor> RedlineCreateText(
             /// needed to get the document
-            ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > & rOldCursor,
+            css::uno::Reference< css::text::XTextCursor > & rOldCursor,
             /// ID used to RedlineAdd() call
             const OUString& rId);
 
@@ -704,7 +674,7 @@ public:
     virtual void SetShowChanges( bool bShowChanges );
     virtual void SetRecordChanges( bool bRecordChanges );
     virtual void SetChangesProtectionKey(
-        const ::com::sun::star::uno::Sequence<sal_Int8> & rProtectionKey );
+        const css::uno::Sequence<sal_Int8> & rProtectionKey );
 
     /// get the last open redline ID
     OUString GetOpenRedlineId();
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 55c77564ea9f..3bf3427e1d22 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -114,9 +114,9 @@ public:
 
 
     void exportTextRangeSpan(
-            const ::com::sun::star::uno::Reference< com::sun::star::text::XTextRange > & rTextRange,
-            ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xPropSet,
-            ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > & xPropSetInfo,
+            const css::uno::Reference< css::text::XTextRange > & rTextRange,
+            css::uno::Reference< css::beans::XPropertySet > & xPropSet,
+            css::uno::Reference < css::beans::XPropertySetInfo > & xPropSetInfo,
             const bool bIsUICharStyle,
             const bool bHasAutoStyle,
             const OUString& sStyle,
@@ -246,165 +246,126 @@ public:
     }
 
     OUString FindTextStyleAndHyperlink(
-            const ::com::sun::star::uno::Reference <
-                ::com::sun::star::beans::XPropertySet > & rPropSet,
+            const css::uno::Reference< css::beans::XPropertySet > & rPropSet,
             bool& rbHyperlink,
             bool& rbHasCharStyle,
             bool& rbHasAutoStyle,
             const XMLPropertyState** pAddState = NULL) const;
     bool addHyperlinkAttributes(
-        const ::com::sun::star::uno::Reference <
-                ::com::sun::star::beans::XPropertySet > & rPropSet,
-        const ::com::sun::star::uno::Reference <
-                ::com::sun::star::beans::XPropertyState > & rPropState,
-        const ::com::sun::star::uno::Reference <
-                ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo );
+        const css::uno::Reference< css::beans::XPropertySet > & rPropSet,
+        const css::uno::Reference< css::beans::XPropertyState > & rPropState,
+        const css::uno::Reference< css::beans::XPropertySetInfo > & rPropSetInfo );
 
     void exportTextRangeEnumeration(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::container::XEnumeration > & rRangeEnum,
+        const css::uno::Reference< css::container::XEnumeration > & rRangeEnum,
         bool bAutoStyles, bool bProgress,
         bool bPrvChrIsSpc = true );
 
 protected:
 
     XMLShapeExportFlags addTextFrameAttributes(
-        const ::com::sun::star::uno::Reference <
-                ::com::sun::star::beans::XPropertySet >& rPropSet,
+        const css::uno::Reference< css::beans::XPropertySet >& rPropSet,
         bool bShape,
         OUString *pMinHeightValue = 0,
         OUString *pMinWidthValue = 0 );
 
     virtual void exportStyleAttributes(
-        const ::com::sun::star::uno::Reference<
-                ::com::sun::star::style::XStyle > & rStyle ) override;
+        const css::uno::Reference< css::style::XStyle > & rStyle ) override;
 
     void exportPageFrames( bool bAutoStyles, bool bProgress );
     void exportFrameFrames( bool bAutoStyles, bool bProgress,
-            const ::com::sun::star::uno::Reference <
-                    ::com::sun::star::text::XTextFrame > *pParentTxtFrame = 0 );
+            const css::uno::Reference< css::text::XTextFrame > *pParentTxtFrame = 0 );
 
     void exportNumStyles( bool bUsed );
 
     void exportText(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XText > & rText,
+        const css::uno::Reference <
+            css::text::XText > & rText,
         bool bAutoStyles, bool bProgress, bool bExportParagraph, TextPNS eExtensionNS = TextPNS::ODF );
 
     void exportText(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XText > & rText,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextSection > & rBaseSection,
+        const css::uno::Reference< css::text::XText > & rText,
+        const css::uno::Reference< css::text::XTextSection > & rBaseSection,
         bool bAutoStyles, bool bProgress, bool bExportParagraph, TextPNS eExtensionNS = TextPNS::ODF );
 
     bool exportTextContentEnumeration(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::container::XEnumeration > & rContentEnum,
+        const css::uno::Reference< css::container::XEnumeration > & rContentEnum,
         bool bAutoStyles,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextSection > & rBaseSection,
+        const css::uno::Reference< css::text::XTextSection > & rBaseSection,
         bool bProgress,
         bool bExportParagraph = true,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > *pRangePropSet = 0,
+        const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = 0,
         bool bExportLevels = true,
         TextPNS eExtensionNS = TextPNS::ODF);
     void exportParagraph(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextContent > & rTextContent,
+        const css::uno::Reference< css::text::XTextContent > & rTextContent,
         bool bAutoStyles, bool bProgress,
         bool bExportParagraph,
         MultiPropertySetHelper& rPropSetHelper,
         TextPNS eExtensionNS = TextPNS::ODF);
 
     virtual void exportTable(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextContent > & rTextContent,
+        const css::uno::Reference< css::text::XTextContent > & rTextContent,
         bool bAutoStyles, bool bProgress );
 
     void exportTextField(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextRange > & rTextRange,
+        const css::uno::Reference< css::text::XTextRange > & rTextRange,
         bool bAutoStyles, bool bProgress );
 
     void exportTextField(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextField> & xTextField,
+        const css::uno::Reference< css::text::XTextField> & xTextField,
         const bool bAutoStyles, const bool bProgress,
         const bool bRecursive );
 
     void exportAnyTextFrame(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextContent > & rTextContent,
+        const css::uno::Reference< css::text::XTextContent > & rTextContent,
         FrameType eTxpe,
         bool bAutoStyles, bool bProgress, bool bExportContent,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > *pRangePropSet = 0 );
+        const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = 0 );
     void _exportTextFrame(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > & rPropSet,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo,
+        const css::uno::Reference< css::beans::XPropertySet > & rPropSet,
+        const css::uno::Reference< css::beans::XPropertySetInfo > & rPropSetInfo,
         bool bProgress );
     inline void exportTextFrame(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextContent > & rTextContent,
+        const css::uno::Reference< css::text::XTextContent > & rTextContent,
         bool bAutoStyles, bool bProgress, bool bExportContent,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > *pRangePropSet = 0 );
+        const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = 0 );
     inline void exportShape(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextContent > & rTextContent,
+        const css::uno::Reference< css::text::XTextContent > & rTextContent,
         bool bAutoStyles,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > *pRangePropSet = 0  );
+        const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = 0  );
 
     void exportContour(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > & rPropSet,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo );
+        const css::uno::Reference< css::beans::XPropertySet > & rPropSet,
+        const css::uno::Reference< css::beans::XPropertySetInfo > & rPropSetInfo );
     void _exportTextGraphic(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > & rPropSet,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo );
+        const css::uno::Reference< css::beans::XPropertySet > & rPropSet,
+        const css::uno::Reference< css::beans::XPropertySetInfo > & rPropSetInfo );
     inline void exportTextGraphic(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextContent > & rTextContent,
+        const css::uno::Reference< css::text::XTextContent > & rTextContent,
         bool bAutoStyles,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > *pRangePropSet = 0  );
+        const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = 0  );
 
     virtual void _collectTextEmbeddedAutoStyles(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > & rPropSet );
+        const css::uno::Reference< css::beans::XPropertySet > & rPropSet );
     virtual void _exportTextEmbedded(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > & rPropSet,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo );
+        const css::uno::Reference< css::beans::XPropertySet > & rPropSet,
+        const css::uno::Reference< css::beans::XPropertySetInfo > & rPropSetInfo );
     inline void exportTextEmbedded(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextContent > & rTextContent,
+        const css::uno::Reference< css::text::XTextContent > & rTextContent,
         bool bAutoStyles,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > *pRangePropSet = 0  );
+        const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = 0  );
 
     /// export a footnote and styles
     void exportTextFootnote(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet > & rPropSet,
+        const css::uno::Reference< css::beans::XPropertySet > & rPropSet,
         const OUString& sString,
         bool bAutoStyles, bool bProgress );
 
     /// helper for exportTextFootnote
     void exportTextFootnoteHelper(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::text::XFootnote > & rPropSet,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::text::XText> & rText,
+        const css::uno::Reference< css::text::XFootnote > & rPropSet,
+        const css::uno::Reference< css::text::XText> & rText,
         const OUString& sString,
         bool bAutoStyles,
         bool bIsEndnote, bool bProgress );
@@ -413,25 +374,21 @@ protected:
     void exportTextFootnoteConfiguration();
 
     void exportTextFootnoteConfigurationHelper(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet> & rFootnoteSupplier,
+        const css::uno::Reference< css::beans::XPropertySet> & rFootnoteSupplier,
         bool bIsEndnote);
 
     void exportTextMark(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet> & xPropSet,
+        const css::uno::Reference< css::beans::XPropertySet> & xPropSet,
         const OUString& rProperty,
         const enum ::xmloff::token::XMLTokenEnum pElements[],
         bool bAutoStyles);
 
     void exportSoftPageBreak(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet> & rPropSet,
+        const css::uno::Reference< css::beans::XPropertySet> & rPropSet,
         bool bAutoStyles);
 
     void exportTextRange(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextRange > & rTextRange,
+        const css::uno::Reference< css::text::XTextRange > & rTextRange,
         bool bAutoStyles,
         bool& rPrevCharWasSpace,
         FieldmarkType& openFieldmarkType );
@@ -442,10 +399,8 @@ protected:
     /// check if current section or current list has changed;
     /// calls exortListChange as appropriate
     void exportListAndSectionChange(
-        ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextSection > & rOldSection,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextSection > & rNewSection,
+        css::uno::Reference< css::text::XTextSection > & rOldSection,
+        const css::uno::Reference< css::text::XTextSection > & rNewSection,
         const XMLTextNumRuleInfo& rOldList,
         const XMLTextNumRuleInfo& rNewList,
         bool bAutoStyles );
@@ -453,34 +408,28 @@ protected:
     /// overload for exportListAndSectionChange;
     /// takes new content rather than new section.
     void exportListAndSectionChange(
-        ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextSection > & rOldSection,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextContent > & rNewContent,
+        css::uno::Reference< css::text::XTextSection > & rOldSection,
+        const css::uno::Reference< css::text::XTextContent > & rNewContent,
         const XMLTextNumRuleInfo& rOldList,
         const XMLTextNumRuleInfo& rNewList,
         bool bAutoStyles );
     void exportListAndSectionChange(
-        ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextSection > & rOldSection,
+        css::uno::Reference< css::text::XTextSection > & rOldSection,
         MultiPropertySetHelper& rPropSetHelper,
         sal_Int16 nTextSectionId,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextContent > & rNewContent,
+        const css::uno::Reference< css::text::XTextContent > & rNewContent,
         const XMLTextNumRuleInfo& rOldList,
         const XMLTextNumRuleInfo& rNewList,
         bool bAutoStyles );
 
     /// export a ruby
     void exportRuby(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet> & rPortionPropSet,
+        const css::uno::Reference< css::beans::XPropertySet> & rPortionPropSet,
         bool bAutoStyles );
 
     /// export a text:meta
     void exportMeta(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet> & i_xPortion,
+        const css::uno::Reference< css::beans::XPropertySet> & i_xPortion,
         bool i_bAutoStyles, bool i_isProgress );
 
 public:
@@ -495,20 +444,17 @@ public:
     void Add(
         sal_uInt16 nFamily,
         MultiPropertySetHelper& rPropSetHelper,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > & rPropSet,
+        const css::uno::Reference< css::beans::XPropertySet > & rPropSet,
         const XMLPropertyState** pAddState = NULL );
     void Add(
         sal_uInt16 nFamily,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > & rPropSet,
+        const css::uno::Reference< css::beans::XPropertySet > & rPropSet,
         const XMLPropertyState** pAddState = NULL, bool bDontSeek = false );
 
     /// find style name for specified family and parent
     OUString Find(
         sal_uInt16 nFamily,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > & rPropSet,
+        const css::uno::Reference< css::beans::XPropertySet > & rPropSet,
         const OUString& rParent,
         const XMLPropertyState** pAddState = NULL ) const;
 
@@ -531,8 +477,7 @@ public:
 
     /// export the (text field) declarations for a particular XText
     void exportTextDeclarations(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XText > & rText );
+        const css::uno::Reference< css::text::XText > & rText );
 
     /// true: export only those declarations that are used;
     /// false: export all declarations
@@ -544,8 +489,7 @@ public:
 
     /// Export the list of change information (enclosed by <tracked-changes>)
     /// (or the necessary automatic styles)
-    void exportTrackedChanges(const ::com::sun::star::uno::Reference <
-                                  ::com::sun::star::text::XText > & rText,
+    void exportTrackedChanges(const css::uno::Reference< css::text::XText > & rText,
                               bool bAutoStyle );
 
     /// Record tracked changes for this particular XText
@@ -554,8 +498,7 @@ public:
     /// be exported separately via the exportTrackedChanges(bool,
     /// Reference<XText>) method.
     void recordTrackedChangesForXText(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XText > & rText );
+        const css::uno::Reference< css::text::XText > & rText );
 
 
     /// Stop recording tracked changes.
@@ -572,8 +515,7 @@ public:
 
     // This method collects all automatic styles for the given XText
     void collectTextAutoStyles(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XText > & rText,
+        const css::uno::Reference< css::text::XText > & rText,
         bool bIsProgress = false,
         bool bExportParagraph = true )
     {
@@ -581,10 +523,8 @@ public:
     }
 
     void collectTextAutoStyles(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XText > & rText,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextSection > & rBaseSection,
+        const css::uno::Reference< css::text::XText > & rText,
+        const css::uno::Reference< css::text::XTextSection > & rBaseSection,
         bool bIsProgress = false,
         bool bExportParagraph = true )
     {
@@ -599,16 +539,15 @@ public:
     // This method exports all automatic styles that have been collected.
     void exportTextAutoStyles();
 
-    void exportEvents( const ::com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet > & rPropSet );
+    void exportEvents( const css::uno::Reference< css::beans::XPropertySet > & rPropSet );
 
     // Implement Title/Description Elements UI (#i73249#)
-    void exportTitleAndDescription( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet,
-                                    const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo );
+    void exportTitleAndDescription( const css::uno::Reference< css::beans::XPropertySet > & rPropSet,
+                                    const css::uno::Reference< css::beans::XPropertySetInfo > & rPropSetInfo );
 
     // This method exports the given XText
     void exportText(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XText > & rText,
+        const css::uno::Reference< css::text::XText > & rText,
         bool bIsProgress = false,
         bool bExportParagraph = true, TextPNS eExtensionNS = TextPNS::ODF)
     {
@@ -616,10 +555,8 @@ public:
     }
 
     void exportText(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XText > & rText,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextSection > & rBaseSection,
+        const css::uno::Reference< css::text::XText > & rText,
+        const css::uno::Reference< css::text::XTextSection > & rBaseSection,
         bool bIsProgress = false,
         bool bExportParagraph = true,
         TextPNS eExtensionNS = TextPNS::ODF)
@@ -632,8 +569,7 @@ public:
         exportPageFrames( false, bIsProgress );
     }
     void exportFramesBoundToFrame(
-            const ::com::sun::star::uno::Reference <
-                    ::com::sun::star::text::XTextFrame >& rParentTxtFrame,
+            const css::uno::Reference< css::text::XTextFrame >& rParentTxtFrame,
             bool bIsProgress = false )
     {
         exportFrameFrames( false, bIsProgress, &rParentTxtFrame );
@@ -662,8 +598,7 @@ public:
      * XMLSectionExport, which is only available here.
      */
     void PreventExportOfControlsInMuteSections(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::container::XIndexAccess> & rShapes,
+        const css::uno::Reference< css::container::XIndexAccess> & rShapes,
         rtl::Reference<xmloff::OFormLayerXMLExport> xFormExport );
 
     SinglePropertySetInfoCache& GetCharStyleNamesPropInfoCache() { return aCharStyleNamesPropInfoCache; }
@@ -683,44 +618,36 @@ inline const XMLTextListAutoStylePool&
 }
 
 inline void XMLTextParagraphExport::exportTextFrame(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextContent > & rTextContent,
+        const css::uno::Reference< css::text::XTextContent > & rTextContent,
         bool bAutoStyles, bool bIsProgress, bool bExportContent,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > *pRangePropSet)
+        const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet)
 {
     exportAnyTextFrame( rTextContent, FT_TEXT, bAutoStyles, bIsProgress,
                         bExportContent, pRangePropSet );
 }
 
 inline void XMLTextParagraphExport::exportTextGraphic(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextContent > & rTextContent,
+        const css::uno::Reference< css::text::XTextContent > & rTextContent,
         bool bAutoStyles,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > *pRangePropSet )
+        const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet )
 {
     exportAnyTextFrame( rTextContent, FT_GRAPHIC, bAutoStyles, false,
                         true, pRangePropSet );
 }
 
 inline void XMLTextParagraphExport::exportTextEmbedded(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextContent > & rTextContent,
+        const css::uno::Reference< css::text::XTextContent > & rTextContent,
         bool bAutoStyles,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > *pRangePropSet )
+        const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet )
 {
     exportAnyTextFrame( rTextContent, FT_EMBEDDED, bAutoStyles, false,
                         true, pRangePropSet );
 }
 
 inline void XMLTextParagraphExport::exportShape(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::text::XTextContent > & rTextContent,
+        const css::uno::Reference< css::text::XTextContent > & rTextContent,
         bool bAutoStyles,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > *pRangePropSet )
+        const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet )
 {
     exportAnyTextFrame( rTextContent, FT_SHAPE, bAutoStyles, false,
                         true, pRangePropSet );
diff --git a/include/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx
index e616573407b6..c3b990fb0789 100644
--- a/include/xmloff/txtstyli.hxx
+++ b/include/xmloff/txtstyli.hxx
@@ -67,8 +67,7 @@ public:
 
     XMLTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+            const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
             SvXMLStylesContext& rStyles, sal_uInt16 nFamily,
             bool bDefaultStyle = false );
     virtual ~XMLTextStyleContext();
@@ -76,7 +75,7 @@ public:
     virtual SvXMLImportContext *CreateChildContext(
             sal_uInt16 nPrefix,
             const OUString& rLocalName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+            const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
 
     const OUString& GetListStyle() const { return sListStyleName; }
     // XML import: reconstrution of assignment of paragraph style to outline levels (#i69629#)
@@ -96,8 +95,7 @@ public:
 
     // override FillPropertySet, so we can get at the combined characters
     virtual void FillPropertySet(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet > & rPropSet ) override;
+            const css::uno::Reference< css::beans::XPropertySet > & rPropSet ) override;
 
     inline bool HasCombinedCharactersLetter()
         { return bHasCombinedCharactersLetter; }
diff --git a/include/xmloff/unoatrcn.hxx b/include/xmloff/unoatrcn.hxx
index ddb71e72afa3..59c2c2026e3b 100644
--- a/include/xmloff/unoatrcn.hxx
+++ b/include/xmloff/unoatrcn.hxx
@@ -30,15 +30,15 @@
 
 #include <cppuhelper/implbase3.hxx>
 
-extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SvUnoAttributeContainer_CreateInstance();
+extern css::uno::Reference< css::uno::XInterface >  SvUnoAttributeContainer_CreateInstance();
 
 class SvXMLAttrContainerData;
 
 class XMLOFF_DLLPUBLIC SvUnoAttributeContainer:
     public ::cppu::WeakAggImplHelper3<
-        ::com::sun::star::lang::XServiceInfo,
-        ::com::sun::star::lang::XUnoTunnel,
-        ::com::sun::star::container::XNameContainer >
+        css::lang::XServiceInfo,
+        css::lang::XUnoTunnel,
+        css::container::XNameContainer >
 {
 private:
     SvXMLAttrContainerData* mpContainer;
@@ -52,31 +52,31 @@ public:
 
     SvXMLAttrContainerData* GetContainerImpl() const { return mpContainer; }
 
-    static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
 
-    // ::com::sun::star::container::XElementAccess
-    virtual ::com::sun::star::uno::Type  SAL_CALL getElementType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    // css::container::XElementAccess
+    virtual css::uno::Type  SAL_CALL getElementType() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException, std::exception ) override;
 
-    // ::com::sun::star::container::XNameAccess
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& aName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    // css::container::XNameAccess
+    virtual css::uno::Any SAL_CALL getByName(const OUString& aName) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( css::uno::RuntimeException, std::exception ) override;
 
-    // ::com::sun::star::container::XNameReplace
-    virtual void SAL_CALL replaceByName(const OUString& aName, const ::com::sun::star::uno::Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    // css::container::XNameReplace
+    virtual void SAL_CALL replaceByName(const OUString& aName, const css::uno::Any& aElement) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
 
-    // ::com::sun::star::container::XNameContainer
-    virtual void SAL_CALL insertByName(const OUString& aName, const ::com::sun::star::uno::Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    // css::container::XNameContainer
+    virtual void SAL_CALL insertByName(const OUString& aName, const css::uno::Any& aElement) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL removeByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
 
-    // ::com::sun::star::lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() 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 sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    // css::lang::XServiceInfo
+    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
 
-    friend  ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SvUnoAttributeContainer_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr ) throw( ::com::sun::star::uno::Exception );
+    friend  css::uno::Reference< css::uno::XInterface > SvUnoAttributeContainer_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
 };
 
 #endif
diff --git a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
index 2bde5003c7c0..28156d0570d7 100644
--- a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
+++ b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
@@ -31,7 +31,7 @@
 namespace comphelper
 {
 
-typedef ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > IdMap_t;
+typedef ::std::map< OUString, css::uno::Reference< css::uno::XInterface > > IdMap_t;
 
 class XMLOFF_DLLPUBLIC UnoInterfaceToUniqueIdentifierMapper
 {
@@ -41,38 +41,38 @@ public:
     /** returns a unique identifier for the given uno object. IF a uno object is
         registered more than once, the returned identifier is always the same.
     */
-    const OUString& registerReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface );
+    const OUString& registerReference( const css::uno::Reference< css::uno::XInterface >& rInterface );
 
     /** registers the given uno object with the given identifier.
 
         @returns
             false, if the given identifier already exists and is not associated with the given interface
     */
-    bool registerReference( const OUString& rIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface );
+    bool registerReference( const OUString& rIdentifier, const css::uno::Reference< css::uno::XInterface >& rInterface );
 
     /** always registers the given uno object with the given identifier.
 
         In contrast to registerReference(), this here overwrites any
         earlier registration of the same identifier
     */
-    void registerReferenceAlways( const rtl::OUString& rIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface );
+    void registerReferenceAlways( const rtl::OUString& rIdentifier, const css::uno::Reference< css::uno::XInterface >& rInterface );
 
     /** @returns
             the identifier for the given uno object. If this uno object is not already
             registered, an empty string is returned
     */
-    const OUString& getIdentifier( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface ) const;
+    const OUString& getIdentifier( const css::uno::Reference< css::uno::XInterface >& rInterface ) const;
 
     /** @returns
         the uno object that is registered with the given identifier. If no uno object
         is registered with the given identifier, an empty reference is returned.
     */
-    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& getReference( const OUString& rIdentifier ) const;
+    const css::uno::Reference< css::uno::XInterface >& getReference( const OUString& rIdentifier ) const;
 
 private:
-    bool findReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface, IdMap_t::const_iterator& rIter ) const;
+    bool findReference( const css::uno::Reference< css::uno::XInterface >& rInterface, IdMap_t::const_iterator& rIter ) const;
     bool findIdentifier( const OUString& rIdentifier, IdMap_t::const_iterator& rIter ) const;
-    void insertReference( const OUString& rIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface );
+    void insertReference( const OUString& rIdentifier, const css::uno::Reference< css::uno::XInterface >& rInterface );
 
     IdMap_t	maEntries;
     sal_Int32 mnNextId;
diff --git a/include/xmloff/xformsexport.hxx b/include/xmloff/xformsexport.hxx
index 6fdfb1abaffd..bba51b2af13b 100644
--- a/include/xmloff/xformsexport.hxx
+++ b/include/xmloff/xformsexport.hxx
@@ -35,18 +35,18 @@ namespace com { namespace sun { namespace star {
 /** export an XForms model. */
 void SAL_DLLPRIVATE exportXForms( SvXMLExport& );
 
-OUString SAL_DLLPRIVATE getXFormsBindName( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xBinding );
+OUString SAL_DLLPRIVATE getXFormsBindName( const css::uno::Reference<css::beans::XPropertySet>& xBinding );
 
-OUString SAL_DLLPRIVATE getXFormsListBindName( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xBinding );
+OUString SAL_DLLPRIVATE getXFormsListBindName( const css::uno::Reference<css::beans::XPropertySet>& xBinding );
 
-OUString SAL_DLLPRIVATE getXFormsSubmissionName( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xBinding );
+OUString SAL_DLLPRIVATE getXFormsSubmissionName( const css::uno::Reference<css::beans::XPropertySet>& xBinding );
 
 
 /** returns the settings of the given XForms container, to be exported as document specific settings
 */
 void XMLOFF_DLLPUBLIC getXFormsSettings(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rXForms,
-              ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _out_rSettings
+        const css::uno::Reference< css::container::XNameAccess >& _rXForms,
+              css::uno::Sequence< css::beans::PropertyValue >& _out_rSettings
     );
 
 #endif
diff --git a/include/xmloff/xformsimport.hxx b/include/xmloff/xformsimport.hxx
index f63b383a7635..4aa509d3d502 100644
--- a/include/xmloff/xformsimport.hxx
+++ b/include/xmloff/xformsimport.hxx
@@ -45,8 +45,8 @@ XMLOFF_DLLPUBLIC SvXMLImportContext* createXFormsModelContext(
  *  @param pair<XForms binding ID, reference to control>
  */
 void bindXFormsValueBinding(
-    com::sun::star::uno::Reference<com::sun::star::frame::XModel>,
-    std::pair<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>,OUString> );
+    css::uno::Reference<css::frame::XModel>,
+    std::pair<css::uno::Reference<css::beans::XPropertySet>,OUString> );
 
 
 /** perform the actual binding of an XForms-binding as list source with a list control
@@ -54,22 +54,22 @@ void bindXFormsValueBinding(
  *  @param pair<XForms binding ID, reference to control>
  */
 void bindXFormsListBinding(
-    com::sun::star::uno::Reference<com::sun::star::frame::XModel>,
-    std::pair<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>,OUString> );
+    css::uno::Reference<css::frame::XModel>,
+    std::pair<css::uno::Reference<css::beans::XPropertySet>,OUString> );
 
 /** perform the actual binding of an XForms submission with the suitable control
  *  @param document which contains the XForms-model(s)
  *  @param pair<XForms submission ID, reference to control>
  */
 void bindXFormsSubmission(
-    com::sun::star::uno::Reference<com::sun::star::frame::XModel>,
-    std::pair<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>,OUString> );
+    css::uno::Reference<css::frame::XModel>,
+    std::pair<css::uno::Reference<css::beans::XPropertySet>,OUString> );
 
 /** applies the given settings to the given XForms container
 */
 void XMLOFF_DLLPUBLIC applyXFormsSettings(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rXForms,
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rSettings
+        const css::uno::Reference< css::container::XNameAccess >& _rXForms,
+        const css::uno::Sequence< css::beans::PropertyValue >& _rSettings
     );
 
 #endif
diff --git a/include/xmloff/xmlaustp.hxx b/include/xmloff/xmlaustp.hxx
index 812f69ffef93..d7e8f4ac99cc 100644
--- a/include/xmloff/xmlaustp.hxx
+++ b/include/xmloff/xmlaustp.hxx
@@ -48,18 +48,18 @@ protected:
             SvXMLAttributeList& rAttrList,
             sal_Int32 nFamily,
             const ::std::vector< XMLPropertyState >& rProperties,
-            const SvXMLExportPropertyMapper& rPropExp
-            , const SvXMLUnitConverter& rUnitConverter,
+            const SvXMLExportPropertyMapper& rPropExp,
+            const SvXMLUnitConverter& rUnitConverter,
             const SvXMLNamespaceMap& rNamespaceMap
             ) const;
 
 // this methode is executed after Properties Export, so you can e.g. export a map or so on
     virtual void exportStyleContent(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
+            const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler,
             sal_Int32 nFamily,
             const ::std::vector< XMLPropertyState >& rProperties,
-            const SvXMLExportPropertyMapper& rPropExp
-            , const SvXMLUnitConverter& rUnitConverter,
+            const SvXMLExportPropertyMapper& rPropExp,
+            const SvXMLUnitConverter& rUnitConverter,
             const SvXMLNamespaceMap& rNamespaceMap
             ) const;
 
@@ -89,13 +89,13 @@ public:
 
     /// retrieve the registered names (names + families)
     void GetRegisteredNames(
-        com::sun::star::uno::Sequence<sal_Int32>& aFamilies,
-        com::sun::star::uno::Sequence<OUString>& aNames );
+        css::uno::Sequence<sal_Int32>& aFamilies,
+        css::uno::Sequence<OUString>& aNames );
 
     /// register (families + names)
     void RegisterNames(
-        com::sun::star::uno::Sequence<sal_Int32>& aFamilies,
-        com::sun::star::uno::Sequence<OUString>& aNames );
+        css::uno::Sequence<sal_Int32>& aFamilies,
+        css::uno::Sequence<OUString>& aNames );
 
     /// Add an item set to the pool and return its generated name.
     OUString Add( sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties );
@@ -110,8 +110,8 @@ public:
     OUString Find( sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ) const;
 
     /** Export all item sets ofs a certain class in the order in that they have been added. */
-    void exportXML( sal_Int32 nFamily
-        , const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
+    void exportXML( sal_Int32 nFamily,
+        const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler,
         const SvXMLUnitConverter& rUnitConverter,
         const SvXMLNamespaceMap& rNamespaceMap
         ) const;
diff --git a/include/xmloff/xmlerror.hxx b/include/xmloff/xmlerror.hxx
index 853af45923af..96cace370dd8 100644
--- a/include/xmloff/xmlerror.hxx
+++ b/include/xmloff/xmlerror.hxx
@@ -114,8 +114,7 @@ public:
     /// add a new entry to the list of error messages
     void AddRecord(
         sal_Int32 nId, /// error ID == error flags + error class + error number
-        const ::com::sun::star::uno::Sequence<
-                  OUString> & rParams,  /// parameters for error message
+        const css::uno::Sequence< OUString> & rParams,  /// parameters for error message
         const OUString& rExceptionMessage, /// original exception string
         sal_Int32 nRow,                     /// XLocator: file row number
         sal_Int32 nColumn,                  /// XLocator: file column number
@@ -124,18 +123,16 @@ public:
 
     void AddRecord(
         sal_Int32 nId, /// error ID == error flags + error class + error number
-        const ::com::sun::star::uno::Sequence<
-                  OUString> & rParams,  /// parameters for error message
+        const css::uno::Sequence<OUString> & rParams,  /// parameters for error message
         const OUString& rExceptionMessage, /// original exception string
-        const ::com::sun::star::uno::Reference<
-                 ::com::sun::star::xml::sax::XLocator> & rLocator); /// location
+        const css::uno::Reference<css::xml::sax::XLocator> & rLocator); /// location
 
     /**
      * throw a SAXParseException that describes the first error that matches
      * the given mask
      */
     void ThrowErrorAsSAXException( sal_Int32 nIdMask )
-        throw( ::com::sun::star::xml::sax::SAXParseException );
+        throw( css::xml::sax::SAXParseException );
 };
 
 #endif
diff --git a/include/xmloff/xmlevent.hxx b/include/xmloff/xmlevent.hxx
index d3acf0eff261..0a2220d8e03a 100644
--- a/include/xmloff/xmlevent.hxx
+++ b/include/xmloff/xmlevent.hxx
@@ -96,9 +96,8 @@ public:
     virtual void Export(
         SvXMLExport& rExport,                   /// the current XML export
         const OUString& rEventQName,     /// the XML name of the event
-        ::com::sun::star::uno::Sequence<        /// the values for the event
-            ::com::sun::star::beans::PropertyValue> & rValues,
-         bool bUseWhitespace) = 0;  /// create whitespace around elements?
+        css::uno::Sequence<css::beans::PropertyValue> & rValues, /// the values for the event
+        bool bUseWhitespace) = 0;  /// create whitespace around elements?
 };
 
 
@@ -129,8 +128,7 @@ public:
         SvXMLImport& rImport,               /// import context
         sal_uInt16 nPrefix,                 /// element: namespace prefix
         const OUString& rLocalName,  /// element: local name
-        const ::com::sun::star::uno::Reference<     /// attribute list
-            ::com::sun::star::xml::sax::XAttributeList> & xAttrList,
+        const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList, /// attribute list
         /// the context for the enclosing <script:events> element
         XMLEventsImportContext* rEvents,
         /// the event name (as understood by the API)
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 3a51c24e5df8..7698d01b3490 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -108,30 +108,30 @@ namespace o3tl
 }
 
 class XMLOFF_DLLPUBLIC SvXMLExport : public ::cppu::WeakImplHelper6<
-             ::com::sun::star::document::XFilter,
-             ::com::sun::star::lang::XServiceInfo,
-             ::com::sun::star::document::XExporter,
-              ::com::sun::star::lang::XInitialization,
-             ::com::sun::star::container::XNamed,
-             ::com::sun::star::lang::XUnoTunnel>
+             css::document::XFilter,
+             css::lang::XServiceInfo,
+             css::document::XExporter,
+             css::lang::XInitialization,
+             css::container::XNamed,
+             css::lang::XUnoTunnel>
 {
     SvXMLExport_Impl            *mpImpl;            // dummy
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
+    css::uno::Reference< css::uno::XComponentContext > m_xContext;
     OUString m_implementationName;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel;
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >            mxHandler;      // the handlers
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XExtendedDocumentHandler >    mxExtHandler;
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > mxNumberFormatsSupplier;
-    ::com::sun::star::uno::Reference< ::com::sun::star::document::XGraphicObjectResolver > mxGraphicResolver;
-    ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedObjectResolver > mxEmbeddedResolver;
-    ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > mxStatusIndicator;
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxExportInfo;
-     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > mxEventListener;
+    css::uno::Reference< css::frame::XModel > mxModel;
+    css::uno::Reference< css::xml::sax::XDocumentHandler >            mxHandler;      // the handlers
+    css::uno::Reference< css::xml::sax::XExtendedDocumentHandler >    mxExtHandler;
+    css::uno::Reference< css::util::XNumberFormatsSupplier > mxNumberFormatsSupplier;
+    css::uno::Reference< css::document::XGraphicObjectResolver > mxGraphicResolver;
+    css::uno::Reference< css::document::XEmbeddedObjectResolver > mxEmbeddedResolver;
+    css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator;
+    css::uno::Reference< css::beans::XPropertySet > mxExportInfo;
+    css::uno::Reference< css::lang::XEventListener > mxEventListener;
 
     SvXMLAttributeList          *mpAttrList;        // a common attribute list
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >          mxAttrList;     // and an interface of it
+    css::uno::Reference< css::xml::sax::XAttributeList >          mxAttrList;     // and an interface of it
 
     OUString     msOrigFileName; // the original URL
     OUString     msGraphicObjectProtocol;
@@ -180,7 +180,7 @@ private:
         // <office:master-styles>
     SAL_DLLPRIVATE void ImplExportContent(); // <office:body>
     virtual void SetBodyAttributes();
-    void GetViewSettingsAndViews(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps);
+    void GetViewSettingsAndViews(css::uno::Sequence<css::beans::PropertyValue>& rProps);
 
 protected:
     void setExportFlags( SvXMLExportFlags nExportFlags ) { mnExportFlags = nExportFlags; }
@@ -233,13 +233,13 @@ protected:
     virtual XMLPageExport* CreatePageExport();
     virtual XMLFontAutoStylePool* CreateFontAutoStylePool();
     xmloff::OFormLayerXMLExport* CreateFormExport();
-    virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps);
-    virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps);
+    virtual void GetViewSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps);
+    virtual void GetConfigurationSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps);
 
     struct SettingsGroup
     {
-        ::xmloff::token::XMLTokenEnum                                               eGroupName;
-        ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >   aSettings;
+        ::xmloff::token::XMLTokenEnum                     eGroupName;
+        css::uno::Sequence< css::beans::PropertyValue >   aSettings;
 
         SettingsGroup()
             :eGroupName( ::xmloff::token::XML_TOKEN_INVALID )
@@ -249,7 +249,7 @@ protected:
 
         SettingsGroup(
                 const ::xmloff::token::XMLTokenEnum _eGroupName,
-                const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rSettings )
+                const css::uno::Sequence< css::beans::PropertyValue >& _rSettings )
             :eGroupName( _eGroupName )
             ,aSettings( _rSettings )
         {
@@ -265,64 +265,64 @@ protected:
     */
     virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings );
 
-    const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedObjectResolver >& GetEmbeddedResolver() const { return mxEmbeddedResolver; }
-    inline void SetEmbeddedResolver( com::sun::star::uno::Reference< com::sun::star::document::XEmbeddedObjectResolver >& _xEmbeddedResolver );
+    const css::uno::Reference< css::document::XEmbeddedObjectResolver >& GetEmbeddedResolver() const { return mxEmbeddedResolver; }
+    inline void SetEmbeddedResolver( css::uno::Reference< css::document::XEmbeddedObjectResolver >& _xEmbeddedResolver );
 
-    const ::com::sun::star::uno::Reference< ::com::sun::star::document::XGraphicObjectResolver >& GetGraphicResolver() const { return mxGraphicResolver; }
-    void SetGraphicResolver( com::sun::star::uno::Reference< com::sun::star::document::XGraphicObjectResolver >& _xGraphicResolver );
+    const css::uno::Reference< css::document::XGraphicObjectResolver >& GetGraphicResolver() const { return mxGraphicResolver; }
+    void SetGraphicResolver( css::uno::Reference< css::document::XGraphicObjectResolver >& _xGraphicResolver );
 
-    void SetDocHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > &rHandler );
+    void SetDocHandler( const css::uno::Reference< css::xml::sax::XDocumentHandler > &rHandler );
 
 public:
 
     SvXMLExport(
         sal_Int16 const eDefaultMeasureUnit /*css::util::MeasureUnit*/,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
+        const css::uno::Reference< css::uno::XComponentContext >& xContext,
         OUString const & implementationName,
         const enum ::xmloff::token::XMLTokenEnum eClass = xmloff::token::XML_TOKEN_INVALID,
         SvXMLExportFlags nExportFlag = SvXMLExportFlags::ALL );
 
     SvXMLExport(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
+        const css::uno::Reference< css::uno::XComponentContext >& xContext,
         OUString const & implementationName,
         const OUString& rFileName,
         sal_Int16 const eDefaultMeasureUnit /*css::util::MeasureUnit*/,
-		const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler);
+        const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler);
 
     SvXMLExport(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
+        const css::uno::Reference< css::uno::XComponentContext >& xContext,
         OUString const & implementationName,
         const OUString& rFileName,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > &,
+        const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler,
+        const css::uno::Reference< css::frame::XModel > &,
         FieldUnit const eDefaultFieldUnit );
 
     virtual ~SvXMLExport();
 
-    static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
-    static SvXMLExport* getImplementation( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ) throw();
+    static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
+    static SvXMLExport* getImplementation( css::uno::Reference< css::uno::XInterface > ) throw();
 
     // XExporter
-    virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 
     // XFilter
-    virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancel() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL cancel() throw(css::uno::RuntimeException, std::exception) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
     // XNamed
-    virtual OUString SAL_CALL getName(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) final override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) final override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) final override;
+    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) final override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) final override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) final override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
 
     /** ensures that the given namespace is in scope at the next started
         element.
@@ -386,7 +386,7 @@ public:
                     also switches nPrefix XML_NAMESPACE_FO to XML_NAMESPACE_STYLE
      */
     void AddLanguageTagAttributes( sal_uInt16 nPrefix, sal_uInt16 nPrefixRfc,
-            const ::com::sun::star::lang::Locale& rLocale, bool bWriteEmpty,
+            const css::lang::Locale& rLocale, bool bWriteEmpty,
             enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_LANGUAGE );
 
     /** Same as AddLanguageTagAttributes() but with LanguageTag parameter
@@ -397,16 +397,16 @@ public:
             enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_LANGUAGE );
 
     // add several attributes to the common attribute list
-    void AddAttributeList( const ::com::sun::star::uno::Reference<
-                                  ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
+    void AddAttributeList( const css::uno::Reference<
+                                  css::xml::sax::XAttributeList >& xAttrList );
 
     // Get common attribute list as implementation or interface.
     SvXMLAttributeList &GetAttrList() { return *mpAttrList; }
-    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & GetXAttrList() { return mxAttrList; }
+    const css::uno::Reference< css::xml::sax::XAttributeList > & GetXAttrList() { return mxAttrList; }
 
     // Get document handler. This methods are not const, because the
     // reference allowes modifications through the handler.
-    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & GetDocHandler() { return mxHandler; }
+    const css::uno::Reference< css::xml::sax::XDocumentHandler > & GetDocHandler() { return mxHandler; }
 
     // Get original URL.
     const OUString& GetOrigFileName() const { return msOrigFileName; }
@@ -430,14 +430,14 @@ public:
     virtual OUString getDataStyleName(const sal_Int32 nNumberFormat, bool bTimeFormat = false ) const;
     sal_Int32 dataStyleForceSystemLanguage(sal_Int32 nFormat) const;
 
-    virtual void exportAnnotationMeta( const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape);
+    virtual void exportAnnotationMeta( const css::uno::Reference < css::drawing::XShape >& xShape);
 
     // Get XModel
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > &
+    const css::uno::Reference< css::frame::XModel > &
                GetModel() const { return mxModel; }
     // Get XNumberFormatsSupplier
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & GetNumberFormatsSupplier() { return mxNumberFormatsSupplier; }
-    inline void SetNumberFormatsSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& _xNumberFormatSupplier)
+    css::uno::Reference< css::util::XNumberFormatsSupplier > & GetNumberFormatsSupplier() { return mxNumberFormatsSupplier; }
+    inline void SetNumberFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier >& _xNumberFormatSupplier)
     {
         mxNumberFormatsSupplier = _xNumberFormatSupplier;
         if ( mxNumberFormatsSupplier.is() && mxHandler.is() )
@@ -469,9 +469,9 @@ public:
     inline bool HasFormExport();
 
     // get XPropertySet with export information
-    inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getExportInfo() const { return mxExportInfo; }
+    inline css::uno::Reference< css::beans::XPropertySet > getExportInfo() const { return mxExportInfo; }
 
-    com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > GetStatusIndicator() { return mxStatusIndicator; }
+    css::uno::Reference< css::task::XStatusIndicator > GetStatusIndicator() { return mxStatusIndicator; }
 
     /// get Event export, with handlers for script types "None" and
     /// "StarBasic" already registered; other handlers may be registered, too.
@@ -500,8 +500,7 @@ public:
     SvXMLExportFlags getExportFlags() const { return mnExportFlags; }
 
     bool ExportEmbeddedOwnObject(
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::lang::XComponent >& rComp );
+        css::uno::Reference<css::lang::XComponent >& rComp );
 
     OUString GetRelativeReference(const OUString& rValue);
 
@@ -528,16 +527,15 @@ public:
         /// error ID, may contain an error flag
         sal_Int32 nId,
         /// string parameters for the error message
-        const ::com::sun::star::uno::Sequence< OUString> & rMsgParams,
+        const css::uno::Sequence< OUString> & rMsgParams,
         /// original exception message (if applicable)
         const OUString& rExceptionMessage,
         /// error location (if applicable)
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XLocator> & rLocator );
+        const css::uno::Reference<css::xml::sax::XLocator> & rLocator );
 
     void SetError(
         sal_Int32 nId,
-        const ::com::sun::star::uno::Sequence< OUString> & rMsgParams);
+        const css::uno::Sequence< OUString> & rMsgParams);
 
     /** return current error flags (logical 'or' of all error flags so far) */
     SvXMLErrorFlags GetErrorFlags()  { return mnErrorFlags; }
@@ -546,7 +544,7 @@ public:
 
     ::comphelper::UnoInterfaceToUniqueIdentifierMapper& getInterfaceToIdentifierMapper();
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getComponentContext() { return m_xContext;}
+    css::uno::Reference< css::uno::XComponentContext > getComponentContext() { return m_xContext;}
 
     // Shapes in Writer cannot be named via context menu (#i51726#)
     SvtModuleOptions::EFactory GetModelType() const
@@ -557,7 +555,7 @@ public:
     // Written OpenDocument file format doesn't fit to the created text document (#i69627#)
     bool writeOutlineStyleAsNormalListStyle() const;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetTargetStorage();
+    css::uno::Reference< css::embed::XStorage > GetTargetStorage();
 
     /// returns the currently configured default version for odf export
     SvtSaveOptions::ODFDefaultVersion getDefaultVersion() const;
@@ -575,12 +573,10 @@ public:
             sal_uInt16 const nLegacyPrefix, OUString const& rValue);
 
     /// add xml:id attribute (for RDF metadata)
-    void AddAttributeXmlId(::com::sun::star::uno::Reference<
-            ::com::sun::star::uno::XInterface> const & i_xIfc);
+    void AddAttributeXmlId(css::uno::Reference<css::uno::XInterface> const & i_xIfc);
 
     /// add RDFa attributes for a metadatable text content
-    void AddAttributesRDFa( ::com::sun::star::uno::Reference<
-        ::com::sun::star::text::XTextContent> const & i_xTextContent);
+    void AddAttributesRDFa( css::uno::Reference<css::text::XTextContent> const & i_xTextContent);
 
     bool exportTextNumberElement() const;
 
@@ -650,13 +646,13 @@ inline bool SvXMLExport::HasFormExport()
 }
 
 inline void SvXMLExport::SetEmbeddedResolver(
-    com::sun::star::uno::Reference< com::sun::star::document::XEmbeddedObjectResolver >& _xEmbeddedResolver )
+    css::uno::Reference< css::document::XEmbeddedObjectResolver >& _xEmbeddedResolver )
 {
     mxEmbeddedResolver = _xEmbeddedResolver;
 }
 
 inline void SvXMLExport::SetGraphicResolver(
-    com::sun::star::uno::Reference< com::sun::star::document::XGraphicObjectResolver >& _xGraphicResolver )
+    css::uno::Reference< css::document::XGraphicObjectResolver >& _xGraphicResolver )
 {
     mxGraphicResolver = _xGraphicResolver;
 }
diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx
index 91d323cbe605..ad44774845e9 100644
--- a/include/xmloff/xmlexppr.hxx
+++ b/include/xmloff/xmlexppr.hxx
@@ -70,8 +70,7 @@ protected:
     virtual void ContextFilter(
             bool bEnableFoFontFamily,
             ::std::vector< XMLPropertyState >& rProperties,
-            ::com::sun::star::uno::Reference<
-                    ::com::sun::star::beans::XPropertySet > rPropSet ) const;
+            css::uno::Reference<css::beans::XPropertySet > rPropSet ) const;
 
     /** fills the given attribute list with the items in the given set */
     void _exportXML( sal_uInt16 nPropType, sal_uInt16& rPropTypeFlags,
diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index 2b1d00890331..fa31930b6b77 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -79,12 +79,12 @@ public:
      * CreateContext method is called to create a new default context. */
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const OUString& rLocalName,
-                                   const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
+                                   const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList );
 
     /** StartElement is called after a context has been constructed and
      * before a elements context is parsed. It may be used for actions that
      * require virtual methods. The default is to do nothing. */
-    virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
+    virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList );
 
     /** EndElement is called before a context will be destructed, but
      * after a elements context has been parsed. It may be used for actions
@@ -95,7 +95,7 @@ public:
      * current element. The default is to ignore them. */
     virtual void Characters( const OUString& rChars );
 
-    // ::com::sun::star::xml::sax::XFastContextHandler:
+    // css::xml::sax::XFastContextHandler:
     virtual void SAL_CALL startFastElement (sal_Int32 Element,
         const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs)
         throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 453fe5fc6b49..04a6e7223828 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -104,22 +104,22 @@ namespace o3tl
 
 
 class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper7<
-             ::com::sun::star::xml::sax::XExtendedDocumentHandler,
-             ::com::sun::star::xml::sax::XFastDocumentHandler,
-             ::com::sun::star::lang::XServiceInfo,
-             ::com::sun::star::lang::XInitialization,
-             ::com::sun::star::document::XImporter,
-             ::com::sun::star::document::XFilter,
-             ::com::sun::star::lang::XUnoTunnel>
+             css::xml::sax::XExtendedDocumentHandler,
+             css::xml::sax::XFastDocumentHandler,
+             css::lang::XServiceInfo,
+             css::lang::XInitialization,
+             css::document::XImporter,
+             css::document::XFilter,
+             css::lang::XUnoTunnel>
 {
     friend class SvXMLImportContext;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > mxLocator;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel;
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > mxNumberFormatsSupplier;
-    ::com::sun::star::uno::Reference< ::com::sun::star::document::XGraphicObjectResolver > mxGraphicResolver;
-    ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedObjectResolver > mxEmbeddedResolver;
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxImportInfo;
+    css::uno::Reference< css::xml::sax::XLocator > mxLocator;
+    css::uno::Reference< css::frame::XModel > mxModel;
+    css::uno::Reference< css::util::XNumberFormatsSupplier > mxNumberFormatsSupplier;
+    css::uno::Reference< css::document::XGraphicObjectResolver > mxGraphicResolver;
+    css::uno::Reference< css::document::XEmbeddedObjectResolver > mxEmbeddedResolver;
+    css::uno::Reference< css::beans::XPropertySet > mxImportInfo;
 
     rtl::Reference< XMLTextImportHelper >             mxTextImport;
     rtl::Reference< XMLShapeImportHelper >            mxShapeImport;
@@ -131,14 +131,14 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper7<
     SvXMLImportContextRef mxAutoStyles;
     SvXMLImportContextRef mxMasterStyles;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxGradientHelper;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxHatchHelper;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxBitmapHelper;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxTransGradientHelper;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxMarkerHelper;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxDashHelper;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxNumberStyles;
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > mxEventListener;
+    css::uno::Reference< css::container::XNameContainer > mxGradientHelper;
+    css::uno::Reference< css::container::XNameContainer > mxHatchHelper;
+    css::uno::Reference< css::container::XNameContainer > mxBitmapHelper;
+    css::uno::Reference< css::container::XNameContainer > mxTransGradientHelper;
+    css::uno::Reference< css::container::XNameContainer > mxMarkerHelper;
+    css::uno::Reference< css::container::XNameContainer > mxDashHelper;
+    css::uno::Reference< css::container::XNameContainer > mxNumberStyles;
+    css::uno::Reference< css::lang::XEventListener > mxEventListener;
 
     SvXMLImport_Impl            *mpImpl;            // dummy
 
@@ -161,7 +161,7 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper7<
 
 protected:
 
-    ::com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > mxStatusIndicator;
+    css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator;
     bool                        mbIsFormsSupported;
     bool                        mbIsTableShapeSupported;
     bool                        mbIsGraphicLoadOnDemandSupported;
@@ -170,7 +170,7 @@ protected:
     // before a context for the current element has been pushed.
     virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix,
                                                const OUString& rLocalName,
-                                               const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
+                                               const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList );
     virtual SvXMLImportContext *CreateFastContext( sal_Int32 Element,
         const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList >& xAttrList );
 
@@ -190,11 +190,11 @@ protected:
 
     bool IsODFVersionConsistent( const OUString& aODFVersion );
 
-    const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedObjectResolver >& GetEmbeddedResolver() const { return mxEmbeddedResolver; }
-    inline void SetEmbeddedResolver( com::sun::star::uno::Reference< com::sun::star::document::XEmbeddedObjectResolver >& _xEmbeddedResolver );
+    const css::uno::Reference< css::document::XEmbeddedObjectResolver >& GetEmbeddedResolver() const { return mxEmbeddedResolver; }
+    inline void SetEmbeddedResolver( css::uno::Reference< css::document::XEmbeddedObjectResolver >& _xEmbeddedResolver );
 
-    const ::com::sun::star::uno::Reference< ::com::sun::star::document::XGraphicObjectResolver >& GetGraphicResolver() const { return mxGraphicResolver; }
-    void SetGraphicResolver( com::sun::star::uno::Reference< com::sun::star::document::XGraphicObjectResolver >& _xGraphicResolver );
+    const css::uno::Reference< css::document::XGraphicObjectResolver >& GetGraphicResolver() const { return mxGraphicResolver; }
+    void SetGraphicResolver( css::uno::Reference< css::document::XGraphicObjectResolver >& _xGraphicResolver );
 
 
     void _CreateNumberFormatsSupplier();
@@ -203,37 +203,37 @@ protected:
 public:
     // SvXMLImport( sal_uInt16 nImportFlags = IMPORT_ALL ) throw();
     SvXMLImport(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
+        const css::uno::Reference< css::uno::XComponentContext >& xContext,
         OUString const & implementationName,
         SvXMLImportFlags nImportFlags = SvXMLImportFlags::ALL ) throw();
 
     virtual ~SvXMLImport() throw();
 
-    static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
+    static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
 
-    // ::com::sun::star::xml::sax::XDocumentHandler
+    // css::xml::sax::XDocumentHandler
     virtual void SAL_CALL startDocument()
-        throw (::com::sun::star::xml::sax::SAXException,
-               ::com::sun::star::uno::RuntimeException,
+        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,
+        throw(css::xml::sax::SAXException,
+              css::uno::RuntimeException,
               std::exception) override;
     virtual void SAL_CALL startElement(const OUString& aName,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs)
-        throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs)
+        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL endElement(const OUString& aName)
-        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 characters(const OUString& aChars)
-        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 ignorableWhitespace(const OUString& aWhitespaces)
-        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 processingInstruction(const OUString& aTarget,
                                                 const OUString& aData)
-        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;
+        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;
 
     // ::css::xml::sax::XFastContextHandler
     virtual void SAL_CALL startFastElement(sal_Int32 Element,
@@ -257,42 +257,42 @@ public:
         const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
         throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
 
-    // ::com::sun::star::xml::sax::XExtendedDocumentHandler
-    virtual void SAL_CALL startCDATA() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL endCDATA() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    // css::xml::sax::XExtendedDocumentHandler
+    virtual void SAL_CALL startCDATA() throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL endCDATA() throw( css::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL comment(const OUString& sComment)
-        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 allowLineBreak()
-        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 unknown(const OUString& sString)
-        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;
 
     // XImporter
-    virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 
     // XFilter
-    virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancel(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL cancel(  ) throw (css::uno::RuntimeException, std::exception) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName(  )
-        throw(::com::sun::star::uno::RuntimeException, std::exception) final override;
+        throw(css::uno::RuntimeException, std::exception) final override;
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(::com::sun::star::uno::RuntimeException, std::exception) final override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(::com::sun::star::uno::RuntimeException, std::exception) final override;
+        throw(css::uno::RuntimeException, std::exception) final override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
+        throw(css::uno::RuntimeException, std::exception) final override;
 
     // may be called by certain subclasses that handle document meta-data
     // override to provide customized handling of document statistics
     // the base class implementation initializes the progress bar and should
     // be called by overriding methods
-    virtual void SetStatistics(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > & i_rStats);
+    virtual void SetStatistics(const css::uno::Sequence< css::beans::NamedValue > & i_rStats);
 
     // get import helper for text
     inline rtl::Reference< XMLTextImportHelper > GetTextImport();
@@ -309,7 +309,7 @@ public:
     inline rtl::Reference< ::xmloff::OFormLayerXMLImport > GetFormImport();
 
     // get XPropertySet with import information
-    inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getImportInfo() const { return mxImportInfo; }
+    inline css::uno::Reference< css::beans::XPropertySet > getImportInfo() const { return mxImportInfo; }
 
     // get import helper for events
     XMLEventImportHelper& GetEventImport();
@@ -318,18 +318,18 @@ public:
     const SvXMLNamespaceMap& GetNamespaceMap() const { return *mpNamespaceMap; }
     const SvXMLUnitConverter& GetMM100UnitConverter() const { return *mpUnitConv; }
         SvXMLUnitConverter& GetMM100UnitConverter() { return *mpUnitConv; }
-    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & GetLocator() const { return mxLocator; }
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > &
+    const css::uno::Reference< css::xml::sax::XLocator > & GetLocator() const { return mxLocator; }
+    const css::uno::Reference< css::frame::XModel > &
         GetModel() const { return mxModel; }
 
-    const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & GetGradientHelper();
-    const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & GetHatchHelper();
-    const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & GetBitmapHelper();
-    const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & GetTransGradientHelper();
-    const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & GetMarkerHelper();
-    const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & GetDashHelper();
-    inline ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & GetNumberFormatsSupplier();
-    inline void SetNumberFormatsSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& _xNumberFormatSupplier)
+    const css::uno::Reference< css::container::XNameContainer > & GetGradientHelper();
+    const css::uno::Reference< css::container::XNameContainer > & GetHatchHelper();
+    const css::uno::Reference< css::container::XNameContainer > & GetBitmapHelper();
+    const css::uno::Reference< css::container::XNameContainer > & GetTransGradientHelper();
+    const css::uno::Reference< css::container::XNameContainer > & GetMarkerHelper();
+    const css::uno::Reference< css::container::XNameContainer > & GetDashHelper();
+    inline css::uno::Reference< css::util::XNumberFormatsSupplier > & GetNumberFormatsSupplier();
+    inline void SetNumberFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier >& _xNumberFormatSupplier)
     {
         mxNumberFormatsSupplier = _xNumberFormatSupplier;
     }
@@ -337,20 +337,20 @@ public:
     // Convert a local packe URL into either a graphic manager or a
     // internal package URL. The later one happens only if bLoadURL is true
     OUString ResolveGraphicObjectURL( const OUString& rURL, bool bLoadOnDemand );
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
+    css::uno::Reference< css::io::XOutputStream >
           GetStreamForGraphicObjectURLFromBase64();
     OUString ResolveGraphicObjectURLFromBase64(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOut );
+        const css::uno::Reference< css::io::XOutputStream >& rOut );
 
     bool IsPackageURL( const OUString& rURL ) const;
     OUString ResolveEmbeddedObjectURL( const OUString& rURL,
                                        const OUString& rClassId );
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
+    css::uno::Reference< css::io::XOutputStream >
         GetStreamForEmbeddedObjectURLFromBase64();
     OUString ResolveEmbeddedObjectURLFromBase64();
 
     // get source storage we're importing from (if available)
-    ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
+    css::uno::Reference< css::embed::XStorage >
           GetSourceStorage();
 
     void AddStyleDisplayName( sal_uInt16 nFamily,
@@ -363,10 +363,10 @@ public:
 
     void AddNumberStyle(sal_Int32 nKey, const OUString& sName);
 
-    virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps);
-    virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps);
+    virtual void SetViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& aViewProps);
+    virtual void SetConfigurationSettings(const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps);
     virtual void SetDocumentSpecificSettings(const OUString& _rSettingsGroupName,
-                    const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& _rSettings);
+                    const css::uno::Sequence<css::beans::PropertyValue>& _rSettings);
 
     XMLFontStylesContext *GetFontDecls();
     SvXMLStylesContext *GetStyles();
@@ -396,16 +396,15 @@ public:
         /// error ID, may contain an error flag
         sal_Int32 nId,
         /// string parameters for the error message
-        const ::com::sun::star::uno::Sequence< OUString > & rMsgParams,
+        const css::uno::Sequence< OUString > & rMsgParams,
         /// original exception message (if applicable)
         const OUString& rExceptionMessage,
         /// error location (if applicable)
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XLocator> & rLocator );
+        const css::uno::Reference< css::xml::sax::XLocator> & rLocator );
 
     void SetError(
         sal_Int32 nId,
-        const ::com::sun::star::uno::Sequence< OUString> & rMsgParams);
+        const css::uno::Sequence< OUString> & rMsgParams);
 
     void SetError( sal_Int32 nId );
     void SetError( sal_Int32 nId, const OUString& rMsg1 );
@@ -416,7 +415,7 @@ public:
 
     ::comphelper::UnoInterfaceToUniqueIdentifierMapper& getInterfaceToIdentifierMapper();
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
+    css::uno::Reference< css::uno::XComponentContext >
     GetComponentContext() const;
 
     // Convert drawing object positions from OOo file format to OASIS file format and vice versa (#i28749#)
@@ -431,12 +430,12 @@ public:
     OUString GetStreamName() const;
 
     /// set the XmlId attribute of given UNO object (for RDF metadata)
-    void SetXmlId(::com::sun::star::uno::Reference<
-                  ::com::sun::star::uno::XInterface> const & i_xIfc,
+    void SetXmlId(css::uno::Reference<
+                  css::uno::XInterface> const & i_xIfc,
                   OUString const & i_rXmlId);
 
     /// Add a RDFa statement; parameters are XML attribute values
-    void AddRDFa( ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable> i_xObject,
+    void AddRDFa( css::uno::Reference< css::rdf::XMetadatable> i_xObject,
                   OUString const & i_rAbout,
                   OUString const & i_rProperty,
                   OUString const & i_rContent,
@@ -551,18 +550,18 @@ inline rtl::Reference< ::xmloff::OFormLayerXMLImport > SvXMLImport::GetFormImpor
 }
 
 inline void SvXMLImport::SetEmbeddedResolver(
-    com::sun::star::uno::Reference< com::sun::star::document::XEmbeddedObjectResolver >& _xEmbeddedResolver )
+    css::uno::Reference< css::document::XEmbeddedObjectResolver >& _xEmbeddedResolver )
 {
     mxEmbeddedResolver = _xEmbeddedResolver;
 }
 
 inline void SvXMLImport::SetGraphicResolver(
-    com::sun::star::uno::Reference< com::sun::star::document::XGraphicObjectResolver >& _xGraphicResolver )
+    css::uno::Reference< css::document::XGraphicObjectResolver >& _xGraphicResolver )
 {
     mxGraphicResolver = _xGraphicResolver;
 }
 
-inline ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & SvXMLImport::GetNumberFormatsSupplier()
+inline css::uno::Reference< css::util::XNumberFormatsSupplier > & SvXMLImport::GetNumberFormatsSupplier()
 {
     if ( ! mxNumberFormatsSupplier.is() && mxModel.is() )
         _CreateNumberFormatsSupplier();
diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx
index 9011c21a3645..8469fe3f0df5 100644
--- a/include/xmloff/xmlimppr.hxx
+++ b/include/xmloff/xmlimppr.hxx
@@ -84,8 +84,7 @@ public:
       */
     void importXML(
             ::std::vector< XMLPropertyState >& rProperties,
-            ::com::sun::star::uno::Reference<
-                    ::com::sun::star::xml::sax::XAttributeList > xAttrList,
+            css::uno::Reference< css::xml::sax::XAttributeList > xAttrList,
             const SvXMLUnitConverter& rUnitConverter,
             const SvXMLNamespaceMap& rNamespaceMap,
             sal_uInt32 nPropType,
@@ -106,19 +105,17 @@ public:
 
     void CheckSpecialContext(
             const ::std::vector< XMLPropertyState >& rProperties,
-            const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::beans::XPropertySet >& rPropSet,
+            const css::uno::Reference< css::beans::XPropertySet >& rPropSet,
             _ContextID_Index_Pair* pSpecialContextIds ) const;
 
     bool FillPropertySet(
             const ::std::vector< XMLPropertyState >& rProperties,
-            const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::beans::XPropertySet >& rPropSet,
+            const css::uno::Reference< css::beans::XPropertySet >& rPropSet,
             _ContextID_Index_Pair* pSpecialContextIds = NULL ) const;
 
     void FillPropertySequence(
             const ::std::vector< XMLPropertyState >& aProperties,
-            ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rValues )
+            css::uno::Sequence< css::beans::PropertyValue >& rValues )
             const;
 
     inline const rtl::Reference< XMLPropertySetMapper >&
@@ -130,10 +127,8 @@ public:
      * Exceptions will be asserted. */
     static bool _FillPropertySet(
         const ::std::vector<XMLPropertyState> & rProperties,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet> & rPropSet,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySetInfo> & rPropSetInfo,
+        const css::uno::Reference< css::beans::XPropertySet> & rPropSet,
+        const css::uno::Reference< css::beans::XPropertySetInfo> & rPropSetInfo,
         const rtl::Reference<XMLPropertySetMapper> & rPropMapper,
         SvXMLImport& rImport,
 
@@ -145,10 +140,8 @@ public:
      * If unsuccessul, set return value. */
     static bool _FillMultiPropertySet(
         const ::std::vector<XMLPropertyState> & rProperties,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XMultiPropertySet> & rMultiPropSet,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySetInfo> & rPropSetInfo,
+        const css::uno::Reference< css::beans::XMultiPropertySet> & rMultiPropSet,
+        const css::uno::Reference< css::beans::XPropertySetInfo> & rPropSetInfo,
         const rtl::Reference<XMLPropertySetMapper> & rPropMapper,
 
         // parameters for use by txtstyli.cxx; allows efficient
@@ -159,8 +152,7 @@ public:
      * If unsuccessul, set return value. */
     static bool _FillTolerantMultiPropertySet(
         const ::std::vector<XMLPropertyState> & rProperties,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XTolerantMultiPropertySet> & rTolPropSet,
+        const css::uno::Reference< css::beans::XTolerantMultiPropertySet> & rTolPropSet,
         const rtl::Reference<XMLPropertySetMapper> & rPropMapper,
         SvXMLImport& rImport,
 
@@ -171,12 +163,11 @@ public:
 
     static void _PrepareForMultiPropertySet(
         const ::std::vector<XMLPropertyState> & rProperties,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySetInfo> & rPropSetInfo,
+        const css::uno::Reference< css::beans::XPropertySetInfo> & rPropSetInfo,
         const rtl::Reference<XMLPropertySetMapper> & rPropMapper,
         _ContextID_Index_Pair* pSpecialContextIds,
-        ::com::sun::star::uno::Sequence< OUString >& rNames,
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues);
+        css::uno::Sequence< OUString >& rNames,
+        css::uno::Sequence< css::uno::Any >& rValues);
 };
 
 
diff --git a/include/xmloff/xmlmetae.hxx b/include/xmloff/xmlmetae.hxx
index e61fae7b28cb..4fb72d029555 100644
--- a/include/xmloff/xmlmetae.hxx
+++ b/include/xmloff/xmlmetae.hxx
@@ -47,22 +47,21 @@ class SvXMLExport;
     </p>
  */
 class XMLOFF_DLLPUBLIC SvXMLMetaExport : public ::cppu::WeakImplHelper1<
-                ::com::sun::star::xml::sax::XDocumentHandler >
+                css::xml::sax::XDocumentHandler >
 {
 private:
     SvXMLExport& mrExport;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::document::XDocumentProperties> mxDocProps;
+    css::uno::Reference< css::document::XDocumentProperties> mxDocProps;
     /// counts levels of the xml document. necessary for special handling.
     int m_level;
     /// preserved namespaces. necessary because we do not write the root node.
-    std::vector< ::com::sun::star::beans::StringPair > m_preservedNSs;
+    std::vector< css::beans::StringPair > m_preservedNSs;
 
     SAL_DLLPRIVATE void SimpleStringElement(
         const OUString& rText, sal_uInt16 nNamespace,
         enum ::xmloff::token::XMLTokenEnum eElementName );
     SAL_DLLPRIVATE void SimpleDateTimeElement(
-        const ::com::sun::star::util::DateTime & rDate, sal_uInt16 nNamespace,
+        const css::util::DateTime & rDate, sal_uInt16 nNamespace,
         enum ::xmloff::token::XMLTokenEnum eElementName );
 
     /// currently unused; for exporting via the XDocumentProperties interface
@@ -70,8 +69,7 @@ private:
 
 public:
     SvXMLMetaExport( SvXMLExport& i_rExport,
-        const ::com::sun::star::uno::Reference<
-                ::com::sun::star::document::XDocumentProperties>& i_rDocProps);
+        const css::uno::Reference< css::document::XDocumentProperties>& i_rDocProps);
 
     virtual ~SvXMLMetaExport();
 
@@ -79,39 +77,39 @@ public:
     void Export();
 
     static OUString GetISODateTimeString(
-                        const ::com::sun::star::util::DateTime& rDateTime );
+                        const css::util::DateTime& rDateTime );
 
-    // ::com::sun::star::xml::sax::XDocumentHandler:
+    // css::xml::sax::XDocumentHandler:
     virtual void SAL_CALL startDocument()
-        throw (::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::xml::sax::SAXException, std::exception) override;
+        throw (css::uno::RuntimeException,
+               css::xml::sax::SAXException, std::exception) override;
     virtual void SAL_CALL endDocument()
-        throw (::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::xml::sax::SAXException, std::exception) override;
+        throw (css::uno::RuntimeException,
+               css::xml::sax::SAXException, std::exception) override;
     virtual void SAL_CALL startElement(const OUString & i_rName,
-        const ::com::sun::star::uno::Reference<
-                ::com::sun::star::xml::sax::XAttributeList > & i_xAttribs)
-        throw (::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference<
+                css::xml::sax::XAttributeList > & i_xAttribs)
+        throw (css::uno::RuntimeException,
+               css::xml::sax::SAXException, std::exception) override;
     virtual void SAL_CALL endElement(const OUString & i_rName)
-        throw (::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::xml::sax::SAXException, std::exception) override;
+        throw (css::uno::RuntimeException,
+               css::xml::sax::SAXException, std::exception) override;
     virtual void SAL_CALL characters(const OUString & i_rChars)
-        throw (::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::xml::sax::SAXException, std::exception) override;
+        throw (css::uno::RuntimeException,
+               css::xml::sax::SAXException, std::exception) override;
     virtual void SAL_CALL ignorableWhitespace(
         const OUString & i_rWhitespaces)
-        throw (::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::xml::sax::SAXException, std::exception) override;
+        throw (css::uno::RuntimeException,
+               css::xml::sax::SAXException, std::exception) override;
     virtual void SAL_CALL processingInstruction(
         const OUString & i_rTarget, const OUString & i_rData)
-        throw (::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::xml::sax::SAXException, std::exception) override;
+        throw (css::uno::RuntimeException,
+               css::xml::sax::SAXException, std::exception) override;
     virtual void SAL_CALL setDocumentLocator(
-        const ::com::sun::star::uno::Reference<
-                ::com::sun::star::xml::sax::XLocator > & i_xLocator)
-        throw (::com::sun::star::uno::RuntimeException,
-               ::com::sun::star::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference<
+                css::xml::sax::XLocator > & i_xLocator)
+        throw (css::uno::RuntimeException,
+               css::xml::sax::SAXException, std::exception) override;
 
 };
 
diff --git a/include/xmloff/xmlmetai.hxx b/include/xmloff/xmlmetai.hxx
index 240d3fd4c9ff..12ec431ba6af 100644
--- a/include/xmloff/xmlmetai.hxx
+++ b/include/xmloff/xmlmetai.hxx
@@ -36,32 +36,27 @@ class XMLOFF_DLLPUBLIC SvXMLMetaDocumentContext
     : public virtual SvXMLImportContext
 {
 private:
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::document::XDocumentProperties> mxDocProps;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::dom::XSAXDocumentBuilder2> mxDocBuilder;
+    css::uno::Reference< css::document::XDocumentProperties> mxDocProps;
+    css::uno::Reference< css::xml::dom::XSAXDocumentBuilder2> mxDocBuilder;
 
 public:
     SvXMLMetaDocumentContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::document::XDocumentProperties>& xDocProps);
+        const css::uno::Reference< css::document::XDocumentProperties>& xDocProps);
 
     virtual ~SvXMLMetaDocumentContext();
 
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
 
-    virtual void StartElement( const ::com::sun::star::uno::Reference<
-             ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
+    virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
 
     virtual void EndElement() override;
 
 public:
     static void setBuildId(const OUString & rGenerator,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xImportInfo );
+        const css::uno::Reference< css::beans::XPropertySet>& xImportInfo );
 };
 
 #endif // _ INCLUDED_XMLOFF_XMLMETAI_HXX
diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx
index 2301e00df6ed..44124ed6c5ca 100644
--- a/include/xmloff/xmlnume.hxx
+++ b/include/xmloff/xmlnume.hxx
@@ -51,8 +51,7 @@ class XMLOFF_DLLPUBLIC SvxXMLNumRuleExport
 
     SAL_DLLPRIVATE void exportLevelStyle(
             sal_Int32 nLevel,
-            const ::com::sun::star::uno::Sequence<
-                ::com::sun::star::beans::PropertyValue>& rProps,
+            const css::uno::Sequence< css::beans::PropertyValue>& rProps,
             bool bOutline=false );
 
 protected:
@@ -60,8 +59,7 @@ protected:
     /// Override this to add attributes to the <list-style> element.
     SAL_DLLPRIVATE virtual void AddListStyleAttributes();
 
-    SAL_DLLPRIVATE bool exportStyle( const ::com::sun::star::uno::Reference<
-                            ::com::sun::star::style::XStyle >& rStyle );
+    SAL_DLLPRIVATE bool exportStyle( const css::uno::Reference< css::style::XStyle >& rStyle );
     SAL_DLLPRIVATE void exportOutline();
 
     SvXMLExport& GetExport() { return rExport; }
@@ -73,8 +71,7 @@ public:
 
     // should be private but sw::StoredChapterNumberingExport needs it
     void exportLevelStyles(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::container::XIndexReplace > & xNumRule,
+            const css::uno::Reference< css::container::XIndexReplace > & xNumRule,
             bool bOutline=false );
 
     void exportStyles( bool bUsed,
@@ -82,8 +79,7 @@ public:
                        bool bExportChapterNumbering = true );
     void exportNumberingRule(
             const OUString& rName, bool bIsHidden,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::container::XIndexReplace > & xNumRule );
+            const css::uno::Reference< css::container::XIndexReplace > & xNumRule );
 };
 
 #endif // INCLUDED_XMLOFF_XMLNUME_HXX
diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index 2463b6ea95d3..3ece1bc82400 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -90,7 +90,7 @@ private:
 
     SAL_DLLPRIVATE void WriteRepeatedElement_Impl( sal_Unicode ch );
     SAL_DLLPRIVATE bool WriteTextWithCurrency_Impl( const OUString& rString,
-                            const ::com::sun::star::lang::Locale& rLocale );
+                            const css::lang::Locale& rLocale );
     SAL_DLLPRIVATE void ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt32 nKey,
                                 sal_uInt16 nPart, bool bDefPart );
 
@@ -98,11 +98,9 @@ private:
 
 public:
     SvXMLNumFmtExport( SvXMLExport& rExport,
-                       const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::util::XNumberFormatsSupplier >& rSupp );
+                       const css::uno::Reference< css::util::XNumberFormatsSupplier >& rSupp );
     SvXMLNumFmtExport( SvXMLExport& rExport,
-                       const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::util::XNumberFormatsSupplier >& rSupp,
+                       const css::uno::Reference< css::util::XNumberFormatsSupplier >& rSupp,
                        const OUString& rPrefix );
 
     virtual ~SvXMLNumFmtExport();
@@ -116,8 +114,8 @@ public:
     // get the style name that was generated for a key
     OUString GetStyleName( sal_uInt32 nKey );
 
-    void GetWasUsed(com::sun::star::uno::Sequence<sal_Int32>& rWasUsed);
-    void SetWasUsed(const com::sun::star::uno::Sequence<sal_Int32>& rWasUsed);
+    void GetWasUsed(css::uno::Sequence<sal_Int32>& rWasUsed);
+    void SetWasUsed(const css::uno::Sequence<sal_Int32>& rWasUsed);
 
 
 
diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index a9795041a784..7f057284be5e 100644
--- a/include/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
@@ -76,20 +76,20 @@ class SvXMLNumFmtHelper
 
 public:
     SvXMLNumFmtHelper(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& rSupp,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+        const css::uno::Reference< css::util::XNumberFormatsSupplier >& rSupp,
+        const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     SvXMLNumFmtHelper(
         SvNumberFormatter* pNumberFormatter,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+        const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     ~SvXMLNumFmtHelper();
 
     SvXMLStyleContext*  CreateChildContext( SvXMLImport& rImport,
-                sal_uInt16 nPrefix, const OUString& rLocalName,
-                const ::com::sun::star::uno::Reference<
-                      ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
-                    SvXMLStylesContext& rStyles);
+                sal_uInt16 nPrefix,
+                const OUString& rLocalName,
+                const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
+                SvXMLStylesContext& rStyles);
 
     SvXMLNumImpData* getData() { return pData; }
 
@@ -129,7 +129,7 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext
 //  OUString       sMapName;
     OUString       sCalendar;
     LanguageType   nFormatLang;
-    com::sun::star::lang::Locale    aLocale;
+    css::lang::Locale    aLocale;
     bool            bAutoOrder;
     bool            bFromSystem;
     bool            bTruncate;
@@ -156,31 +156,31 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext
     SAL_DLLPRIVATE sal_Int32 PrivateGetKey();
 
 public:
-                SvXMLNumFormatContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+                SvXMLNumFormatContext( SvXMLImport& rImport,
+                sal_uInt16 nPrfx,
                                     const OUString& rLName,
-                                    SvXMLNumImpData* pNewData, sal_uInt16 nNewType,
-                                    const ::com::sun::star::uno::Reference<
-                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
+                                    SvXMLNumImpData* pNewData,
+                                    sal_uInt16 nNewType,
+                                    const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
                                     SvXMLStylesContext& rStyles );
-                SvXMLNumFormatContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+                SvXMLNumFormatContext( SvXMLImport& rImport,
+                                    sal_uInt16 nPrfx,
                                     const OUString& rLName,
-                                    const ::com::sun::star::uno::Reference<
-                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
+                                    const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
                                     const sal_Int32 nKey,
                                     SvXMLStylesContext& rStyles );
     virtual     ~SvXMLNumFormatContext();
 
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                     const OUString& rLocalName,
-                                    const ::com::sun::star::uno::Reference<
-                                          ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
+                                    const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
     virtual void CreateAndInsert(bool bOverwrite) override;
     virtual void Finish(bool bOverwrite) override;
 
     SvXMLNumImpData* GetData() const                { return pData; }
     sal_Int32 GetKey();
     sal_Int32 CreateAndInsert( SvNumberFormatter* pFormatter );
-    sal_Int32 CreateAndInsert( com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier >& xFormatsSupplier );
+    sal_Int32 CreateAndInsert( css::uno::Reference< css::util::XNumberFormatsSupplier >& xFormatsSupplier );
     sal_uInt16 GetType() const                      { return nType; }   // SvXMLStylesTokens
 
     bool HasLongDoW() const                     { return bHasLongDoW; }
diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index cbe7edf8770a..cea785ac8900 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -37,8 +37,7 @@ class XMLOFF_DLLPUBLIC SvxXMLListStyleContext
     const OUString       sNumberingRules;
     const OUString       sIsContinuousNumbering;
 
-    ::com::sun::star::uno::Reference <
-        ::com::sun::star::container::XIndexReplace > xNumRules;
+    css::uno::Reference< css::container::XIndexReplace > xNumRules;
 
     SvxXMLListStyle_Impl        *pLevelStyles;
 
@@ -57,10 +56,10 @@ public:
     TYPEINFO_OVERRIDE();
 
     SvxXMLListStyleContext(
-            SvXMLImport& rImport, sal_uInt16 nPrfx,
+            SvXMLImport& rImport,
+            sal_uInt16 nPrfx,
             const OUString& rLName,
-            const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
+            const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
             bool bOutl = false );
 
     virtual ~SvxXMLListStyleContext();
@@ -68,26 +67,20 @@ public:
     virtual SvXMLImportContext *CreateChildContext(
             sal_uInt16 nPrefix,
             const OUString& rLocalName,
-            const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
+            const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
 
     void FillUnoNumRule(
-            const css::uno::Reference<
-                    css::container::XIndexReplace> & rNumRule) const;
+            const css::uno::Reference< css::container::XIndexReplace> & rNumRule) const;
 
-    const ::com::sun::star::uno::Reference <
-        ::com::sun::star::container::XIndexReplace >& GetNumRules() const
+    const css::uno::Reference< css::container::XIndexReplace >& GetNumRules() const
         { return xNumRules; }
 
-    static ::com::sun::star::uno::Reference <
-        ::com::sun::star::container::XIndexReplace >
+    static css::uno::Reference< css::container::XIndexReplace >
     CreateNumRule(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::frame::XModel > & rModel );
+        const css::uno::Reference< css::frame::XModel > & rModel );
 
     static void SetDefaultStyle(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::container::XIndexReplace > & rNumRule,
+        const css::uno::Reference< css::container::XIndexReplace > & rNumRule,
         sal_Int16 nLevel,
         bool bOrdered );
 
diff --git a/include/xmloff/xmlprcon.hxx b/include/xmloff/xmlprcon.hxx
index 4ba1be45583b..e322a2238126 100644
--- a/include/xmloff/xmlprcon.hxx
+++ b/include/xmloff/xmlprcon.hxx
@@ -41,7 +41,7 @@ public:
     SvXMLPropertySetContext(
             SvXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
+            const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
             sal_uInt32 nFamily,
             ::std::vector< XMLPropertyState > &rProps,
             const rtl::Reference < SvXMLImportPropertyMapper > &rMap,
@@ -51,14 +51,14 @@ public:
 
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const OUString& rLocalName,
-                                     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
+                                     const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
 
     // This method is called from this instance implementation of
     // CreateChildContext if the element matches an entry in the
     // SvXMLImportItemMapper with the mid flag MID_FLAG_ELEMENT_ITEM_IMPORT
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const OUString& rLocalName,
-                                   const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
+                                   const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
                                    ::std::vector< XMLPropertyState > &rProperties,
                                    const XMLPropertyState& rProp );
 
diff --git a/include/xmloff/xmlprhdl.hxx b/include/xmloff/xmlprhdl.hxx
index b57da8740ed4..c2c9d8e5aabb 100644
--- a/include/xmloff/xmlprhdl.hxx
+++ b/include/xmloff/xmlprhdl.hxx
@@ -45,12 +45,12 @@ public:
 
     /** Compares two Any's in case of the given XML-data-type.
         By default the Any-equal-operator is called. */
-    virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const;
+    virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const;
 
     /// Imports the given value in cas of the given XML-data-type
-    virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0;
+    virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0;
     /// Exports the given value in cas of the given XML-data-type
-    virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0;
+    virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0;
 };
 
 #endif // INCLUDED_XMLOFF_XMLPRHDL_HXX
diff --git a/include/xmloff/xmlscripti.hxx b/include/xmloff/xmlscripti.hxx
index bad1e87280a9..1cbce08a7f97 100644
--- a/include/xmloff/xmlscripti.hxx
+++ b/include/xmloff/xmlscripti.hxx
@@ -31,20 +31,19 @@ namespace com { namespace sun { namespace star { namespace frame {
 class XMLOFF_DLLPUBLIC XMLScriptContext : public SvXMLImportContext
 {
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel;
+    css::uno::Reference< css::frame::XModel > m_xModel;
 
 public:
-    XMLScriptContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
-                        const OUString& rLName,
-                        const ::com::sun::star::uno::Reference<
-                            ::com::sun::star::frame::XModel>& rDocModel );
+    XMLScriptContext( SvXMLImport& rImport,
+                      sal_uInt16 nPrfx,
+                      const OUString& rLName,
+                      const css::uno::Reference< css::frame::XModel>& rDocModel );
     virtual ~XMLScriptContext();
 
     // Create child element.
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                 const OUString& rLocalName,
-                const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
+                const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
 
     virtual void EndElement() override;
 };
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 2d2e1e76adcd..f3aa917fb5b9 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -94,8 +94,7 @@ public:
 
     SvXMLStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLName,
-        const ::com::sun::star::uno::Reference<
-              ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
               sal_uInt16 nFamily=0,
               bool bDefaultStyle = false );
 
@@ -103,12 +102,10 @@ public:
 
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
 
     virtual void StartElement(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
 
     const OUString&  GetName() const { return maName; }
     const OUString&  GetDisplayName() const { return maDisplayName.getLength() ? maDisplayName : maName; }
@@ -163,17 +160,13 @@ class XMLOFF_DLLPUBLIC SvXMLStylesContext : public SvXMLImportContext
     SvXMLTokenMap           *mpStyleStylesElemTokenMap;
 
 
-    ::com::sun::star::uno::Reference <
-                    ::com::sun::star::container::XNameContainer > mxParaStyles;
+    css::uno::Reference< css::container::XNameContainer > mxParaStyles;
 
-    ::com::sun::star::uno::Reference <
-                    ::com::sun::star::container::XNameContainer > mxTextStyles;
+    css::uno::Reference< css::container::XNameContainer > mxTextStyles;
 
-    ::com::sun::star::uno::Reference <
-                    ::com::sun::star::style::XAutoStyleFamily > mxParaAutoStyles;
+    css::uno::Reference< css::style::XAutoStyleFamily > mxParaAutoStyles;
 
-    ::com::sun::star::uno::Reference <
-                    ::com::sun::star::style::XAutoStyleFamily > mxTextAutoStyles;
+    css::uno::Reference< css::style::XAutoStyleFamily > mxTextAutoStyles;
 
     rtl::Reference < SvXMLImportPropertyMapper > mxParaImpPropMapper;
     rtl::Reference < SvXMLImportPropertyMapper > mxTextImpPropMapper;
@@ -194,19 +187,16 @@ protected:
 
     virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
 
     virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily,
         sal_uInt16 nPrefix, const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
 
     virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext(
         sal_uInt16 nFamily, sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
 
     virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const;
 
@@ -215,8 +205,7 @@ public:
 
     SvXMLStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
         bool bAutomatic = false );
 
     virtual ~SvXMLStylesContext();
@@ -224,8 +213,7 @@ public:
     // Create child element.
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
 
     // Override this method to insert styles into the document.
     virtual void EndElement() override;
@@ -241,12 +229,11 @@ public:
     virtual rtl::Reference < SvXMLImportPropertyMapper > GetImportPropertyMapper(
                         sal_uInt16 nFamily ) const;
 
-    virtual ::com::sun::star::uno::Reference <
-                    ::com::sun::star::container::XNameContainer >
+    virtual css::uno::Reference< css::container::XNameContainer >
         GetStylesContainer( sal_uInt16 nFamily ) const;
     virtual OUString GetServiceName( sal_uInt16 nFamily ) const;
 
-       ::com::sun::star::uno::Reference < ::com::sun::star::style::XAutoStyleFamily >
+    css::uno::Reference< css::style::XAutoStyleFamily >
         GetAutoStyles( sal_uInt16 nFamily ) const;
     void CopyAutoStylesToDoc();
     void CopyStylesToDoc( bool bOverwrite, bool bFinish = true );
diff --git a/include/xmloff/xmltabe.hxx b/include/xmloff/xmltabe.hxx
index 833700544828..140d3b634c34 100644
--- a/include/xmloff/xmltabe.hxx
+++ b/include/xmloff/xmltabe.hxx
@@ -36,7 +36,7 @@ class SvxXMLTabStopExport
 
 protected:
 
-    void exportTabStop( const ::com::sun::star::style::TabStop* pTabStop );
+    void exportTabStop( const css::style::TabStop* pTabStop );
 
 public:
 
@@ -44,7 +44,7 @@ public:
     virtual ~SvxXMLTabStopExport();
 
     // core API
-    void Export( const ::com::sun::star::uno::Any& rAny );
+    void Export( const css::uno::Any& rAny );
 };
 
 
diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index 74bc8143c519..2074622d8864 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -89,8 +89,7 @@ public:
         default unit for numerical measures, the XML measure unit is
         the default unit for textual measures */
     SvXMLUnitConverter(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::uno::XComponentContext >& xContext,
+        const css::uno::Reference< css::uno::XComponentContext >& xContext,
         sal_Int16 eCoreMeasureUnit /*css::util::MeasureUnit*/,
         sal_Int16 eXMLMeasureUnit /*css::util::MeasureUnit*/);
 
@@ -108,8 +107,7 @@ public:
     sal_Int16 GetXMLMeasureUnit() const;
 
     /** gets XNumberingTypeInfo */
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::text::XNumberingTypeInfo >& getNumTypeInfo() const;
+    const css::uno::Reference< css::text::XNumberingTypeInfo >& getNumTypeInfo() const;
 
     /** convert string to measure with meCoreMeasureUnit,
         using optional min and max values*/
@@ -154,7 +152,7 @@ public:
 
     /** get the Null Date of the XModel and set it to the UnitConverter */
     bool setNullDate (
-        const com::sun::star::uno::Reference <com::sun::star::frame::XModel>& xModel);
+        const css::uno::Reference <css::frame::XModel>& xModel);
 
     /** convert double to ISO Date Time String */
     void convertDateTime( OUStringBuffer& rBuffer,
@@ -170,12 +168,12 @@ public:
     /** convert double to ISO Date Time String */
     static void convertDateTime( OUStringBuffer& rBuffer,
                                 const double& fDateTime,
-                                const com::sun::star::util::Date& aNullDate,
-                                   bool bAddTimeIf0AM = false);
+                                const css::util::Date& aNullDate,
+                                bool bAddTimeIf0AM = false);
     /** convert ISO Date Time String to double */
     static bool convertDateTime( double& fDateTime,
                                 const OUString& rString,
-                                const com::sun::star::util::Date& aNullDate);
+                                const css::util::Date& aNullDate);
 
 
     /** convert string to ::basegfx::B3DVector */
@@ -187,19 +185,19 @@ public:
         const ::basegfx::B3DVector& rVector );
 
     /** convert string to Position3D */
-    bool convertPosition3D( com::sun::star::drawing::Position3D& rPosition,
+    bool convertPosition3D( css::drawing::Position3D& rPosition,
                               const OUString& rValue );
 
     /** convert Position3D to string */
     void convertPosition3D( OUStringBuffer &rBuffer,
-                              const com::sun::star::drawing::Position3D& rVector );
+                              const css::drawing::Position3D& rVector );
 
 
     /** convert num-forat and num-letter-sync values to NumberingType */
     bool convertNumFormat( sal_Int16& rType,
-                                const OUString& rNumFormat,
-                               const OUString& rNumLetterSync,
-                               bool bNumberNone = false ) const;
+                           const OUString& rNumFormat,
+                           const OUString& rNumLetterSync,
+                           bool bNumberNone = false ) const;
 
     /** convert NumberingType to num-forat and num-letter-sync values */
     void convertNumFormat( OUStringBuffer& rBuffer,
@@ -207,10 +205,10 @@ public:
     static void convertNumLetterSync( OUStringBuffer& rBuffer,
                                   sal_Int16 nType );
 
-    static void convertPropertySet(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps,
-                        const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& aProperties);
-    static void convertPropertySet(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& rProperties,
-                        const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps);
+    static void convertPropertySet(css::uno::Sequence<css::beans::PropertyValue>& rProps,
+                        const css::uno::Reference<css::beans::XPropertySet>& aProperties);
+    static void convertPropertySet(css::uno::Reference<css::beans::XPropertySet>& rProperties,
+                        const css::uno::Sequence<css::beans::PropertyValue>& aProps);
 
     OUString encodeStyleName( const OUString& rName,
                                      bool *pEncoded=0 ) const;