com::sun::star->css in lotuswordpro,mysqlc,oox

Change-Id: Id99ff87c4eb3f1b36702261ce63d5d2793ea35d7

23 files changed, 111 insertions, 106 deletions

diff --git a/oox/inc/drawingml/chart/axisconverter.hxx b/oox/inc/drawingml/chart/axisconverter.hxx
index fd464add9eb7..3ef4f4e85878 100644
--- a/oox/inc/drawingml/chart/axisconverter.hxx
+++ b/oox/inc/drawingml/chart/axisconverter.hxx
@@ -45,7 +45,7 @@ public:
 
     /** Creates a chart2 axis and inserts it into the passed coordinate system. */
     void                convertFromModel(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& rxAxis);
+                            const css::uno::Reference< css::chart2::XAxis >& rxAxis);
 };
 
 struct AxisModel;
diff --git a/oox/inc/drawingml/chart/chartdrawingfragment.hxx b/oox/inc/drawingml/chart/chartdrawingfragment.hxx
index c8043bf1dc99..8347e0de1887 100644
--- a/oox/inc/drawingml/chart/chartdrawingfragment.hxx
+++ b/oox/inc/drawingml/chart/chartdrawingfragment.hxx
@@ -85,9 +85,9 @@ public:
     explicit            ChartDrawingFragment(
                             ::oox::core::XmlFilterBase& rFilter,
                             const OUString& rFragmentPath,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxDrawPage,
-                            const ::com::sun::star::awt::Size& rChartSize,
-                            const ::com::sun::star::awt::Point& rShapesOffset,
+                            const css::uno::Reference< css::drawing::XShapes >& rxDrawPage,
+                            const css::awt::Size& rChartSize,
+                            const css::awt::Point& rShapesOffset,
                             bool bOleSupport );
     virtual             ~ChartDrawingFragment();
 
@@ -96,7 +96,7 @@ public:
     virtual void        onEndElement() override;
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >
+    css::uno::Reference< css::drawing::XShapes >
                         mxDrawPage;             /// Drawing page of this sheet.
     ::oox::drawingml::ShapePtr mxShape;         /// Current top-level shape.
     ShapeAnchorRef      mxAnchor;               /// Current anchor of top-level shape.
diff --git a/oox/inc/drawingml/chart/chartspaceconverter.hxx b/oox/inc/drawingml/chart/chartspaceconverter.hxx
index 6651bbeea68b..62b77a610bd4 100644
--- a/oox/inc/drawingml/chart/chartspaceconverter.hxx
+++ b/oox/inc/drawingml/chart/chartspaceconverter.hxx
@@ -42,8 +42,8 @@ public:
 
     /** Converts the contained OOXML chart model to a chart2 document. */
     void                convertFromModel(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxExternalPage,
-                            const ::com::sun::star::awt::Point& rChartPos );
+                            const css::uno::Reference< css::drawing::XShapes >& rxExternalPage,
+                            const css::awt::Point& rChartPos );
 };
 
 
diff --git a/oox/inc/drawingml/chart/converterbase.hxx b/oox/inc/drawingml/chart/converterbase.hxx
index 52a7072e2ad1..9393a302e05b 100644
--- a/oox/inc/drawingml/chart/converterbase.hxx
+++ b/oox/inc/drawingml/chart/converterbase.hxx
@@ -62,14 +62,14 @@ public:
                             ::oox::core::XmlFilterBase& rFilter,
                             ChartConverter& rChartConverter,
                             const ChartSpaceModel& rChartModel,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc,
-                            const ::com::sun::star::awt::Size& rChartSize );
+                            const css::uno::Reference< css::chart2::XChartDocument >& rxChartDoc,
+                            const css::awt::Size& rChartSize );
     virtual             ~ConverterRoot();
 
     /** Creates an instance for the passed service name, using the process service factory. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
+    css::uno::Reference< css::uno::XInterface >
                         createInstance( const OUString& rServiceName ) const;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
+    css::uno::Reference< css::uno::XComponentContext >
                         getComponentContext() const;
 
 protected:
@@ -78,17 +78,17 @@ protected:
     /** Returns the chart converter. */
     ChartConverter&     getChartConverter() const;
     /** Returns the API chart document model. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >
+    css::uno::Reference< css::chart2::XChartDocument >
                         getChartDocument() const;
     /** Returns the position and size of the chart shape in 1/100 mm. */
-    const ::com::sun::star::awt::Size& getChartSize() const;
+    const css::awt::Size& getChartSize() const;
     /** Returns the object formatter. */
     ObjectFormatter&    getFormatter() const;
 
     /** Registers a title object and its layout data, needed for conversion of
         the title position using the old Chart1 API. */
     void                registerTitleLayout(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle >& rxTitle,
+                            const css::uno::Reference< css::chart2::XTitle >& rxTitle,
                             const ModelRef< LayoutModel >& rxLayout, ObjectType eObjType,
                             sal_Int32 nMainIdx = -1, sal_Int32 nSubIdx = -1 );
     /** Converts the positions of the main title and all axis titles. */
@@ -130,7 +130,7 @@ public:
 
     /** Tries to calculate the absolute position and size from the contained
         OOXML layout model. Returns true, if returned rectangle is valid. */
-    bool                calcAbsRectangle( ::com::sun::star::awt::Rectangle& orRect ) const;
+    bool                calcAbsRectangle( css::awt::Rectangle& orRect ) const;
 
     /** Tries to set the position and size from the contained OOXML layout model.
         Returns true, if a manual position and size could be calculated. */
@@ -139,7 +139,7 @@ public:
     /** Tries to set the position from the contained OOXML layout model.
         Returns true, if a manual position could be calculated. */
     bool                convertFromModel(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape,
+                            const css::uno::Reference< css::drawing::XShape >& rxShape,
                             double fRotationAngle );
     bool getAutoLayout(){return mrModel.mbAutoLayout;}
 };
diff --git a/oox/inc/drawingml/chart/datasourceconverter.hxx b/oox/inc/drawingml/chart/datasourceconverter.hxx
index 9935499543c1..77fa3f9edccf 100644
--- a/oox/inc/drawingml/chart/datasourceconverter.hxx
+++ b/oox/inc/drawingml/chart/datasourceconverter.hxx
@@ -41,7 +41,7 @@ public:
     virtual             ~DataSequenceConverter();
 
     /** Creates a data sequence object from the contained formula link. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >
+    css::uno::Reference< css::chart2::data::XDataSequence >
                         createDataSequence( const OUString& rRole );
 };
 
@@ -56,7 +56,7 @@ public:
     virtual             ~DataSourceConverter();
 
     /** Creates a data sequence object from the contained series data. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >
+    css::uno::Reference< css::chart2::data::XDataSequence >
                         createDataSequence( const OUString& rRole );
 };
 
diff --git a/oox/inc/drawingml/chart/objectformatter.hxx b/oox/inc/drawingml/chart/objectformatter.hxx
index 1e4d6b6e6a0e..3b632eff2626 100644
--- a/oox/inc/drawingml/chart/objectformatter.hxx
+++ b/oox/inc/drawingml/chart/objectformatter.hxx
@@ -74,7 +74,7 @@ class ObjectFormatter
 public:
     explicit            ObjectFormatter(
                             const ::oox::core::XmlFilterBase& rFilter,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc,
+                            const css::uno::Reference< css::chart2::XChartDocument >& rxChartDoc,
                             const ChartSpaceModel& rChartSpace );
                         ~ObjectFormatter();
 
diff --git a/oox/inc/drawingml/chart/plotareaconverter.hxx b/oox/inc/drawingml/chart/plotareaconverter.hxx
index fd95cde7b184..ed8c1c59092b 100644
--- a/oox/inc/drawingml/chart/plotareaconverter.hxx
+++ b/oox/inc/drawingml/chart/plotareaconverter.hxx
@@ -43,7 +43,7 @@ public:
 
     /** Converts the OOXML plot area model to a chart2 diagram. */
     void                convertFromModel(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& rxDiagram,
+                            const css::uno::Reference< css::chart2::XDiagram >& rxDiagram,
                             TypeGroupConverter& rTypeGroup );
 };
 
@@ -59,7 +59,7 @@ public:
 
     /** Converts the OOXML wall/floor model to a chart2 diagram. */
     void                convertFromModel(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& rxDiagram,
+                            const css::uno::Reference< css::chart2::XDiagram >& rxDiagram,
                             ObjectType eObjType );
 };
 
@@ -75,7 +75,7 @@ public:
 
     /** Converts the OOXML data table model to a chart2 diagram. */
     void                convertFromModel(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& rxDiagram);
+                            const css::uno::Reference< css::chart2::XDiagram >& rxDiagram);
 };
 
 
@@ -94,12 +94,12 @@ public:
     void                convertPositionFromModel();
 
     /** Returns the automatic chart title if the chart contains only one series. */
-    const OUString& getAutomaticTitle() const { return maAutoTitle; }
+    const OUString&     getAutomaticTitle() const { return maAutoTitle; }
     /** Returns true, if chart type supports wall and floor format in 3D mode. */
-    bool         isWall3dChart() const { return mbWall3dChart; }
+    bool                isWall3dChart() const { return mbWall3dChart; }
 
 private:
-    OUString     maAutoTitle;
+    OUString            maAutoTitle;
     bool                mb3dChart;
     bool                mbWall3dChart;
     bool                mbPieChart;
diff --git a/oox/inc/drawingml/chart/seriesconverter.hxx b/oox/inc/drawingml/chart/seriesconverter.hxx
index 9971a55f57de..82b63060dd39 100644
--- a/oox/inc/drawingml/chart/seriesconverter.hxx
+++ b/oox/inc/drawingml/chart/seriesconverter.hxx
@@ -47,7 +47,7 @@ public:
 
     /** Converts OOXML data label settings for the passed data point. */
     void                convertFromModel(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& rxDataSeries,
+                            const css::uno::Reference< css::chart2::XDataSeries >& rxDataSeries,
                             const TypeGroupConverter& rTypeGroup );
 };
 
@@ -61,7 +61,7 @@ public:
 
     /** Converts OOXML data label settings for the passed data series. */
     void                convertFromModel(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& rxDataSeries,
+                            const css::uno::Reference< css::chart2::XDataSeries >& rxDataSeries,
                             const TypeGroupConverter& rTypeGroup );
 };
 
@@ -75,10 +75,10 @@ public:
 
     /** Converts an OOXML errorbar and inserts it into the passed data series. */
     void                convertFromModel(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& rxDataSeries );
+                            const css::uno::Reference< css::chart2::XDataSeries >& rxDataSeries );
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >
+    css::uno::Reference< css::chart2::data::XLabeledDataSequence >
                         createLabeledDataSequence( ErrorBarModel::SourceType eSourceType );
 };
 
@@ -104,7 +104,7 @@ public:
 
     /** Converts an OOXML trendline and inserts it into the passed data series. */
     void                convertFromModel(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& rxDataSeries );
+                            const css::uno::Reference< css::chart2::XDataSeries >& rxDataSeries );
 };
 
 
@@ -117,7 +117,7 @@ public:
 
     /** Converts settings for a data point in the passed series. */
     void                convertFromModel(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& rxDataSeries,
+                            const css::uno::Reference< css::chart2::XDataSeries >& rxDataSeries,
                             const TypeGroupConverter& rTypeGroup,
                             const SeriesModel& rSeries );
 };
@@ -131,17 +131,17 @@ public:
     virtual             ~SeriesConverter();
 
     /** Creates a labeled data sequence object from category data link. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >
+    css::uno::Reference< css::chart2::data::XLabeledDataSequence >
                         createCategorySequence( const OUString& rRole );
     /** Creates a labeled data sequence object from value data link. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >
+    css::uno::Reference< css::chart2::data::XLabeledDataSequence >
                         createValueSequence( const OUString& rRole );
     /** Creates a data series object with initialized source links. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >
+    css::uno::Reference< css::chart2::XDataSeries >
                         createDataSeries( const TypeGroupConverter& rTypeGroup, bool bVaryColorsByPoint );
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >
+    css::uno::Reference< css::chart2::data::XLabeledDataSequence >
                         createLabeledDataSequence(
                             SeriesModel::SourceType eSourceType,
                             const OUString& rRole,
diff --git a/oox/inc/drawingml/chart/titleconverter.hxx b/oox/inc/drawingml/chart/titleconverter.hxx
index d5f6525f582f..b2140b44e372 100644
--- a/oox/inc/drawingml/chart/titleconverter.hxx
+++ b/oox/inc/drawingml/chart/titleconverter.hxx
@@ -46,19 +46,19 @@ public:
     virtual             ~TextConverter();
 
     /** Creates a data sequence object from the contained text data. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >
+    css::uno::Reference< css::chart2::data::XDataSequence >
                         createDataSequence( const OUString& rRole );
     /** Creates a sequence of formatted string objects. */
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > >
+    css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > >
                         createStringSequence(
                             const OUString& rDefaultText,
                             const ModelRef< TextBody >& rxTextProp,
                             ObjectType eObjType );
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString >
+    css::uno::Reference< css::chart2::XFormattedString >
                         appendFormattedString(
-                            ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > >& orStringVec,
+                            ::std::vector< css::uno::Reference< css::chart2::XFormattedString > >& orStringVec,
                             const OUString& rString,
                             bool bAddNewLine ) const;
 };
@@ -75,7 +75,7 @@ public:
 
     /** Creates a title text object and attaches it at the passed interface. */
     void                convertFromModel(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitled >& rxTitled,
+                            const css::uno::Reference< css::chart2::XTitled >& rxTitled,
                             const OUString& rAutoTitle, ObjectType eObjType,
                             sal_Int32 nMainIdx = -1, sal_Int32 nSubIdx = -1 );
 };
@@ -92,7 +92,7 @@ public:
 
     /** Creates a legend object and attaches it at the passed diagram. */
     void                convertFromModel(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& rxDiagram );
+                            const css::uno::Reference< css::chart2::XDiagram >& rxDiagram );
 };
 
 
diff --git a/oox/inc/drawingml/chart/typegroupconverter.hxx b/oox/inc/drawingml/chart/typegroupconverter.hxx
index 6c5e85522037..0e7174000373 100644
--- a/oox/inc/drawingml/chart/typegroupconverter.hxx
+++ b/oox/inc/drawingml/chart/typegroupconverter.hxx
@@ -105,7 +105,7 @@ public:
 
     /** Converts the OOXML up/down bars. */
     void                convertFromModel(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& rxChartType );
+                            const css::uno::Reference< css::chart2::XChartType >& rxChartType );
 };
 
 struct TypeGroupModel;
@@ -142,16 +142,16 @@ public:
     OUString     getSingleSeriesTitle() const;
 
     /** Creates a coordinate system according to the contained chart type. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >
+    css::uno::Reference< css::chart2::XCoordinateSystem >
                         createCoordinateSystem();
     /** Creates a labeled data sequence object for axis categories. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >
+    css::uno::Reference< css::chart2::data::XLabeledDataSequence >
                         createCategorySequence();
 
     /** Converts the OOXML type group model into a chart2 coordinate system. */
     void                convertFromModel(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& rxDiagram,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& rxCoordSystem,
+                            const css::uno::Reference< css::chart2::XDiagram >& rxDiagram,
+                            const css::uno::Reference< css::chart2::XCoordinateSystem >& rxCoordSystem,
                             sal_Int32 nAxesSetIdx, bool bSupportsVaryColorsByPoint );
 
     /** Sets the passed OOXML marker style at the passed property set. */
@@ -169,8 +169,8 @@ public:
 private:
     /** Inserts the passed series into the chart type. Adds additional properties to the series. */
     void                insertDataSeries(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& rxChartType,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& rxSeries,
+                            const css::uno::Reference< css::chart2::XChartType >& rxChartType,
+                            const css::uno::Reference< css::chart2::XDataSeries >& rxSeries,
                             sal_Int32 nAxesSetIdx );
 
 private:
diff --git a/oox/inc/drawingml/customshapeproperties.hxx b/oox/inc/drawingml/customshapeproperties.hxx
index 5826a0dd6850..23feff1fa6ca 100644
--- a/oox/inc/drawingml/customshapeproperties.hxx
+++ b/oox/inc/drawingml/customshapeproperties.hxx
@@ -57,19 +57,19 @@ struct CustomShapeGuide
 struct AdjustHandle
 {
     bool                                    polar;
-    com::sun::star::drawing::EnhancedCustomShapeParameterPair
+    css::drawing::EnhancedCustomShapeParameterPair
                                             pos;
 
     // depending to the type (polar or not):
     OptValue< OUString >               gdRef1; // gdRefX   or gdRefR
-    OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter >
+    OptValue< css::drawing::EnhancedCustomShapeParameter >
                                             min1;   // minX     or minR
-    OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter >
+    OptValue< css::drawing::EnhancedCustomShapeParameter >
                                             max1;   // maxX     or maxR
     OptValue< OUString >               gdRef2; // gdRefY   or gdRefAng
-    OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter >
+    OptValue< css::drawing::EnhancedCustomShapeParameter >
                                             min2;   // minX     or minAng
-    OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter >
+    OptValue< css::drawing::EnhancedCustomShapeParameter >
                                             max2;   // maxY     or maxAng
 
     AdjustHandle( bool bPolar ) : polar( bPolar ) {};
@@ -77,18 +77,18 @@ struct AdjustHandle
 
 struct ConnectionSite
 {
-    com::sun::star::drawing::EnhancedCustomShapeParameterPair
+    css::drawing::EnhancedCustomShapeParameterPair
                                 pos;
-    com::sun::star::drawing::EnhancedCustomShapeParameter
+    css::drawing::EnhancedCustomShapeParameter
                                 ang;
 };
 
 struct GeomRect
 {
-    com::sun::star::drawing::EnhancedCustomShapeParameter   l;
-    com::sun::star::drawing::EnhancedCustomShapeParameter   t;
-    com::sun::star::drawing::EnhancedCustomShapeParameter   r;
-    com::sun::star::drawing::EnhancedCustomShapeParameter   b;
+    css::drawing::EnhancedCustomShapeParameter   l;
+    css::drawing::EnhancedCustomShapeParameter   t;
+    css::drawing::EnhancedCustomShapeParameter   r;
+    css::drawing::EnhancedCustomShapeParameter   b;
 };
 
 struct Path2D
@@ -98,7 +98,7 @@ struct Path2D
     sal_Int32   fill;
     bool        stroke;
     bool        extrusionOk;
-    std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair > parameter;
+    std::vector< css::drawing::EnhancedCustomShapeParameterPair > parameter;
 
     Path2D() : w( 0 ), h( 0 ), fill( XML_norm ), stroke( true ), extrusionOk( true ) {};
 };
@@ -112,8 +112,9 @@ public:
     virtual ~CustomShapeProperties();
 
     void pushToPropSet( const ::oox::core::FilterBase& rFilterBase,
-            const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet,
-                        const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > & xShape, const ::com::sun::star::awt::Size &aSize );
+                        const css::uno::Reference < css::beans::XPropertySet > & xPropSet,
+                        const css::uno::Reference < css::drawing::XShape > & xShape,
+                        const css::awt::Size &aSize );
 
     sal_Int32 getShapePresetType() const { return mnShapePresetType; }
     css::uno::Sequence< sal_Int8 > getShapePresetTypeName() const;
@@ -127,7 +128,7 @@ public:
     std::vector< ConnectionSite >&      getConnectionSiteList(){ return maConnectionSiteList; };
     OptValue< GeomRect >&               getTextRect(){ return maTextRect; };
     std::vector< Path2D >&              getPath2DList(){ return maPath2DList; };
-    std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment >& getSegments(){ return maSegments; };
+    std::vector< css::drawing::EnhancedCustomShapeSegment >& getSegments(){ return maSegments; };
     void                                setMirroredX( bool bMirroredX ) { mbMirroredX = bMirroredX; };
     void                                setMirroredY( bool bMirroredY ) { mbMirroredY = bMirroredY; };
     void                                setTextRotateAngle( sal_Int32 nAngle ) { mnTextRotateAngle = nAngle; };
@@ -148,7 +149,7 @@ private:
     OptValue< GeomRect >            maTextRect;
     std::vector< Path2D >           maPath2DList;
 
-    std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment >
+    std::vector< css::drawing::EnhancedCustomShapeSegment >
                                     maSegments;
     bool                            mbMirroredX;
     bool                            mbMirroredY;
diff --git a/oox/inc/drawingml/diagram/diagram.hxx b/oox/inc/drawingml/diagram/diagram.hxx
index d2bca17c0ba6..05a4a5dffb9e 100644
--- a/oox/inc/drawingml/diagram/diagram.hxx
+++ b/oox/inc/drawingml/diagram/diagram.hxx
@@ -43,14 +43,10 @@ void loadDiagram( ShapePtr& pShape,
 
 void loadDiagram( const ShapePtr& pShape,
                   core::XmlFilterBase& rFilter,
-                  const ::com::sun::star::uno::Reference<
-                     ::com::sun::star::xml::dom::XDocument>& rXDataModelDom,
-                  const ::com::sun::star::uno::Reference<
-                     ::com::sun::star::xml::dom::XDocument>& rXLayoutDom,
-                  const ::com::sun::star::uno::Reference<
-                     ::com::sun::star::xml::dom::XDocument>& rXQStyleDom,
-                  const ::com::sun::star::uno::Reference<
-                     ::com::sun::star::xml::dom::XDocument>& rXColorStyleDom );
+                  const css::uno::Reference< css::xml::dom::XDocument>& rXDataModelDom,
+                  const css::uno::Reference< css::xml::dom::XDocument>& rXLayoutDom,
+                  const css::uno::Reference< css::xml::dom::XDocument>& rXQStyleDom,
+                  const css::uno::Reference< css::xml::dom::XDocument>& rXColorStyleDom );
 } }
 
 #endif
diff --git a/oox/inc/drawingml/table/tablecell.hxx b/oox/inc/drawingml/table/tablecell.hxx
index b7f297a101c2..5b7baf9928da 100644
--- a/oox/inc/drawingml/table/tablecell.hxx
+++ b/oox/inc/drawingml/table/tablecell.hxx
@@ -72,9 +72,12 @@ public:
     void                        setTextBody( const oox::drawingml::TextBodyPtr& pTextBody ){ mpTextBody = pTextBody; };
     oox::drawingml::TextBodyPtr getTextBody(){ return mpTextBody; };
 
-    void pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oox::drawingml::TextListStylePtr pMasterTextListStyle,
-        const ::com::sun::star::uno::Reference < ::com::sun::star::table::XCell >& rxCell, const TableProperties& rTableProperties,
-            const TableStyle& rTable, sal_Int32 nColumn, sal_Int32 nMaxColumn, sal_Int32 nRow, sal_Int32 nMaxRow );
+    void pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase,
+            ::oox::drawingml::TextListStylePtr pMasterTextListStyle,
+            const css::uno::Reference < css::table::XCell >& rxCell,
+            const TableProperties& rTableProperties,
+            const TableStyle& rTable,
+            sal_Int32 nColumn, sal_Int32 nMaxColumn, sal_Int32 nRow, sal_Int32 nMaxRow );
 
 private:
 
diff --git a/oox/inc/drawingml/table/tableproperties.hxx b/oox/inc/drawingml/table/tableproperties.hxx
index 21550bb56c76..5f49be8e1d23 100644
--- a/oox/inc/drawingml/table/tableproperties.hxx
+++ b/oox/inc/drawingml/table/tableproperties.hxx
@@ -52,14 +52,15 @@ public:
     bool&                               isBandCol(){ return mbBandCol; };
 
     void pushToPropSet( const ::oox::core::XmlFilterBase& rFilterBase,
-        const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet, ::oox::drawingml::TextListStylePtr pMasterTextListStyle );
+        const css::uno::Reference < css::beans::XPropertySet > & xPropSet,
+        ::oox::drawingml::TextListStylePtr pMasterTextListStyle );
 
 private:
 
     const TableStyle&                   getUsedTableStyle(const ::oox::core::XmlFilterBase& rFilterBase, TableStyle*& rTableStyleToDelete);
 
     OUString                            maStyleId;              // either StyleId is available
-    std::shared_ptr< TableStyle >     mpTableStyle;           // or the complete TableStyle
+    std::shared_ptr< TableStyle >       mpTableStyle;           // or the complete TableStyle
     std::vector< sal_Int32 >            mvTableGrid;
     std::vector< TableRow >             mvTableRows;
 
diff --git a/oox/inc/drawingml/textbody.hxx b/oox/inc/drawingml/textbody.hxx
index ea9bca7e586d..5f8b053cc8a8 100644
--- a/oox/inc/drawingml/textbody.hxx
+++ b/oox/inc/drawingml/textbody.hxx
@@ -55,8 +55,8 @@ public:
     /** insert the text body at the text cursor */
     void                insertAt(
                             const ::oox::core::XmlFilterBase& rFilterBase,
-                            const ::com::sun::star::uno::Reference < ::com::sun::star::text::XText > & xText,
-                            const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor > & xAt,
+                            const css::uno::Reference < css::text::XText > & xText,
+                            const css::uno::Reference < css::text::XTextCursor > & xAt,
                             const TextCharacterProperties& rTextStyleProperties,
                             const TextListStylePtr& pMasterTextListStyle ) const;
     bool isEmpty();
diff --git a/oox/inc/drawingml/textbodycontext.hxx b/oox/inc/drawingml/textbodycontext.hxx
index 253d8f0ab658..dc026d067488 100644
--- a/oox/inc/drawingml/textbodycontext.hxx
+++ b/oox/inc/drawingml/textbodycontext.hxx
@@ -37,7 +37,7 @@ public:
 
 protected:
     TextBody&           mrTextBody;
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > mxText;
+    css::uno::Reference< css::text::XText > mxText;
 };
 
 // CT_RegularTextRun
diff --git a/oox/inc/drawingml/textbodyproperties.hxx b/oox/inc/drawingml/textbodyproperties.hxx
index c7a98cb79174..7810af946ffc 100644
--- a/oox/inc/drawingml/textbodyproperties.hxx
+++ b/oox/inc/drawingml/textbodyproperties.hxx
@@ -41,7 +41,7 @@ struct TextBodyProperties
     boost::optional< sal_Int32 >                    moTextOffLeft;
     boost::optional< sal_Int32 >                    moTextOffLower;
     boost::optional< sal_Int32 >                    moTextOffRight;
-    ::com::sun::star::drawing::TextVerticalAdjust   meVA;
+    css::drawing::TextVerticalAdjust                meVA;
 
     explicit            TextBodyProperties();
 
diff --git a/oox/inc/drawingml/textfield.hxx b/oox/inc/drawingml/textfield.hxx
index c378e95f3b16..9f5bf9cf27af 100644
--- a/oox/inc/drawingml/textfield.hxx
+++ b/oox/inc/drawingml/textfield.hxx
@@ -42,8 +42,8 @@ public:
 
     virtual sal_Int32    insertAt(
                         const ::oox::core::XmlFilterBase& rFilterBase,
-                        const ::com::sun::star::uno::Reference < ::com::sun::star::text::XText > & xText,
-                        const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor > &xAt,
+                        const css::uno::Reference < css::text::XText > & xText,
+                        const css::uno::Reference < css::text::XTextCursor > &xAt,
                         const TextCharacterProperties& rTextCharacterStyle,
                         float nDefaultCharHeight) const override;
 
diff --git a/oox/inc/drawingml/textparagraph.hxx b/oox/inc/drawingml/textparagraph.hxx
index 6a0643f47c12..f96989cffa8e 100644
--- a/oox/inc/drawingml/textparagraph.hxx
+++ b/oox/inc/drawingml/textparagraph.hxx
@@ -50,8 +50,8 @@ public:
 
     void                        insertAt(
                                     const ::oox::core::XmlFilterBase& rFilterBase,
-                                    const ::com::sun::star::uno::Reference < ::com::sun::star::text::XText > & xText,
-                                    const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor > &xAt,
+                                    const css::uno::Reference < css::text::XText > & xText,
+                                    const css::uno::Reference < css::text::XTextCursor > &xAt,
                                     const TextCharacterProperties& rTextStyleProperties,
                                     const TextListStyle& rTextListStyle,
                                     bool bFirst = false,
diff --git a/oox/inc/drawingml/textparagraphproperties.hxx b/oox/inc/drawingml/textparagraphproperties.hxx
index b7309ba07ae0..6975c4c6a3d7 100644
--- a/oox/inc/drawingml/textparagraphproperties.hxx
+++ b/oox/inc/drawingml/textparagraphproperties.hxx
@@ -57,21 +57,21 @@ public:
     void setBulletSize(sal_Int16 nSize);
     void setFontSize(sal_Int16 nSize);
     void setStyleName( const OUString& rStyleName ) { maStyleName <<= rStyleName; }
-    void setGraphic( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rXGraphic );
+    void setGraphic( css::uno::Reference< css::graphic::XGraphic >& rXGraphic );
 
     std::shared_ptr< ::oox::drawingml::Color > maBulletColorPtr;
-    ::com::sun::star::uno::Any  mbBulletColorFollowText;
-    ::com::sun::star::uno::Any  mbBulletFontFollowText;
+    css::uno::Any               mbBulletColorFollowText;
+    css::uno::Any               mbBulletFontFollowText;
     ::oox::drawingml::TextFont  maBulletFont;
-    ::com::sun::star::uno::Any  msBulletChar;
-    ::com::sun::star::uno::Any  mnStartAt;
-    ::com::sun::star::uno::Any  mnNumberingType;
-    ::com::sun::star::uno::Any  msNumberingPrefix;
-    ::com::sun::star::uno::Any  msNumberingSuffix;
-    ::com::sun::star::uno::Any  mnSize;
-    ::com::sun::star::uno::Any  mnFontSize;
-    ::com::sun::star::uno::Any  maStyleName;
-    ::com::sun::star::uno::Any  maGraphic;
+    css::uno::Any               msBulletChar;
+    css::uno::Any               mnStartAt;
+    css::uno::Any               mnNumberingType;
+    css::uno::Any               msNumberingPrefix;
+    css::uno::Any               msNumberingSuffix;
+    css::uno::Any               mnSize;
+    css::uno::Any               mnFontSize;
+    css::uno::Any               maStyleName;
+    css::uno::Any               maGraphic;
     boost::optional< float >    maFollowFontSize;
 };
 
@@ -99,8 +99,12 @@ public:
 
     void                                apply( const TextParagraphProperties& rSourceProps );
     void                                pushToPropSet( const ::oox::core::XmlFilterBase* pFilterBase,
-                                            const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet,
-                                                PropertyMap& rioBulletList, const BulletList* pMasterBuList, bool bApplyBulletList, float fFontSize, bool bPushDefaultValues = false ) const;
+                                                const css::uno::Reference < css::beans::XPropertySet > & xPropSet,
+                                                PropertyMap& rioBulletList,
+                                                const BulletList* pMasterBuList,
+                                                bool bApplyBulletList,
+                                                float fFontSize,
+                                                bool bPushDefaultValues = false ) const;
 
     /** Returns the largest character size of this paragraph. If possible the
         masterstyle should have been applied before, otherwise the character
diff --git a/oox/inc/drawingml/textparagraphpropertiescontext.hxx b/oox/inc/drawingml/textparagraphpropertiescontext.hxx
index 899626c30fae..8f827e8ebda9 100644
--- a/oox/inc/drawingml/textparagraphpropertiescontext.hxx
+++ b/oox/inc/drawingml/textparagraphpropertiescontext.hxx
@@ -44,7 +44,7 @@ protected:
     TextParagraphProperties& mrTextParagraphProperties;
     TextSpacing     maLineSpacing;
     BulletList&     mrBulletList;
-    std::list< ::com::sun::star::style::TabStop >  maTabList;
+    std::list< css::style::TabStop >  maTabList;
     std::shared_ptr< BlipFillProperties > mxBlipProps;
 };
 
diff --git a/oox/inc/drawingml/textrun.hxx b/oox/inc/drawingml/textrun.hxx
index cba32da1baaa..b40649b61532 100644
--- a/oox/inc/drawingml/textrun.hxx
+++ b/oox/inc/drawingml/textrun.hxx
@@ -43,8 +43,8 @@ public:
 
     virtual sal_Int32               insertAt(
                                     const ::oox::core::XmlFilterBase& rFilterBase,
-                                    const ::com::sun::star::uno::Reference < ::com::sun::star::text::XText >& xText,
-                                    const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor >& xAt,
+                                    const css::uno::Reference < css::text::XText >& xText,
+                                    const css::uno::Reference < css::text::XTextCursor >& xAt,
                                     const TextCharacterProperties& rTextCharacterStyle,
                                     float nDefaultCharHeight) const;
 
diff --git a/oox/inc/drawingml/textspacing.hxx b/oox/inc/drawingml/textspacing.hxx
index 4c859d706057..efe0dab06674 100644
--- a/oox/inc/drawingml/textspacing.hxx
+++ b/oox/inc/drawingml/textspacing.hxx
@@ -42,12 +42,12 @@ namespace oox { namespace drawingml {
             {
             }
         TextSpacing( sal_Int32 nPoints ) : nUnit( POINTS ), nValue( nPoints ), bHasValue( true ){};
-        ::com::sun::star::style::LineSpacing toLineSpacing() const
+        css::style::LineSpacing toLineSpacing() const
             {
-                ::com::sun::star::style::LineSpacing aSpacing;
+                css::style::LineSpacing aSpacing;
                 aSpacing.Mode = ( nUnit == PERCENT
-                                                    ? ::com::sun::star::style::LineSpacingMode::PROP
-                                                    :   ::com::sun::star::style::LineSpacingMode::MINIMUM );
+                                  ? css::style::LineSpacingMode::PROP
+                                  :   css::style::LineSpacingMode::MINIMUM );
                 aSpacing.Height = static_cast< sal_Int16 >( nUnit == PERCENT ? nValue / 1000 :  nValue );
                 return aSpacing;
             }