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

Change-Id: Id99ff87c4eb3f1b36702261ce63d5d2793ea35d7

67 files changed, 521 insertions, 518 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;
             }
diff --git a/oox/source/core/fragmenthandler2.cxx b/oox/source/core/fragmenthandler2.cxx
index aae320640375..9ccfcd4ec012 100644
--- a/oox/source/core/fragmenthandler2.cxx
+++ b/oox/source/core/fragmenthandler2.cxx
@@ -84,7 +84,7 @@ bool FragmentHandler2::prepareMceContext( sal_Int32 nElement, const AttributeLis
                 OUString str = rAttribs.getString( MCE_TOKEN( Ignorable ), OUString() );
                 if( !str.isEmpty() )
                 {
-                    // Sequence< ::com::sun::star::xml::FastAttribute > attrs = rAttribs.getFastAttributeList()->getFastAttributes();
+                    // Sequence< css::xml::FastAttribute > attrs = rAttribs.getFastAttributeList()->getFastAttributes();
                     // printf("MCE: %s\n", OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr() );
                     // TODO: Check & Get the namespaces in "Ignorable"
                     // printf("NS: %d : %s\n", attrs.getLength(), OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr() );
diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx
index 35c0378583be..e4dc28f4ca36 100644
--- a/oox/source/docprop/docprophandler.hxx
+++ b/oox/source/docprop/docprophandler.hxx
@@ -39,10 +39,10 @@ namespace docprop {
 #define DC_TOKEN( token )       (::oox::NMSP_dc | XML_##token)
 #define DCT_TOKEN( token )      (::oox::NMSP_dcTerms | XML_##token)
 
-class OOXMLDocPropHandler : public ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XFastDocumentHandler >
+class OOXMLDocPropHandler : public ::cppu::WeakImplHelper< css::xml::sax::XFastDocumentHandler >
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
-    ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > m_xDocProp;
+    css::uno::Reference< css::uno::XComponentContext > m_xContext;
+    css::uno::Reference< css::document::XDocumentProperties > m_xDocProp;
 
     sal_Int32 m_nState;
     sal_Int32 m_nBlock;
@@ -54,32 +54,32 @@ class OOXMLDocPropHandler : public ::cppu::WeakImplHelper< ::com::sun::star::xml
     OUString m_aCustomPropertyName;
 
 public:
-    explicit            OOXMLDocPropHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties >& rDocProp );
+    explicit            OOXMLDocPropHandler( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::document::XDocumentProperties >& rDocProp );
 
     virtual             ~OOXMLDocPropHandler();
 
     void InitNew();
-    void AddCustomProperty( const ::com::sun::star::uno::Any& aAny );
+    void AddCustomProperty( const css::uno::Any& aAny );
 
-    static ::com::sun::star::util::DateTime GetDateTimeFromW3CDTF( const OUString& aChars );
-    static ::com::sun::star::uno::Sequence< OUString > GetKeywordsSet( const OUString& aChars );
+    static css::util::DateTime GetDateTimeFromW3CDTF( const OUString& aChars );
+    static css::uno::Sequence< OUString > GetKeywordsSet( const OUString& aChars );
     void UpdateDocStatistic( const OUString& aChars );
 
     // com.sun.star.xml.sax.XFastDocumentHandler
 
-    virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& rxLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& rxLocator ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
 
     // com.sun.star.xml.sax.XFastContextHandler
 
-    virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
 
 };
 
diff --git a/oox/source/docprop/ooxmldocpropimport.hxx b/oox/source/docprop/ooxmldocpropimport.hxx
index dd83b43f73e4..e60df130c692 100644
--- a/oox/source/docprop/ooxmldocpropimport.hxx
+++ b/oox/source/docprop/ooxmldocpropimport.hxx
@@ -31,26 +31,26 @@ namespace docprop {
 
 class DocumentPropertiesImport :
     public ::cppu::WeakImplHelper<
-        ::com::sun::star::lang::XServiceInfo,
-        ::com::sun::star::document::XOOXMLDocumentPropertiesImporter >
+        css::lang::XServiceInfo,
+        css::document::XOOXMLDocumentPropertiesImporter >
 {
 public:
     explicit            DocumentPropertiesImport(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
 
     // XOOXMLDocumentPropertiesImporter
     virtual void SAL_CALL importProperties(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxSource,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties >& rxDocumentProperties )
-                        throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::Exception, std::exception) override;
+                            const css::uno::Reference< css::embed::XStorage >& rxSource,
+                            const css::uno::Reference< css::document::XDocumentProperties >& rxDocumentProperties )
+                        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::xml::sax::SAXException, css::uno::Exception, std::exception) override;
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
+    css::uno::Reference< css::uno::XComponentContext > mxContext;
 };
 
 } // namespace docprop
diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx
index 352e45ec908e..4dabec2da288 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -75,12 +75,12 @@ sal_Int32 lclGetApiTimeUnit( sal_Int32 nTimeUnit )
 void lclConvertTimeInterval( Any& orInterval, const OptValue< double >& rofUnit, sal_Int32 nTimeUnit )
 {
     if( rofUnit.has() && (1.0 <= rofUnit.get()) && (rofUnit.get() <= SAL_MAX_INT32) )
-        orInterval <<= ::com::sun::star::chart::TimeInterval( static_cast< sal_Int32 >( rofUnit.get() ), lclGetApiTimeUnit( nTimeUnit ) );
+        orInterval <<= css::chart::TimeInterval( static_cast< sal_Int32 >( rofUnit.get() ), lclGetApiTimeUnit( nTimeUnit ) );
     else
         orInterval.clear();
 }
 
-::com::sun::star::chart::ChartAxisLabelPosition lclGetLabelPosition( sal_Int32 nToken )
+css::chart::ChartAxisLabelPosition lclGetLabelPosition( sal_Int32 nToken )
 {
     using namespace ::com::sun::star::chart;
     switch( nToken )
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx
index 758ad647751d..e720ab5ceeff 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -197,7 +197,7 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern
 
     if(!mrModel.maSheetPath.isEmpty() )
     {
-        Reference< ::com::sun::star::chart::XChartDocument > xChartDoc( getChartDocument(), UNO_QUERY );
+        Reference< css::chart::XChartDocument > xChartDoc( getChartDocument(), UNO_QUERY );
         PropertySet aProps( xChartDoc->getDiagram() );
         aProps.setProperty( PROP_ExternalData , uno::makeAny(mrModel.maSheetPath) );
     }
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx
index ba65b1f68ecb..860364a8238b 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -394,7 +394,7 @@ void TypeGroupConverter::convertFromModel( const Reference< XDiagram >& rxDiagra
                     getFormatter().convertFrameFormatting( aSeriesProp, mrModel.mxHiLowLines, OBJECTTYPE_HILOLINE );
                 else
                     // hi/low-lines cannot be switched off via "ShowHighLow" property (?)
-                    aSeriesProp.setProperty( PROP_LineStyle, ::com::sun::star::drawing::LineStyle_NONE );
+                    aSeriesProp.setProperty( PROP_LineStyle, css::drawing::LineStyle_NONE );
 
                 // formatting of up/down bars
                 bool bUpDownBars = mrModel.mxUpDownBars.is();
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx
index 2d36cbf7fd6d..e92713ba1b91 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -304,7 +304,7 @@ void Color::addTransformation( sal_Int32 nElement, sal_Int32 nValue )
     sal_Int32 nSize = maInteropTransformations.getLength();
     maInteropTransformations.realloc(nSize + 1);
     maInteropTransformations[nSize].Name = getColorTransformationName( nToken );
-    maInteropTransformations[nSize].Value = ::com::sun::star::uno::Any( nValue );
+    maInteropTransformations[nSize].Value = css::uno::Any( nValue );
 }
 
 void Color::addChartTintTransformation( double fTint )
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index 0ee26fef1b56..6875629f87f2 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -223,7 +223,7 @@ OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParameter )
 
 static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCustomShapeProperties, const OUString& rValue, bool bNoSymbols = true )
 {
-    com::sun::star::drawing::EnhancedCustomShapeParameter aRet;
+    css::drawing::EnhancedCustomShapeParameter aRet;
     if ( !rValue.isEmpty() )
     {
         bool        bConstant = true;
@@ -942,18 +942,18 @@ ContextHandlerRef Path2DCubicBezierToContext::onCreateContext( sal_Int32 aElemen
 class Path2DContext : public ContextHandler2
 {
 public:
-    Path2DContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment >& rSegments, Path2D& rPath2D );
+    Path2DContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, std::vector< css::drawing::EnhancedCustomShapeSegment >& rSegments, Path2D& rPath2D );
     virtual ~Path2DContext();
     virtual ::oox::core::ContextHandlerRef
         onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override;
 
 protected:
     Path2D& mrPath2D;
-    std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment >& mrSegments;
+    std::vector< css::drawing::EnhancedCustomShapeSegment >& mrSegments;
     CustomShapeProperties& mrCustomShapeProperties;
 };
 
-Path2DContext::Path2DContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment >& rSegments, Path2D& rPath2D )
+Path2DContext::Path2DContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, std::vector< css::drawing::EnhancedCustomShapeSegment >& rSegments, Path2D& rPath2D )
 : ContextHandler2( rParent )
 , mrPath2D( rPath2D )
 , mrSegments( rSegments )
@@ -1148,7 +1148,7 @@ public:
 protected:
 
     CustomShapeProperties& mrCustomShapeProperties;
-    std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment >& mrSegments;
+    std::vector< css::drawing::EnhancedCustomShapeSegment >& mrSegments;
     std::vector< Path2D >& mrPath2DList;
 };
 
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 12c7c3f85d0c..cb40b1fb20cd 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -188,7 +188,7 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
                     const OUString sAdjustmentValues("AdjustmentValues");
                     if ( aGeoPropSeq[ i ].Name.equals( sAdjustmentValues ) )
                     {
-                        uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq;
+                        uno::Sequence< css::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq;
                         if ( aGeoPropSeq[ i ].Value >>= aAdjustmentSeq )
                         {
                             int nIndex=0;
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
index fa1bf9d799ad..cbd09ae94ef9 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
@@ -31,7 +31,7 @@ public:
     DiagramDataFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramDataPtr& rDataPtr ) throw();
     virtual ~DiagramDataFragmentHandler() throw();
 
-    virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
 private:
@@ -45,7 +45,7 @@ public:
     DiagramLayoutFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramLayoutPtr& rDataPtr ) throw();
     virtual ~DiagramLayoutFragmentHandler() throw();
 
-    virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
 private:
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 7e511cc8597e..6cebe6f24ef3 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -43,7 +43,7 @@ struct IteratorAttr
     IteratorAttr();
 
     // not sure this belong here, but wth
-    void loadFromXAttr( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes );
+    void loadFromXAttr( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes );
 
     sal_Int32 mnAxis;
     sal_Int32 mnCnt;
@@ -58,7 +58,7 @@ struct ConditionAttr
     ConditionAttr();
 
     // not sure this belong here, but wth
-    void loadFromXAttr( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes );
+    void loadFromXAttr( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes );
 
     sal_Int32 mnFunc;
     sal_Int32 mnArg;
@@ -177,7 +177,7 @@ class ForEachAtom
     : public LayoutAtom
 {
 public:
-    explicit ForEachAtom(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes);
+    explicit ForEachAtom(const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes);
 
     virtual ~ForEachAtom() { }
 
@@ -195,7 +195,7 @@ class ConditionAtom
     : public LayoutAtom
 {
 public:
-    explicit ConditionAtom(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes);
+    explicit ConditionAtom(const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes);
     virtual ~ConditionAtom()
         { }
     virtual void accept( LayoutAtomVisitor& ) override;
@@ -239,7 +239,7 @@ public:
     };
     // we know that the array is of fixed size
     // the use of Any allow having empty values
-    typedef boost::array< ::com::sun::star::uno::Any, 9 > VarMap;
+    typedef boost::array< css::uno::Any, 9 > VarMap;
 
     LayoutNode() : mnChildOrder(0) {}
     virtual ~LayoutNode() { }
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 748f31314dec..c7728bbd1e20 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -397,7 +397,7 @@ Reference< XShape > Shape::createAndInsert(
         ::oox::core::XmlFilterBase& rFilterBase,
         const OUString& rServiceName,
         const Theme* pTheme,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+        const css::uno::Reference< css::drawing::XShapes >& rxShapes,
         const awt::Rectangle* /* pShapeRect */,
         bool bClearText,
         bool bDoNotInsertEmptyTextBody,
diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index 135e5b256658..8033218c822b 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -156,7 +156,7 @@ void applyTableStylePart( const ::oox::core::XmlFilterBase& rFilterBase,
         aTextCharProps.moItalic = *rTableStylePart.getTextItalicStyle();
 }
 
-void applyTableCellProperties( const Reference < ::com::sun::star::table::XCell >& rxCell, const TableCell& rTableCell )
+void applyTableCellProperties( const Reference < css::table::XCell >& rxCell, const TableCell& rTableCell )
 {
     Reference< XPropertySet > xPropSet( rxCell, UNO_QUERY_THROW );
     xPropSet->setPropertyValue( "TextUpperDistance", Any( static_cast< sal_Int32 >( rTableCell.getTopMargin() / 360 ) ) );
@@ -178,7 +178,7 @@ void applyTableCellProperties( const Reference < ::com::sun::star::table::XCell
 }
 
 void TableCell::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 css::uno::Reference < css::table::XCell >& rxCell, const TableProperties& rTableProperties,
         const TableStyle& rTableStyle, sal_Int32 nColumn, sal_Int32 nMaxColumn, sal_Int32 nRow, sal_Int32 nMaxRow )
 {
     TableStyle& rTable( const_cast< TableStyle& >( rTableStyle ) );
@@ -415,7 +415,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
 
     if ( getVertToken() == XML_eaVert )
     {
-        xPropSet->setPropertyValue("TextWritingMode", Any(com::sun::star::text::WritingMode_TB_RL));
+        xPropSet->setPropertyValue("TextWritingMode", Any(css::text::WritingMode_TB_RL));
     }
 
     getTextBody()->insertAt( rFilterBase, xText, xAt, aTextStyleProps, pMasterTextListStyle );
diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx
index a4797f35d7e8..f66d2e03c301 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -73,7 +73,7 @@ void BulletList::setBulletChar( const OUString & sChar )
     msBulletChar <<= sChar;
 }
 
-void BulletList::setGraphic( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rXGraphic )
+void BulletList::setGraphic( css::uno::Reference< css::graphic::XGraphic >& rXGraphic )
 {
     mnNumberingType <<= NumberingType::BITMAP;
     maGraphic <<= rXGraphic;
@@ -344,7 +344,7 @@ void BulletList::pushToPropMap( const ::oox::core::XmlFilterBase* pFilterBase, P
     }
     if ( maGraphic.hasValue() )
     {
-        Reference< com::sun::star::awt::XBitmap > xBitmap( maGraphic, UNO_QUERY );
+        Reference< css::awt::XBitmap > xBitmap( maGraphic, UNO_QUERY );
         if ( xBitmap.is() )
             rPropMap.setProperty( PROP_Graphic, xBitmap);
     }
@@ -411,7 +411,7 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p
     {
         fCharacterSize = getCharHeightPoints( fCharacterSize );
 
-        com::sun::star::awt::Size aBulletSize;
+        css::awt::Size aBulletSize;
         aBulletSize.Width = aBulletSize.Height = static_cast< sal_Int32 >( ( fCharacterSize * ( 2540.0 / 72.0 ) * 0.8 ) );
         rioBulletMap.setProperty( PROP_GraphicSize, aBulletSize);
     }
@@ -488,7 +488,7 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p
     }
     else
     {
-        aPropSet.setProperty( PROP_ParaAdjust, com::sun::star::style::ParagraphAdjust_LEFT);
+        aPropSet.setProperty( PROP_ParaAdjust, css::style::ParagraphAdjust_LEFT);
     }
 }
 
@@ -502,10 +502,10 @@ float TextParagraphProperties::getCharHeightPoints( float fDefault ) const
 // debugging pptx import problems.
 void TextParagraphProperties::dump() const
 {
-    Reference< ::com::sun::star::drawing::XShape > xShape( oox::ppt::PowerPointImport::mpDebugFilterBase->getModelFactory()->createInstance( "com.sun.star.presentation.TitleTextShape" ), UNO_QUERY );
-    Reference< ::com::sun::star::text::XText > xText( xShape, UNO_QUERY );
+    Reference< css::drawing::XShape > xShape( oox::ppt::PowerPointImport::mpDebugFilterBase->getModelFactory()->createInstance( "com.sun.star.presentation.TitleTextShape" ), UNO_QUERY );
+    Reference< css::text::XText > xText( xShape, UNO_QUERY );
 
-    Reference< com::sun::star::drawing::XDrawPage > xDebugPage(ppt::SlidePersist::mxDebugPage.get(), UNO_QUERY);
+    Reference< css::drawing::XDrawPage > xDebugPage(ppt::SlidePersist::mxDebugPage.get(), UNO_QUERY);
     if (xDebugPage.is())
         xDebugPage->add( xShape );
 
@@ -513,8 +513,8 @@ void TextParagraphProperties::dump() const
 
     const OUString sText = "debug";
     xText->setString( sText );
-    Reference< ::com::sun::star::text::XTextCursor > xStart( xText->createTextCursor(), UNO_QUERY );
-    Reference< ::com::sun::star::text::XTextRange > xRange( xStart, UNO_QUERY );
+    Reference< css::text::XTextCursor > xStart( xText->createTextCursor(), UNO_QUERY );
+    Reference< css::text::XTextRange > xRange( xStart, UNO_QUERY );
     xStart->gotoEnd( sal_True );
     Reference< XPropertySet > xPropSet( xRange, UNO_QUERY );
     pushToPropSet( NULL, xPropSet, emptyMap, NULL, false, 0 );
diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx
index a79cfe0287b2..f811cdb60f5c 100644
--- a/oox/source/drawingml/textparagraphpropertiescontext.cxx
+++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx
@@ -135,7 +135,7 @@ TextParagraphPropertiesContext::~TextParagraphPropertiesContext()
     if ( maLineSpacing.bHasValue )
         rPropertyMap.setProperty( PROP_ParaLineSpacing, maLineSpacing.toLineSpacing());
     else
-        rPropertyMap.setProperty( PROP_ParaLineSpacing, ::com::sun::star::style::LineSpacing( ::com::sun::star::style::LineSpacingMode::PROP, 100 ));
+        rPropertyMap.setProperty( PROP_ParaLineSpacing, css::style::LineSpacing( css::style::LineSpacingMode::PROP, 100 ));
 
     ::std::list< TabStop >::size_type nTabCount = maTabList.size();
     if( nTabCount != 0 )
diff --git a/oox/source/drawingml/texttabstoplistcontext.hxx b/oox/source/drawingml/texttabstoplistcontext.hxx
index 1acb0e506475..cbec67799bc1 100644
--- a/oox/source/drawingml/texttabstoplistcontext.hxx
+++ b/oox/source/drawingml/texttabstoplistcontext.hxx
@@ -32,13 +32,13 @@ namespace oox { namespace drawingml {
     {
     public:
         TextTabStopListContext( ::oox::core::ContextHandler2Helper& rParent,
-                ::std::list< ::com::sun::star::style::TabStop >  & aTabList );
+                ::std::list< css::style::TabStop >  & aTabList );
         virtual ~TextTabStopListContext();
 
         virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
 protected:
-        ::std::list< ::com::sun::star::style::TabStop >  & maTabList;
+        ::std::list< css::style::TabStop >  & maTabList;
     };
 
 } }
diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx
index 0a8ebb293d93..3fb4b9ab1ad5 100644
--- a/oox/source/export/ColorPropertySet.cxx
+++ b/oox/source/export/ColorPropertySet.cxx
@@ -125,7 +125,7 @@ uno::Any SAL_CALL ColorPropertySet::getPropertyValue( const OUString& aPropertyN
 {
     if( aPropertyName == "FillStyle" && m_bIsFillColor )
     {
-        ::com::sun::star::drawing::FillStyle aFillStyle = ::com::sun::star::drawing::FillStyle_SOLID;
+        css::drawing::FillStyle aFillStyle = css::drawing::FillStyle_SOLID;
         return uno::makeAny(aFillStyle);
     }
     return uno::makeAny( m_nColor );
diff --git a/oox/source/export/ColorPropertySet.hxx b/oox/source/export/ColorPropertySet.hxx
index 580976049c72..11d73a8589c0 100644
--- a/oox/source/export/ColorPropertySet.hxx
+++ b/oox/source/export/ColorPropertySet.hxx
@@ -33,8 +33,8 @@ namespace drawingml
 {
 
 class ColorPropertySet : public ::cppu::WeakImplHelper<
-        ::com::sun::star::beans::XPropertySet,
-        ::com::sun::star::beans::XPropertyState >
+        css::beans::XPropertySet,
+        css::beans::XPropertyState >
 {
 public:
     // if bFillColor == false, the color is a LineColor
@@ -43,69 +43,68 @@ public:
 
 protected:
     // ____ XPropertySet ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setPropertyValue(
         const OUString& aPropertyName,
-        const ::com::sun::star::uno::Any& aValue )
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::beans::PropertyVetoException,
-               ::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
+        const css::uno::Any& aValue )
+        throw (css::beans::UnknownPropertyException,
+               css::beans::PropertyVetoException,
+               css::lang::IllegalArgumentException,
+               css::lang::WrappedTargetException,
+               css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue(
         const OUString& PropertyName )
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::beans::UnknownPropertyException,
+               css::lang::WrappedTargetException,
+               css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL addPropertyChangeListener(
         const OUString& aPropertyName,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
+        throw (css::beans::UnknownPropertyException,
+               css::lang::WrappedTargetException,
+               css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL removePropertyChangeListener(
         const OUString& aPropertyName,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
+        throw (css::beans::UnknownPropertyException,
+               css::lang::WrappedTargetException,
+               css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL addVetoableChangeListener(
         const OUString& PropertyName,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
+        throw (css::beans::UnknownPropertyException,
+               css::lang::WrappedTargetException,
+               css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL removeVetoableChangeListener(
         const OUString& PropertyName,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
+        throw (css::beans::UnknownPropertyException,
+               css::lang::WrappedTargetException,
+               css::uno::RuntimeException, std::exception) override;
 
     // ____ XPropertyState ____
-    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(
+    virtual css::beans::PropertyState SAL_CALL getPropertyState(
         const OUString& PropertyName )
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates(
-        const ::com::sun::star::uno::Sequence< OUString >& aPropertyName )
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::beans::UnknownPropertyException,
+               css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates(
+        const css::uno::Sequence< OUString >& aPropertyName )
+        throw (css::beans::UnknownPropertyException,
+               css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setPropertyToDefault(
         const OUString& PropertyName )
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(
+        throw (css::beans::UnknownPropertyException,
+               css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault(
         const OUString& aPropertyName )
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::beans::UnknownPropertyException,
+               css::lang::WrappedTargetException,
+               css::uno::RuntimeException, std::exception) override;
 
 private:
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySetInfo > m_xInfo;
-    OUString  m_aColorPropName;
+    css::uno::Reference< css::beans::XPropertySetInfo > m_xInfo;
+    OUString         m_aColorPropName;
     sal_Int32        m_nColor;
     bool             m_bIsFillColor;
     sal_Int32        m_nDefaultColor;
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index a8e3f8818a3e..bbd2d10adebe 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1092,7 +1092,7 @@ void DrawingML::WriteSrcRect( Reference< XPropertySet > rXPropSet, const OUStrin
 
     if ( GetProperty( rXPropSet, "GraphicCrop" ) )
     {
-        ::com::sun::star::text::GraphicCrop aGraphicCropStruct;
+        css::text::GraphicCrop aGraphicCropStruct;
         mAny >>= aGraphicCropStruct;
 
         if ( (0 != aGraphicCropStruct.Left) || (0 != aGraphicCropStruct.Top) || (0 != aGraphicCropStruct.Right) || (0 != aGraphicCropStruct.Bottom) )
@@ -1107,14 +1107,14 @@ void DrawingML::WriteSrcRect( Reference< XPropertySet > rXPropSet, const OUStrin
     }
 }
 
-void DrawingML::WriteStretch( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, const OUString& rURL )
+void DrawingML::WriteStretch( css::uno::Reference< css::beans::XPropertySet > rXPropSet, const OUString& rURL )
 {
     mpFS->startElementNS( XML_a, XML_stretch, FSEND );
 
     bool bCrop = false;
     if ( GetProperty( rXPropSet, "GraphicCrop" ) )
     {
-        ::com::sun::star::text::GraphicCrop aGraphicCropStruct;
+        css::text::GraphicCrop aGraphicCropStruct;
         mAny >>= aGraphicCropStruct;
 
         if ( (0 != aGraphicCropStruct.Left) || (0 != aGraphicCropStruct.Top) || (0 != aGraphicCropStruct.Right) || (0 != aGraphicCropStruct.Bottom) )
@@ -1331,7 +1331,7 @@ void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, bool bIsFiel
 
     if( GETA( CharLocale ) )
     {
-        com::sun::star::lang::Locale aLocale;
+        css::lang::Locale aLocale;
         mAny >>= aLocale;
         LanguageTag aLanguageTag( aLocale);
         if (!aLanguageTag.isSystemLocale())
@@ -1462,7 +1462,7 @@ void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, bool bIsFiel
     mpFS->endElementNS( XML_a, nElement );
 }
 
-OUString DrawingML::GetFieldValue( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun, bool& bIsURLField )
+OUString DrawingML::GetFieldValue( css::uno::Reference< css::text::XTextRange > rRun, bool& bIsURLField )
 {
     Reference< XPropertySet > rXPropSet( rRun, UNO_QUERY );
     OUString aFieldType, aFieldValue;
@@ -2545,7 +2545,7 @@ void DrawingML::WriteConnectorConnections( EscherConnectorListEntry& rConnectorE
     }
 }
 
-sal_Unicode DrawingML::SubstituteBullet( sal_Unicode cBulletId, ::com::sun::star::awt::FontDescriptor& rFontDesc )
+sal_Unicode DrawingML::SubstituteBullet( sal_Unicode cBulletId, css::awt::FontDescriptor& rFontDesc )
 {
     if ( IsStarSymbol(rFontDesc.Name) )
     {
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index 743412595f39..5e9d43293b8a 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -208,7 +208,7 @@ awt::Point GraphicHelper::convertHmmToAppFont( const awt::Point& rHmm ) const
     if( mxUnitConversion.is() ) try
     {
         awt::Point aPixel = convertHmmToScreenPixel( rHmm );
-        return mxUnitConversion->convertPointToLogic( aPixel, ::com::sun::star::util::MeasureUnit::APPFONT );
+        return mxUnitConversion->convertPointToLogic( aPixel, css::util::MeasureUnit::APPFONT );
     }
     catch( Exception& )
     {
@@ -221,7 +221,7 @@ awt::Size GraphicHelper::convertHmmToAppFont( const awt::Size& rHmm ) const
     if( mxUnitConversion.is() ) try
     {
         awt::Size aPixel = convertHmmToScreenPixel( rHmm );
-        return mxUnitConversion->convertSizeToLogic( aPixel, ::com::sun::star::util::MeasureUnit::APPFONT );
+        return mxUnitConversion->convertSizeToLogic( aPixel, css::util::MeasureUnit::APPFONT );
     }
     catch( Exception& )
     {
diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx
index 0a969f100418..2d0e31493ca5 100644
--- a/oox/source/helper/textinputstream.cxx
+++ b/oox/source/helper/textinputstream.cxx
@@ -185,7 +185,7 @@ Reference< XTextInputStream2 > TextInputStream::createXTextInputStream(
     OSL_ENSURE( pcCharset, "TextInputStream::createXTextInputStream - unsupported text encoding" );
     if( rxContext.is() && rxInStrm.is() && pcCharset ) try
     {
-        xTextStrm = com::sun::star::io::TextInputStream::create( rxContext );
+        xTextStrm = css::io::TextInputStream::create( rxContext );
         xTextStrm->setInputStream( rxInStrm );
         xTextStrm->setEncoding( OUString::createFromAscii( pcCharset ) );
     }
diff --git a/oox/source/helper/zipstorage.cxx b/oox/source/helper/zipstorage.cxx
index dc9865461a68..067365199575 100644
--- a/oox/source/helper/zipstorage.cxx
+++ b/oox/source/helper/zipstorage.cxx
@@ -131,7 +131,7 @@ StorageRef ZipStorage::implOpenSubStorage( const OUString& rElementName, bool bC
         // XStorage::isStorageElement may throw various exceptions...
         if( mxStorage->isStorageElement( rElementName ) )
             xSubXStorage = mxStorage->openStorageElement(
-                rElementName, ::com::sun::star::embed::ElementModes::READ );
+                rElementName, css::embed::ElementModes::READ );
     }
     catch( NoSuchElementException& )
     {
@@ -145,7 +145,7 @@ StorageRef ZipStorage::implOpenSubStorage( const OUString& rElementName, bool bC
     if( bMissing && bCreateMissing ) try
     {
         xSubXStorage = mxStorage->openStorageElement(
-            rElementName, ::com::sun::star::embed::ElementModes::READWRITE );
+            rElementName, css::embed::ElementModes::READWRITE );
     }
     catch (Exception const& e)
     {
@@ -163,7 +163,7 @@ Reference< XInputStream > ZipStorage::implOpenInputStream( const OUString& rElem
     Reference< XInputStream > xInStream;
     if( mxStorage.is() ) try
     {
-        xInStream.set( mxStorage->openStreamElement( rElementName, ::com::sun::star::embed::ElementModes::READ ), UNO_QUERY );
+        xInStream.set( mxStorage->openStreamElement( rElementName, css::embed::ElementModes::READ ), UNO_QUERY );
     }
     catch (Exception const& e)
     {
@@ -177,7 +177,7 @@ Reference< XOutputStream > ZipStorage::implOpenOutputStream( const OUString& rEl
     Reference< XOutputStream > xOutStream;
     if( mxStorage.is() ) try
     {
-        xOutStream.set( mxStorage->openStreamElement( rElementName, ::com::sun::star::embed::ElementModes::READWRITE ), UNO_QUERY );
+        xOutStream.set( mxStorage->openStreamElement( rElementName, css::embed::ElementModes::READWRITE ), UNO_QUERY );
     }
     catch (Exception const& e)
     {
diff --git a/oox/source/ole/axbinarywriter.cxx b/oox/source/ole/axbinarywriter.cxx
index 71c01d6dcc8b..03d9e8684948 100644
--- a/oox/source/ole/axbinarywriter.cxx
+++ b/oox/source/ole/axbinarywriter.cxx
@@ -70,7 +70,7 @@ void AxAlignedOutputStream::writeMemory( const void* opMem, sal_Int32 nBytes, si
 void AxAlignedOutputStream::pad( sal_Int32 nBytes, size_t nAtomSize )
 {
    //PRESUMABLY we need to pad with 0's here as appropriate
-   com::sun::star::uno::Sequence< sal_Int8 > aData( nBytes );
+   css::uno::Sequence< sal_Int8 > aData( nBytes );
    // ok we could be padding with rubbish here, but really that shouldn't matter
    // set to 0(s), easier to not get fooled by 0's when looking at
    // binary content......
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index fa54529b5334..c33f417a244b 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -327,13 +327,12 @@ bool OleHelper::importStdPic( StreamDataSequence& orGraphicData, BinaryInputStre
     return !rInStrm.isEof() && (nStdPicId == OLE_STDPIC_ID) && (nBytes > 0) && (rInStrm.readData( orGraphicData, nBytes ) == nBytes);
 }
 
-Reference< ::com::sun::star::frame::XFrame >
-lcl_getFrame( const  Reference< ::com::sun::star::frame::XModel >& rxModel )
+Reference< css::frame::XFrame > lcl_getFrame( const  Reference< css::frame::XModel >& rxModel )
 {
-    Reference< ::com::sun::star::frame::XFrame > xFrame;
+    Reference< css::frame::XFrame > xFrame;
     if ( rxModel.is() )
     {
-        Reference< ::com::sun::star::frame::XController > xController =  rxModel->getCurrentController();
+        Reference< css::frame::XController > xController =  rxModel->getCurrentController();
         xFrame =  xController.is() ? xController->getFrame() : NULL;
     }
     return xFrame;
@@ -366,12 +365,12 @@ public:
     bool isValid() { return mpModel != NULL; }
     void exportName( const Reference< XOutputStream >& rxOut );
     void exportCompObj( const Reference< XOutputStream >& rxOut );
-    void exportControl( const Reference< XOutputStream >& rxOut, const ::com::sun::star::awt::Size& rSize );
+    void exportControl( const Reference< XOutputStream >& rxOut, const css::awt::Size& rSize );
 };
 OleFormCtrlExportHelper::OleFormCtrlExportHelper(  const Reference< XComponentContext >& rxCtx, const Reference< XModel >& rxDocModel, const Reference< XControlModel >& xCntrlModel ) : maControl( "Unknown" ), mpModel( NULL ), maGrfHelper( rxCtx, lcl_getFrame( rxDocModel ), StorageRef() ), mxDocModel( rxDocModel ), mxControlModel( xCntrlModel )
 {
     // try to get the guid
-    Reference< com::sun::star::beans::XPropertySet > xProps( xCntrlModel, UNO_QUERY );
+    Reference< css::beans::XPropertySet > xProps( xCntrlModel, UNO_QUERY );
     if ( xProps.is() )
     {
         sal_Int16 nClassId = 0;
@@ -450,7 +449,7 @@ void OleFormCtrlExportHelper::exportControl( const Reference< XOutputStream >& r
     }
 }
 
-MSConvertOCXControls::MSConvertOCXControls( const Reference< ::com::sun::star::frame::XModel >& rxModel ) : SvxMSConvertOCXControls( rxModel ), mxCtx( comphelper::getProcessComponentContext() ), maGrfHelper( mxCtx, lcl_getFrame( rxModel ), StorageRef() )
+MSConvertOCXControls::MSConvertOCXControls( const Reference< css::frame::XModel >& rxModel ) : SvxMSConvertOCXControls( rxModel ), mxCtx( comphelper::getProcessComponentContext() ), maGrfHelper( mxCtx, lcl_getFrame( rxModel ), StorageRef() )
 {
 }
 
@@ -556,7 +555,7 @@ bool MSConvertOCXControls::ReadOCXStorage( tools::SvRef<SotStorage>& xOleStg,
     return  false;
 }
 
-bool MSConvertOCXControls::WriteOCXExcelKludgeStream( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutStrm, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > &rxControlModel, const com::sun::star::awt::Size& rSize,OUString &rName )
+bool MSConvertOCXControls::WriteOCXExcelKludgeStream( const css::uno::Reference< css::frame::XModel >& rxModel, const css::uno::Reference< css::io::XOutputStream >& xOutStrm, const css::uno::Reference< css::awt::XControlModel > &rxControlModel, const css::awt::Size& rSize,OUString &rName )
 {
     OleFormCtrlExportHelper exportHelper( comphelper::getProcessComponentContext(), rxModel, rxControlModel );
     if ( !exportHelper.isValid() )
@@ -573,7 +572,7 @@ bool MSConvertOCXControls::WriteOCXExcelKludgeStream( const ::com::sun::star::un
 
 bool MSConvertOCXControls::WriteOCXStream( const Reference< XModel >& rxModel, tools::SvRef<SotStorage> &xOleStg,
     const Reference< XControlModel > &rxControlModel,
-    const com::sun::star::awt::Size& rSize, OUString &rName)
+    const css::awt::Size& rSize, OUString &rName)
 {
     SvGlobalName aName;
 
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index fa32c6f6299d..b492b7a12cdb 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -151,10 +151,10 @@ VbaProject::~VbaProject()
 bool VbaProject::importVbaProject( StorageBase& rVbaPrjStrg )
 {
    // create GraphicHelper
-   Reference< ::com::sun::star::frame::XFrame > xFrame;
+   Reference< css::frame::XFrame > xFrame;
    if ( mxDocModel.is() )
    {
-       Reference< ::com::sun::star::frame::XController > xController =  mxDocModel->getCurrentController();
+       Reference< css::frame::XController > xController =  mxDocModel->getCurrentController();
        xFrame =  xController.is() ? xController->getFrame() : NULL;
    }
    StorageRef noStorage;
diff --git a/oox/source/ppt/animationspersist.cxx b/oox/source/ppt/animationspersist.cxx
index 6b919851da1d..a3bbb4e90363 100644
--- a/oox/source/ppt/animationspersist.cxx
+++ b/oox/source/ppt/animationspersist.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::text;
 
 namespace oox { namespace ppt {
 
-    void ShapeTargetElement::convert( ::com::sun::star::uno::Any & rTarget, sal_Int16 & rSubType ) const
+    void ShapeTargetElement::convert( css::uno::Any & rTarget, sal_Int16 & rSubType ) const
     {
         switch(mnType)
         {
diff --git a/oox/source/ppt/animationtypes.hxx b/oox/source/ppt/animationtypes.hxx
index 02316372ea70..0a4f46183d20 100644
--- a/oox/source/ppt/animationtypes.hxx
+++ b/oox/source/ppt/animationtypes.hxx
@@ -26,9 +26,9 @@
 namespace oox { namespace ppt {
 
 // ST_TLTime
-::com::sun::star::uno::Any GetTime( const OUString & val );
+css::uno::Any GetTime( const OUString & val );
 // ST_TLTimeAnimateValueTime
-::com::sun::star::uno::Any GetTimeAnimateValueTime( const OUString & val );
+css::uno::Any GetTimeAnimateValueTime( const OUString & val );
 
 } }
 
diff --git a/oox/source/ppt/animvariantcontext.hxx b/oox/source/ppt/animvariantcontext.hxx
index 70bcc0ff08b8..278e4255b2b2 100644
--- a/oox/source/ppt/animvariantcontext.hxx
+++ b/oox/source/ppt/animvariantcontext.hxx
@@ -32,14 +32,14 @@ namespace oox { namespace ppt {
         : public ::oox::core::FragmentHandler2
     {
     public:
-        AnimVariantContext( ::oox::core::FragmentHandler2& rParent, ::sal_Int32 aElement, ::com::sun::star::uno::Any & aValue );
+        AnimVariantContext( ::oox::core::FragmentHandler2& rParent, ::sal_Int32 aElement, css::uno::Any & aValue );
         virtual ~AnimVariantContext( ) throw( );
         virtual void onEndElement() override;
         virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
 
     private:
-        ::sal_Int32 mnElement;
-        ::com::sun::star::uno::Any& maValue;
+        ::sal_Int32                 mnElement;
+        css::uno::Any&              maValue;
         ::oox::drawingml::Color     maColor;
     };
 
diff --git a/oox/source/ppt/commonbehaviorcontext.hxx b/oox/source/ppt/commonbehaviorcontext.hxx
index a54c9cadb9a2..c6fb3c2f8720 100644
--- a/oox/source/ppt/commonbehaviorcontext.hxx
+++ b/oox/source/ppt/commonbehaviorcontext.hxx
@@ -40,7 +40,7 @@ namespace oox { namespace ppt {
     {
     public:
         CommonBehaviorContext( ::oox::core::FragmentHandler2& rParent,
-             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs,
+             const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs,
              const TimeNodePtr & pNode );
         virtual ~CommonBehaviorContext( )
             throw( );
diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx
index 61d9c5545909..fd35d3376444 100644
--- a/oox/source/ppt/commontimenodecontext.cxx
+++ b/oox/source/ppt/commontimenodecontext.cxx
@@ -91,206 +91,206 @@ struct preset_maping
 
 static const preset_maping gPresetMaping[] =
 {
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 1    ,"ooo-entrance-appear" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 2    ,"ooo-entrance-fly-in" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 3    ,"ooo-entrance-venetian-blinds" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 4    ,"ooo-entrance-box" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 5    ,"ooo-entrance-checkerboard" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 6    ,"ooo-entrance-circle" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 7    ,"ooo-entrance-fly-in-slow" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 8    ,"ooo-entrance-diamond" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 9    ,"ooo-entrance-dissolve-in" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 10   ,"ooo-entrance-fade-in" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 11   ,"ooo-entrance-flash-once" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 12   ,"ooo-entrance-peek-in" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 13   ,"ooo-entrance-plus" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 14   ,"ooo-entrance-random-bars" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 15   ,"ooo-entrance-spiral-in" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 16   ,"ooo-entrance-split" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 17   ,"ooo-entrance-stretchy" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 18   ,"ooo-entrance-diagonal-squares" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 19   ,"ooo-entrance-swivel" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 20   ,"ooo-entrance-wedge" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 21   ,"ooo-entrance-wheel" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 22   ,"ooo-entrance-wipe" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 23   ,"ooo-entrance-zoom" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 24   ,"ooo-entrance-random" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 25   ,"ooo-entrance-boomerang" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 26   ,"ooo-entrance-bounce" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 27   ,"ooo-entrance-colored-lettering" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 28   ,"ooo-entrance-movie-credits" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 29   ,"ooo-entrance-ease-in" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 30   ,"ooo-entrance-float" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 31   ,"ooo-entrance-turn-and-grow" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 34   ,"ooo-entrance-breaks" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 35   ,"ooo-entrance-pinwheel" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 37   ,"ooo-entrance-rise-up" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 38   ,"ooo-entrance-falling-in" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 39   ,"ooo-entrance-thread" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 40   ,"ooo-entrance-unfold" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 41   ,"ooo-entrance-whip" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 42   ,"ooo-entrance-ascend" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 43   ,"ooo-entrance-center-revolve" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 45   ,"ooo-entrance-fade-in-and-swivel" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 47   ,"ooo-entrance-descend" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 48   ,"ooo-entrance-sling" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 49   ,"ooo-entrance-spin-in" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 50   ,"ooo-entrance-compress" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 51   ,"ooo-entrance-magnify" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 52   ,"ooo-entrance-curve-up" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 53   ,"ooo-entrance-fade-in-and-zoom" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 54   ,"ooo-entrance-glide" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 55   ,"ooo-entrance-expand" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 56   ,"ooo-entrance-flip" },
-    { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 58   ,"ooo-entrance-fold" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 1    ,"ooo-emphasis-fill-color" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 2    ,"ooo-emphasis-font" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 3    ,"ooo-emphasis-font-color" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 4    ,"ooo-emphasis-font-size" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 5    ,"ooo-emphasis-font-style" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 6    ,"ooo-emphasis-grow-and-shrink" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 7    ,"ooo-emphasis-line-color" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 8    ,"ooo-emphasis-spin" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 9    ,"ooo-emphasis-transparency" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 10   ,"ooo-emphasis-bold-flash" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 14   ,"ooo-emphasis-blast" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 15   ,"ooo-emphasis-bold-reveal" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 16   ,"ooo-emphasis-color-over-by-word" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 18   ,"ooo-emphasis-reveal-underline" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 19   ,"ooo-emphasis-color-blend" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 20   ,"ooo-emphasis-color-over-by-letter" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 21   ,"ooo-emphasis-complementary-color" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 22   ,"ooo-emphasis-complementary-color-2" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 23   ,"ooo-emphasis-contrasting-color" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 24   ,"ooo-emphasis-darken" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 25   ,"ooo-emphasis-desaturate" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 26   ,"ooo-emphasis-flash-bulb" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 27   ,"ooo-emphasis-flicker" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 28   ,"ooo-emphasis-grow-with-color" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 30   ,"ooo-emphasis-lighten" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 31   ,"ooo-emphasis-style-emphasis" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 32   ,"ooo-emphasis-teeter" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 33   ,"ooo-emphasis-vertical-highlight" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 34   ,"ooo-emphasis-wave" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 35   ,"ooo-emphasis-blink" },
-    { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 36   ,"ooo-emphasis-shimmer" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 1        ,"ooo-exit-disappear" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 2        ,"ooo-exit-fly-out" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 3        ,"ooo-exit-venetian-blinds" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 4        ,"ooo-exit-box" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 5        ,"ooo-exit-checkerboard" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 6        ,"ooo-exit-circle" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 7        ,"ooo-exit-crawl-out" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 8        ,"ooo-exit-diamond" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 9        ,"ooo-exit-dissolve" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 10       ,"ooo-exit-fade-out" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 11       ,"ooo-exit-flash-once" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 12       ,"ooo-exit-peek-out" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 13       ,"ooo-exit-plus" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 14       ,"ooo-exit-random-bars" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 15       ,"ooo-exit-spiral-out" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 16       ,"ooo-exit-split" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 17       ,"ooo-exit-collapse" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 18       ,"ooo-exit-diagonal-squares" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 19       ,"ooo-exit-swivel" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 20       ,"ooo-exit-wedge" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 21       ,"ooo-exit-wheel" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 22       ,"ooo-exit-wipe" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 23       ,"ooo-exit-zoom" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 24       ,"ooo-exit-random" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 25       ,"ooo-exit-boomerang" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 26       ,"ooo-exit-bounce" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 27       ,"ooo-exit-colored-lettering" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 28       ,"ooo-exit-movie-credits" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 29       ,"ooo-exit-ease-out" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 30       ,"ooo-exit-float" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 31       ,"ooo-exit-turn-and-grow" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 34       ,"ooo-exit-breaks" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 35       ,"ooo-exit-pinwheel" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 37       ,"ooo-exit-sink-down" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 38       ,"ooo-exit-swish" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 39       ,"ooo-exit-thread" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 40       ,"ooo-exit-unfold" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 41       ,"ooo-exit-whip" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 42       ,"ooo-exit-descend" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 43       ,"ooo-exit-center-revolve" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 45       ,"ooo-exit-fade-out-and-swivel" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 47       ,"ooo-exit-ascend" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 48       ,"ooo-exit-sling" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 53       ,"ooo-exit-fade-out-and-zoom" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 55       ,"ooo-exit-contract" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 49       ,"ooo-exit-spin-out" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 50       ,"ooo-exit-stretchy" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 51       ,"ooo-exit-magnify" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 52       ,"ooo-exit-curve-down" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 54       ,"ooo-exit-glide" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 56       ,"ooo-exit-flip" },
-    { ::com::sun::star::presentation::EffectPresetClass::EXIT, 58       ,"ooo-exit-fold" },
-
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 16     ,"ooo-motionpath-4-point-star" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 5      ,"ooo-motionpath-5-point-star" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 11     ,"ooo-motionpath-6-point-star" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 17     ,"ooo-motionpath-8-point-star" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 1      ,"ooo-motionpath-circle" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 6      ,"ooo-motionpath-crescent-moon" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 3      ,"ooo-motionpath-diamond" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 13     ,"ooo-motionpath-equal-triangle" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 12     ,"ooo-motionpath-oval" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 9      ,"ooo-motionpath-heart" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 4      ,"ooo-motionpath-hexagon" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 10     ,"ooo-motionpath-octagon" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 14     ,"ooo-motionpath-parallelogram" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 15     ,"ooo-motionpath-pentagon" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 2      ,"ooo-motionpath-right-triangle" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 7      ,"ooo-motionpath-square" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 18     ,"ooo-motionpath-teardrop" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 8      ,"ooo-motionpath-trapezoid" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 37     ,"ooo-motionpath-arc-down" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 51     ,"ooo-motionpath-arc-left" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 58     ,"ooo-motionpath-arc-right" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 44     ,"ooo-motionpath-arc-up" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 41     ,"ooo-motionpath-bounce-left" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 54     ,"ooo-motionpath-bounce-right" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 48     ,"ooo-motionpath-curvy-left" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 61     ,"ooo-motionpath-curvy-right" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 60     ,"ooo-motionpath-decaying-wave" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 49     ,"ooo-motionpath-diagonal-down-right" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 56     ,"ooo-motionpath-diagonal-up-right" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 42     ,"ooo-motionpath-down" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 52     ,"ooo-motionpath-funnel" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 53     ,"ooo-motionpath-spring" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 62     ,"ooo-motionpath-stairs-down" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 50     ,"ooo-motionpath-turn-down" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 36     ,"ooo-motionpath-turn-down-right" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 43     ,"ooo-motionpath-turn-up" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 57     ,"ooo-motionpath-turn-up-right" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 64     ,"ooo-motionpath-up" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 47     ,"ooo-motionpath-wave" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 38     ,"ooo-motionpath-zigzag" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 31     ,"ooo-motionpath-bean" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 25     ,"ooo-motionpath-buzz-saw" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 20     ,"ooo-motionpath-curved-square" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 21     ,"ooo-motionpath-curved-x" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 23     ,"ooo-motionpath-curvy-star" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 28     ,"ooo-motionpath-figure-8-four" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 26     ,"ooo-motionpath-horizontal-figure-8" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 34     ,"ooo-motionpath-inverted-square" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 33     ,"ooo-motionpath-inverted-triangle" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 24     ,"ooo-motionpath-loop-de-loop" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 29     ,"ooo-motionpath-neutron" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 27     ,"ooo-motionpath-peanut" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 32     ,"ooo-motionpath-clover" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 19     ,"ooo-motionpath-pointy-star" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 30     ,"ooo-motionpath-swoosh" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 22     ,"ooo-motionpath-vertical-figure-8" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 35     ,"ooo-motionpath-left" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 63     ,"ooo-motionpath-right" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 55     ,"ooo-motionpath-spiral-left" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 46     ,"ooo-motionpath-spiral-right" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 40     ,"ooo-motionpath-sine-wave" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 59     ,"ooo-motionpath-s-curve-1" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 39     ,"ooo-motionpath-s-curve-2" },
-    { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 45     ,"ooo-motionpath-heartbeat" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 1    ,"ooo-entrance-appear" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 2    ,"ooo-entrance-fly-in" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 3    ,"ooo-entrance-venetian-blinds" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 4    ,"ooo-entrance-box" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 5    ,"ooo-entrance-checkerboard" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 6    ,"ooo-entrance-circle" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 7    ,"ooo-entrance-fly-in-slow" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 8    ,"ooo-entrance-diamond" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 9    ,"ooo-entrance-dissolve-in" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 10   ,"ooo-entrance-fade-in" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 11   ,"ooo-entrance-flash-once" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 12   ,"ooo-entrance-peek-in" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 13   ,"ooo-entrance-plus" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 14   ,"ooo-entrance-random-bars" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 15   ,"ooo-entrance-spiral-in" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 16   ,"ooo-entrance-split" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 17   ,"ooo-entrance-stretchy" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 18   ,"ooo-entrance-diagonal-squares" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 19   ,"ooo-entrance-swivel" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 20   ,"ooo-entrance-wedge" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 21   ,"ooo-entrance-wheel" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 22   ,"ooo-entrance-wipe" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 23   ,"ooo-entrance-zoom" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 24   ,"ooo-entrance-random" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 25   ,"ooo-entrance-boomerang" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 26   ,"ooo-entrance-bounce" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 27   ,"ooo-entrance-colored-lettering" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 28   ,"ooo-entrance-movie-credits" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 29   ,"ooo-entrance-ease-in" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 30   ,"ooo-entrance-float" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 31   ,"ooo-entrance-turn-and-grow" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 34   ,"ooo-entrance-breaks" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 35   ,"ooo-entrance-pinwheel" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 37   ,"ooo-entrance-rise-up" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 38   ,"ooo-entrance-falling-in" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 39   ,"ooo-entrance-thread" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 40   ,"ooo-entrance-unfold" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 41   ,"ooo-entrance-whip" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 42   ,"ooo-entrance-ascend" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 43   ,"ooo-entrance-center-revolve" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 45   ,"ooo-entrance-fade-in-and-swivel" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 47   ,"ooo-entrance-descend" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 48   ,"ooo-entrance-sling" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 49   ,"ooo-entrance-spin-in" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 50   ,"ooo-entrance-compress" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 51   ,"ooo-entrance-magnify" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 52   ,"ooo-entrance-curve-up" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 53   ,"ooo-entrance-fade-in-and-zoom" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 54   ,"ooo-entrance-glide" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 55   ,"ooo-entrance-expand" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 56   ,"ooo-entrance-flip" },
+    { css::presentation::EffectPresetClass::ENTRANCE, 58   ,"ooo-entrance-fold" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 1    ,"ooo-emphasis-fill-color" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 2    ,"ooo-emphasis-font" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 3    ,"ooo-emphasis-font-color" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 4    ,"ooo-emphasis-font-size" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 5    ,"ooo-emphasis-font-style" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 6    ,"ooo-emphasis-grow-and-shrink" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 7    ,"ooo-emphasis-line-color" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 8    ,"ooo-emphasis-spin" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 9    ,"ooo-emphasis-transparency" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 10   ,"ooo-emphasis-bold-flash" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 14   ,"ooo-emphasis-blast" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 15   ,"ooo-emphasis-bold-reveal" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 16   ,"ooo-emphasis-color-over-by-word" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 18   ,"ooo-emphasis-reveal-underline" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 19   ,"ooo-emphasis-color-blend" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 20   ,"ooo-emphasis-color-over-by-letter" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 21   ,"ooo-emphasis-complementary-color" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 22   ,"ooo-emphasis-complementary-color-2" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 23   ,"ooo-emphasis-contrasting-color" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 24   ,"ooo-emphasis-darken" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 25   ,"ooo-emphasis-desaturate" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 26   ,"ooo-emphasis-flash-bulb" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 27   ,"ooo-emphasis-flicker" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 28   ,"ooo-emphasis-grow-with-color" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 30   ,"ooo-emphasis-lighten" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 31   ,"ooo-emphasis-style-emphasis" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 32   ,"ooo-emphasis-teeter" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 33   ,"ooo-emphasis-vertical-highlight" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 34   ,"ooo-emphasis-wave" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 35   ,"ooo-emphasis-blink" },
+    { css::presentation::EffectPresetClass::EMPHASIS, 36   ,"ooo-emphasis-shimmer" },
+    { css::presentation::EffectPresetClass::EXIT, 1        ,"ooo-exit-disappear" },
+    { css::presentation::EffectPresetClass::EXIT, 2        ,"ooo-exit-fly-out" },
+    { css::presentation::EffectPresetClass::EXIT, 3        ,"ooo-exit-venetian-blinds" },
+    { css::presentation::EffectPresetClass::EXIT, 4        ,"ooo-exit-box" },
+    { css::presentation::EffectPresetClass::EXIT, 5        ,"ooo-exit-checkerboard" },
+    { css::presentation::EffectPresetClass::EXIT, 6        ,"ooo-exit-circle" },
+    { css::presentation::EffectPresetClass::EXIT, 7        ,"ooo-exit-crawl-out" },
+    { css::presentation::EffectPresetClass::EXIT, 8        ,"ooo-exit-diamond" },
+    { css::presentation::EffectPresetClass::EXIT, 9        ,"ooo-exit-dissolve" },
+    { css::presentation::EffectPresetClass::EXIT, 10       ,"ooo-exit-fade-out" },
+    { css::presentation::EffectPresetClass::EXIT, 11       ,"ooo-exit-flash-once" },
+    { css::presentation::EffectPresetClass::EXIT, 12       ,"ooo-exit-peek-out" },
+    { css::presentation::EffectPresetClass::EXIT, 13       ,"ooo-exit-plus" },
+    { css::presentation::EffectPresetClass::EXIT, 14       ,"ooo-exit-random-bars" },
+    { css::presentation::EffectPresetClass::EXIT, 15       ,"ooo-exit-spiral-out" },
+    { css::presentation::EffectPresetClass::EXIT, 16       ,"ooo-exit-split" },
+    { css::presentation::EffectPresetClass::EXIT, 17       ,"ooo-exit-collapse" },
+    { css::presentation::EffectPresetClass::EXIT, 18       ,"ooo-exit-diagonal-squares" },
+    { css::presentation::EffectPresetClass::EXIT, 19       ,"ooo-exit-swivel" },
+    { css::presentation::EffectPresetClass::EXIT, 20       ,"ooo-exit-wedge" },
+    { css::presentation::EffectPresetClass::EXIT, 21       ,"ooo-exit-wheel" },
+    { css::presentation::EffectPresetClass::EXIT, 22       ,"ooo-exit-wipe" },
+    { css::presentation::EffectPresetClass::EXIT, 23       ,"ooo-exit-zoom" },
+    { css::presentation::EffectPresetClass::EXIT, 24       ,"ooo-exit-random" },
+    { css::presentation::EffectPresetClass::EXIT, 25       ,"ooo-exit-boomerang" },
+    { css::presentation::EffectPresetClass::EXIT, 26       ,"ooo-exit-bounce" },
+    { css::presentation::EffectPresetClass::EXIT, 27       ,"ooo-exit-colored-lettering" },
+    { css::presentation::EffectPresetClass::EXIT, 28       ,"ooo-exit-movie-credits" },
+    { css::presentation::EffectPresetClass::EXIT, 29       ,"ooo-exit-ease-out" },
+    { css::presentation::EffectPresetClass::EXIT, 30       ,"ooo-exit-float" },
+    { css::presentation::EffectPresetClass::EXIT, 31       ,"ooo-exit-turn-and-grow" },
+    { css::presentation::EffectPresetClass::EXIT, 34       ,"ooo-exit-breaks" },
+    { css::presentation::EffectPresetClass::EXIT, 35       ,"ooo-exit-pinwheel" },
+    { css::presentation::EffectPresetClass::EXIT, 37       ,"ooo-exit-sink-down" },
+    { css::presentation::EffectPresetClass::EXIT, 38       ,"ooo-exit-swish" },
+    { css::presentation::EffectPresetClass::EXIT, 39       ,"ooo-exit-thread" },
+    { css::presentation::EffectPresetClass::EXIT, 40       ,"ooo-exit-unfold" },
+    { css::presentation::EffectPresetClass::EXIT, 41       ,"ooo-exit-whip" },
+    { css::presentation::EffectPresetClass::EXIT, 42       ,"ooo-exit-descend" },
+    { css::presentation::EffectPresetClass::EXIT, 43       ,"ooo-exit-center-revolve" },
+    { css::presentation::EffectPresetClass::EXIT, 45       ,"ooo-exit-fade-out-and-swivel" },
+    { css::presentation::EffectPresetClass::EXIT, 47       ,"ooo-exit-ascend" },
+    { css::presentation::EffectPresetClass::EXIT, 48       ,"ooo-exit-sling" },
+    { css::presentation::EffectPresetClass::EXIT, 53       ,"ooo-exit-fade-out-and-zoom" },
+    { css::presentation::EffectPresetClass::EXIT, 55       ,"ooo-exit-contract" },
+    { css::presentation::EffectPresetClass::EXIT, 49       ,"ooo-exit-spin-out" },
+    { css::presentation::EffectPresetClass::EXIT, 50       ,"ooo-exit-stretchy" },
+    { css::presentation::EffectPresetClass::EXIT, 51       ,"ooo-exit-magnify" },
+    { css::presentation::EffectPresetClass::EXIT, 52       ,"ooo-exit-curve-down" },
+    { css::presentation::EffectPresetClass::EXIT, 54       ,"ooo-exit-glide" },
+    { css::presentation::EffectPresetClass::EXIT, 56       ,"ooo-exit-flip" },
+    { css::presentation::EffectPresetClass::EXIT, 58       ,"ooo-exit-fold" },
+
+    { css::presentation::EffectPresetClass::MOTIONPATH, 16     ,"ooo-motionpath-4-point-star" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 5      ,"ooo-motionpath-5-point-star" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 11     ,"ooo-motionpath-6-point-star" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 17     ,"ooo-motionpath-8-point-star" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 1      ,"ooo-motionpath-circle" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 6      ,"ooo-motionpath-crescent-moon" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 3      ,"ooo-motionpath-diamond" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 13     ,"ooo-motionpath-equal-triangle" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 12     ,"ooo-motionpath-oval" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 9      ,"ooo-motionpath-heart" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 4      ,"ooo-motionpath-hexagon" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 10     ,"ooo-motionpath-octagon" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 14     ,"ooo-motionpath-parallelogram" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 15     ,"ooo-motionpath-pentagon" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 2      ,"ooo-motionpath-right-triangle" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 7      ,"ooo-motionpath-square" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 18     ,"ooo-motionpath-teardrop" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 8      ,"ooo-motionpath-trapezoid" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 37     ,"ooo-motionpath-arc-down" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 51     ,"ooo-motionpath-arc-left" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 58     ,"ooo-motionpath-arc-right" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 44     ,"ooo-motionpath-arc-up" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 41     ,"ooo-motionpath-bounce-left" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 54     ,"ooo-motionpath-bounce-right" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 48     ,"ooo-motionpath-curvy-left" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 61     ,"ooo-motionpath-curvy-right" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 60     ,"ooo-motionpath-decaying-wave" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 49     ,"ooo-motionpath-diagonal-down-right" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 56     ,"ooo-motionpath-diagonal-up-right" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 42     ,"ooo-motionpath-down" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 52     ,"ooo-motionpath-funnel" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 53     ,"ooo-motionpath-spring" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 62     ,"ooo-motionpath-stairs-down" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 50     ,"ooo-motionpath-turn-down" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 36     ,"ooo-motionpath-turn-down-right" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 43     ,"ooo-motionpath-turn-up" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 57     ,"ooo-motionpath-turn-up-right" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 64     ,"ooo-motionpath-up" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 47     ,"ooo-motionpath-wave" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 38     ,"ooo-motionpath-zigzag" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 31     ,"ooo-motionpath-bean" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 25     ,"ooo-motionpath-buzz-saw" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 20     ,"ooo-motionpath-curved-square" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 21     ,"ooo-motionpath-curved-x" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 23     ,"ooo-motionpath-curvy-star" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 28     ,"ooo-motionpath-figure-8-four" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 26     ,"ooo-motionpath-horizontal-figure-8" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 34     ,"ooo-motionpath-inverted-square" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 33     ,"ooo-motionpath-inverted-triangle" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 24     ,"ooo-motionpath-loop-de-loop" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 29     ,"ooo-motionpath-neutron" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 27     ,"ooo-motionpath-peanut" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 32     ,"ooo-motionpath-clover" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 19     ,"ooo-motionpath-pointy-star" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 30     ,"ooo-motionpath-swoosh" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 22     ,"ooo-motionpath-vertical-figure-8" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 35     ,"ooo-motionpath-left" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 63     ,"ooo-motionpath-right" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 55     ,"ooo-motionpath-spiral-left" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 46     ,"ooo-motionpath-spiral-right" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 40     ,"ooo-motionpath-sine-wave" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 59     ,"ooo-motionpath-s-curve-1" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 39     ,"ooo-motionpath-s-curve-2" },
+    { css::presentation::EffectPresetClass::MOTIONPATH, 45     ,"ooo-motionpath-heartbeat" },
 
     { 0,0,0 }
 };
diff --git a/oox/source/ppt/commontimenodecontext.hxx b/oox/source/ppt/commontimenodecontext.hxx
index aadaee7e723a..535348013f36 100644
--- a/oox/source/ppt/commontimenodecontext.hxx
+++ b/oox/source/ppt/commontimenodecontext.hxx
@@ -32,7 +32,7 @@ namespace oox { namespace ppt {
         : public TimeNodeContext
     {
     public:
-        CommonTimeNodeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32  aElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode);
+        CommonTimeNodeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32  aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode);
         virtual ~CommonTimeNodeContext( ) throw( );
 
         virtual void onEndElement() override;
@@ -41,7 +41,7 @@ namespace oox { namespace ppt {
 
     private:
         bool mbIterate;
-        ::com::sun::star::uno::Reference< ::com::sun::star::animations::XIterateContainer > mxIter;
+        css::uno::Reference< css::animations::XIterateContainer > mxIter;
     };
 
 } }
diff --git a/oox/source/ppt/conditioncontext.hxx b/oox/source/ppt/conditioncontext.hxx
index a57dd1af6dc3..4ce9cfbca578 100644
--- a/oox/source/ppt/conditioncontext.hxx
+++ b/oox/source/ppt/conditioncontext.hxx
@@ -36,13 +36,13 @@ namespace oox { namespace ppt {
     {
     public:
         CondContext( ::oox::core::FragmentHandler2& rParent,
-                     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs,
+                     const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs,
                      const TimeNodePtr & pNode, AnimationCondition & aCond );
         virtual ~CondContext( ) throw( );
         virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
 
     private:
-        ::com::sun::star::animations::Event  maEvent;
+        css::animations::Event  maEvent;
         AnimationCondition &                 maCond;
     };
 
@@ -53,7 +53,7 @@ namespace oox { namespace ppt {
     public:
         CondListContext( ::oox::core::FragmentHandler2& rParent,
              sal_Int32  aElement,
-             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs,
+             const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs,
              const TimeNodePtr & pNode, AnimationConditionList & aCondList );
         virtual ~CondListContext( ) throw( );
 
diff --git a/oox/source/ppt/customshowlistcontext.cxx b/oox/source/ppt/customshowlistcontext.cxx
index a388241a8f9a..133fd25cda24 100644
--- a/oox/source/ppt/customshowlistcontext.cxx
+++ b/oox/source/ppt/customshowlistcontext.cxx
@@ -31,7 +31,7 @@ class CustomShowContext : public ::oox::core::FragmentHandler2
 
 public:
     CustomShowContext( ::oox::core::FragmentHandler2& rParent,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs,
+        const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs,
             CustomShow& rCustomShow );
     virtual ~CustomShowContext( );
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx
index 1e70c4275d27..0a3f3d8a71b2 100644
--- a/oox/source/ppt/dgmimport.cxx
+++ b/oox/source/ppt/dgmimport.cxx
@@ -51,7 +51,7 @@ uno::Reference< uno::XInterface > SAL_CALL QuickDiagrammingImport_createInstance
     return static_cast<cppu::OWeakObject*>(new QuickDiagrammingImport( rxContext ));
 }
 
-QuickDiagrammingImport::QuickDiagrammingImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
+QuickDiagrammingImport::QuickDiagrammingImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
     : XmlFilterBase( rxContext )
 {}
 
diff --git a/oox/source/ppt/pptfilterhelpers.cxx b/oox/source/ppt/pptfilterhelpers.cxx
index d51cfd01d69b..76b158cd16b8 100644
--- a/oox/source/ppt/pptfilterhelpers.cxx
+++ b/oox/source/ppt/pptfilterhelpers.cxx
@@ -28,45 +28,45 @@ namespace oox { namespace ppt {
 
     static const transition gTransitions[] =
     {
-        { "wipe(up)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::TOPTOBOTTOM, true },
-        { "wipe(right)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::LEFTTORIGHT, false },
-        { "wipe(left)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::LEFTTORIGHT, true },
-        { "wipe(down)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::TOPTOBOTTOM, false },
-        { "wheel(1)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::ONEBLADE, true },
-        { "wheel(2)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::TWOBLADEVERTICAL, true },
-        { "wheel(3)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::THREEBLADE, true },
-        { "wheel(4)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::FOURBLADE, true },
-        { "wheel(8)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::EIGHTBLADE, true },
-        { "strips(downLeft)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALRIGHT, true },
-        { "strips(upLeft)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALLEFT, false },
-        { "strips(downRight)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALLEFT, true },
-        { "strips(upRight)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALRIGHT, false },
-        { "barn(inVertical)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, false },
-        { "barn(outVertical)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, true },
-        { "barn(inHorizontal)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, false },
-        { "barn(outHorizontal)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, true },
-        { "randombar(vertical)", ::com::sun::star::animations::TransitionType::RANDOMBARWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, true},
-        { "randombar(horizontal)", ::com::sun::star::animations::TransitionType::RANDOMBARWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, true },
-        { "checkerboard(down)", ::com::sun::star::animations::TransitionType::CHECKERBOARDWIPE, ::com::sun::star::animations::TransitionSubType::DOWN, true},
-        { "checkerboard(across)", ::com::sun::star::animations::TransitionType::CHECKERBOARDWIPE, ::com::sun::star::animations::TransitionSubType::ACROSS, true },
-        { "plus(out)", ::com::sun::star::animations::TransitionType::FOURBOXWIPE, ::com::sun::star::animations::TransitionSubType::CORNERSIN, false },
-        { "plus(in)", ::com::sun::star::animations::TransitionType::FOURBOXWIPE, ::com::sun::star::animations::TransitionSubType::CORNERSIN, true },
-        { "diamond(out)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::DIAMOND, true },
-        { "diamond(in)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::DIAMOND, false },
-        { "circle(out)", ::com::sun::star::animations::TransitionType::ELLIPSEWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, true },
-        { "circle(in)", ::com::sun::star::animations::TransitionType::ELLIPSEWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, false },
-        { "box(out)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::RECTANGLE, true },
-        { "box(in)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::RECTANGLE, false },
-        { "wedge", ::com::sun::star::animations::TransitionType::FANWIPE, ::com::sun::star::animations::TransitionSubType::CENTERTOP, true },
-        { "blinds(vertical)", ::com::sun::star::animations::TransitionType::BLINDSWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, true },
-        { "blinds(horizontal)", ::com::sun::star::animations::TransitionType::BLINDSWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, true },
-        { "fade", ::com::sun::star::animations::TransitionType::FADE, ::com::sun::star::animations::TransitionSubType::CROSSFADE, true },
-        { "slide(fromTop)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMTOP, true },
-        { "slide(fromRight)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMRIGHT, true },
-        { "slide(fromLeft)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMLEFT, true },
-        { "slide(fromBottom)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMBOTTOM, true },
-        { "dissolve", ::com::sun::star::animations::TransitionType::DISSOLVE, ::com::sun::star::animations::TransitionSubType::DEFAULT, true },
-        { "image", ::com::sun::star::animations::TransitionType::DISSOLVE, ::com::sun::star::animations::TransitionSubType::DEFAULT, true }, // TODO
+        { "wipe(up)", css::animations::TransitionType::BARWIPE, css::animations::TransitionSubType::TOPTOBOTTOM, true },
+        { "wipe(right)", css::animations::TransitionType::BARWIPE, css::animations::TransitionSubType::LEFTTORIGHT, false },
+        { "wipe(left)", css::animations::TransitionType::BARWIPE, css::animations::TransitionSubType::LEFTTORIGHT, true },
+        { "wipe(down)", css::animations::TransitionType::BARWIPE, css::animations::TransitionSubType::TOPTOBOTTOM, false },
+        { "wheel(1)", css::animations::TransitionType::PINWHEELWIPE, css::animations::TransitionSubType::ONEBLADE, true },
+        { "wheel(2)", css::animations::TransitionType::PINWHEELWIPE, css::animations::TransitionSubType::TWOBLADEVERTICAL, true },
+        { "wheel(3)", css::animations::TransitionType::PINWHEELWIPE, css::animations::TransitionSubType::THREEBLADE, true },
+        { "wheel(4)", css::animations::TransitionType::PINWHEELWIPE, css::animations::TransitionSubType::FOURBLADE, true },
+        { "wheel(8)", css::animations::TransitionType::PINWHEELWIPE, css::animations::TransitionSubType::EIGHTBLADE, true },
+        { "strips(downLeft)", css::animations::TransitionType::WATERFALLWIPE, css::animations::TransitionSubType::HORIZONTALRIGHT, true },
+        { "strips(upLeft)", css::animations::TransitionType::WATERFALLWIPE, css::animations::TransitionSubType::HORIZONTALLEFT, false },
+        { "strips(downRight)", css::animations::TransitionType::WATERFALLWIPE, css::animations::TransitionSubType::HORIZONTALLEFT, true },
+        { "strips(upRight)", css::animations::TransitionType::WATERFALLWIPE, css::animations::TransitionSubType::HORIZONTALRIGHT, false },
+        { "barn(inVertical)", css::animations::TransitionType::BARNDOORWIPE, css::animations::TransitionSubType::VERTICAL, false },
+        { "barn(outVertical)", css::animations::TransitionType::BARNDOORWIPE, css::animations::TransitionSubType::VERTICAL, true },
+        { "barn(inHorizontal)", css::animations::TransitionType::BARNDOORWIPE, css::animations::TransitionSubType::HORIZONTAL, false },
+        { "barn(outHorizontal)", css::animations::TransitionType::BARNDOORWIPE, css::animations::TransitionSubType::HORIZONTAL, true },
+        { "randombar(vertical)", css::animations::TransitionType::RANDOMBARWIPE, css::animations::TransitionSubType::VERTICAL, true},
+        { "randombar(horizontal)", css::animations::TransitionType::RANDOMBARWIPE, css::animations::TransitionSubType::HORIZONTAL, true },
+        { "checkerboard(down)", css::animations::TransitionType::CHECKERBOARDWIPE, css::animations::TransitionSubType::DOWN, true},
+        { "checkerboard(across)", css::animations::TransitionType::CHECKERBOARDWIPE, css::animations::TransitionSubType::ACROSS, true },
+        { "plus(out)", css::animations::TransitionType::FOURBOXWIPE, css::animations::TransitionSubType::CORNERSIN, false },
+        { "plus(in)", css::animations::TransitionType::FOURBOXWIPE, css::animations::TransitionSubType::CORNERSIN, true },
+        { "diamond(out)", css::animations::TransitionType::IRISWIPE, css::animations::TransitionSubType::DIAMOND, true },
+        { "diamond(in)", css::animations::TransitionType::IRISWIPE, css::animations::TransitionSubType::DIAMOND, false },
+        { "circle(out)", css::animations::TransitionType::ELLIPSEWIPE, css::animations::TransitionSubType::HORIZONTAL, true },
+        { "circle(in)", css::animations::TransitionType::ELLIPSEWIPE, css::animations::TransitionSubType::HORIZONTAL, false },
+        { "box(out)", css::animations::TransitionType::IRISWIPE, css::animations::TransitionSubType::RECTANGLE, true },
+        { "box(in)", css::animations::TransitionType::IRISWIPE, css::animations::TransitionSubType::RECTANGLE, false },
+        { "wedge", css::animations::TransitionType::FANWIPE, css::animations::TransitionSubType::CENTERTOP, true },
+        { "blinds(vertical)", css::animations::TransitionType::BLINDSWIPE, css::animations::TransitionSubType::VERTICAL, true },
+        { "blinds(horizontal)", css::animations::TransitionType::BLINDSWIPE, css::animations::TransitionSubType::HORIZONTAL, true },
+        { "fade", css::animations::TransitionType::FADE, css::animations::TransitionSubType::CROSSFADE, true },
+        { "slide(fromTop)", css::animations::TransitionType::SLIDEWIPE, css::animations::TransitionSubType::FROMTOP, true },
+        { "slide(fromRight)", css::animations::TransitionType::SLIDEWIPE, css::animations::TransitionSubType::FROMRIGHT, true },
+        { "slide(fromLeft)", css::animations::TransitionType::SLIDEWIPE, css::animations::TransitionSubType::FROMLEFT, true },
+        { "slide(fromBottom)", css::animations::TransitionType::SLIDEWIPE, css::animations::TransitionSubType::FROMBOTTOM, true },
+        { "dissolve", css::animations::TransitionType::DISSOLVE, css::animations::TransitionSubType::DEFAULT, true },
+        { "image", css::animations::TransitionType::DISSOLVE, css::animations::TransitionSubType::DEFAULT, true }, // TODO
         { NULL, 0, 0, false }
     };
 
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx
index d1438918b14b..7f778cd8f9b9 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -116,7 +116,7 @@ void ResolveTextFields( XmlFilterBase& rFilter )
                             xDrawPages->getByIndex( nPageNumber - 1 ) >>= xDrawPage;
                             if ( bNotes )
                             {
-                                Reference< ::com::sun::star::presentation::XPresentationPage > xPresentationPage( xDrawPage, UNO_QUERY_THROW );
+                                Reference< css::presentation::XPresentationPage > xPresentationPage( xDrawPage, UNO_QUERY_THROW );
                                 xDrawPage = xPresentationPage->getNotesPage();
                             }
                             Reference< container::XNamed > xNamed( xDrawPage, UNO_QUERY_THROW );
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index 82d0f9fe69ca..732df6dbc605 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::animations;
 namespace oox { namespace ppt {
 
 SlidePersist::SlidePersist( XmlFilterBase& rFilter, bool bMaster, bool bNotes,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& rxPage,
+    const css::uno::Reference< css::drawing::XDrawPage >& rxPage,
         oox::drawingml::ShapePtr pShapesPtr, const drawingml::TextListStylePtr & pDefaultTextStyle )
 : mpDrawingPtr( new oox::vml::Drawing( rFilter, rxPage, oox::vml::VMLDRAWING_POWERPOINT ) )
 , mxPage( rxPage )
@@ -67,7 +67,7 @@ SlidePersist::SlidePersist( XmlFilterBase& rFilter, bool bMaster, bool bNotes,
 }
 
 #if OSL_DEBUG_LEVEL > 0
-::com::sun::star::uno::WeakReference< ::com::sun::star::drawing::XDrawPage > SlidePersist::mxDebugPage;
+css::uno::WeakReference< css::drawing::XDrawPage > SlidePersist::mxDebugPage;
 #endif
 
 SlidePersist::~SlidePersist()
diff --git a/oox/source/ppt/timeanimvaluecontext.hxx b/oox/source/ppt/timeanimvaluecontext.hxx
index 21d60c0e3dd9..add8fe040f84 100644
--- a/oox/source/ppt/timeanimvaluecontext.hxx
+++ b/oox/source/ppt/timeanimvaluecontext.hxx
@@ -31,7 +31,7 @@ namespace oox { namespace ppt {
     {
     public:
         TimeAnimValueListContext( ::oox::core::FragmentHandler2& rParent,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs,
+            const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs,
             TimeAnimationValueList & aTavList );
 
         virtual ~TimeAnimValueListContext( );
diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
index 2191098d8c90..bbf135ee873b 100644
--- a/oox/source/ppt/timenode.cxx
+++ b/oox/source/ppt/timenode.cxx
@@ -106,7 +106,7 @@ namespace oox { namespace ppt {
 
 // BEGIN CUT&PASTE from sd/source/filter/ppt/pptinanimations.hxx
 
-    static void fixMainSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
+    static void fixMainSequenceTiming( const css::uno::Reference< css::animations::XAnimationNode >& xNode )
     {
         try
         {
@@ -149,7 +149,7 @@ namespace oox { namespace ppt {
                                 {
                                     sal_Int16 nNodeType = 0;
                                     p->Value >>= nNodeType;
-                                    if( nNodeType != ::com::sun::star::presentation::EffectNodeType::ON_CLICK )
+                                    if( nNodeType != css::presentation::EffectNodeType::ON_CLICK )
                                     {
                                         // first effect does not start on click, so correct
                                         // first click nodes begin to 0s
@@ -171,7 +171,7 @@ namespace oox { namespace ppt {
         }
     }
 
-    static void fixInteractiveSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
+    static void fixInteractiveSequenceTiming( const css::uno::Reference< css::animations::XAnimationNode >& xNode )
     {
         try
         {
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 8f38e2b0763e..c7a957d0536e 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -268,7 +268,7 @@ ShapeContextHandler::getContextHandler(sal_Int32 nElement)
     return xResult;
 }
 
-// ::com::sun::star::xml::sax::XFastContextHandler:
+// css::xml::sax::XFastContextHandler:
 void SAL_CALL ShapeContextHandler::startFastElement
 (::sal_Int32 Element,
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
@@ -416,7 +416,7 @@ void SAL_CALL ShapeContextHandler::characters(const OUString & aChars)
         xContextHandler->characters(aChars);
 }
 
-// ::com::sun::star::xml::sax::XFastShapeContextHandler:
+// css::xml::sax::XFastShapeContextHandler:
 uno::Reference< drawing::XShape > SAL_CALL
 ShapeContextHandler::getShape() throw (uno::RuntimeException, std::exception)
 {
@@ -600,12 +600,12 @@ void SAL_CALL ShapeContextHandler::setRelationFragmentPath(const OUString & the_
     msRelationFragmentPath = the_value;
 }
 
-::sal_Int32 SAL_CALL ShapeContextHandler::getStartToken() throw (::com::sun::star::uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL ShapeContextHandler::getStartToken() throw (css::uno::RuntimeException, std::exception)
 {
     return mnStartToken;
 }
 
-void SAL_CALL ShapeContextHandler::setStartToken( ::sal_Int32 _starttoken ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL ShapeContextHandler::setStartToken( ::sal_Int32 _starttoken ) throw (css::uno::RuntimeException, std::exception)
 {
     mnStartToken = _starttoken;
 }
diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx
index 87910910025e..aba35e49c081 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -56,7 +56,7 @@ public:
 
     virtual ~ShapeContextHandler();
 
-    // ::com::sun::star::lang::XServiceInfo:
+    // css::lang::XServiceInfo:
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override;
 
@@ -66,7 +66,7 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
 
-    // ::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)
@@ -102,7 +102,7 @@ public:
     virtual void SAL_CALL characters(const OUString & aChars)
         throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
 
-    // ::com::sun::star::xml::sax::XFastShapeContextHandler:
+    // css::xml::sax::XFastShapeContextHandler:
     virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getShape()
         throw (css::uno::RuntimeException, std::exception) override;
 
@@ -133,8 +133,8 @@ public:
     (const OUString & the_value)
         throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual ::sal_Int32 SAL_CALL getStartToken() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStartToken( ::sal_Int32 _starttoken ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getStartToken() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setStartToken( ::sal_Int32 _starttoken ) throw (css::uno::RuntimeException, std::exception) override;
 
     virtual css::awt::Point SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setPosition(const css::awt::Point& rPosition) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.hxx b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
index 82360a2620b8..994a0e6fd9bc 100644
--- a/oox/source/shape/ShapeDrawingFragmentHandler.hxx
+++ b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
@@ -21,7 +21,7 @@ class ShapeDrawingFragmentHandler : public oox::core::FragmentHandler2
 public:
     ShapeDrawingFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, oox::drawingml::ShapePtr pGroupShapePtr ) throw();
     virtual ~ShapeDrawingFragmentHandler() throw();
-    virtual void SAL_CALL endDocument() throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
     virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const AttributeList& rAttribs ) override;
 
 private:
diff --git a/oox/source/shape/ShapeFilterBase.hxx b/oox/source/shape/ShapeFilterBase.hxx
index 70160b62d7ec..61ecc8c0ecb7 100644
--- a/oox/source/shape/ShapeFilterBase.hxx
+++ b/oox/source/shape/ShapeFilterBase.hxx
@@ -36,8 +36,8 @@ public:
     typedef std::shared_ptr<ShapeFilterBase> Pointer_t;
 
     explicit            ShapeFilterBase(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
-                            throw( ::com::sun::star::uno::RuntimeException );
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext )
+                            throw( css::uno::RuntimeException );
 
     virtual             ~ShapeFilterBase();
 
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 41f4ebd6dd71..daeca3fbaf17 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -532,18 +532,18 @@ SimpleShape::SimpleShape( Drawing& rDrawing, const OUString& rService ) :
 
 void lcl_setSurround(PropertySet& rPropSet, const ShapeTypeModel& rTypeModel)
 {
-    sal_Int32 nSurround = com::sun::star::text::WrapTextMode_THROUGHT;
+    sal_Int32 nSurround = css::text::WrapTextMode_THROUGHT;
     if ( rTypeModel.moWrapType.get() == "square" || rTypeModel.moWrapType .get()== "tight" ||
          rTypeModel.moWrapType.get() == "through" )
     {
-        nSurround = com::sun::star::text::WrapTextMode_PARALLEL;
+        nSurround = css::text::WrapTextMode_PARALLEL;
         if ( rTypeModel.moWrapSide.get() == "left" )
-            nSurround = com::sun::star::text::WrapTextMode_LEFT;
+            nSurround = css::text::WrapTextMode_LEFT;
         else if ( rTypeModel.moWrapSide.get() == "right" )
-            nSurround = com::sun::star::text::WrapTextMode_RIGHT;
+            nSurround = css::text::WrapTextMode_RIGHT;
     }
     else if ( rTypeModel.moWrapType.get() == "topAndBottom" )
-        nSurround = com::sun::star::text::WrapTextMode_NONE;
+        nSurround = css::text::WrapTextMode_NONE;
 
     rPropSet.setProperty(PROP_Surround, nSurround);
 }
@@ -795,7 +795,7 @@ Reference< XShape > SimpleShape::implConvertAndInsert( const Reference< XShapes
         // The associated properties "PROP_MirroredX" and "PROP_MirroredY" have to be set here so that direction change will occur internally.
         if (bFlipX || bFlipY)
         {
-            com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aPropSequence (2);
+            css::uno::Sequence< css::beans::PropertyValue > aPropSequence (2);
             int nPropertyIndex = 0;
             if (bFlipX)
             {