com::sun::star->css in chart2

Change-Id: I04320d32d6d5c54e461cfabef58645f8b772bc69

63 files changed, 1239 insertions, 1561 deletions

diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx
index dfecfbc6747c..357e0c12701a 100644
--- a/chart2/source/inc/AxisHelper.hxx
+++ b/chart2/source/inc/AxisHelper.hxx
@@ -41,204 +41,164 @@ namespace chart
 class OOO_DLLPUBLIC_CHARTTOOLS AxisHelper
 {
 public:
-    static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > createLinearScaling();
-    static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > createLogarithmicScaling( double fBase = 10.0 );
+    static css::uno::Reference< css::chart2::XScaling > createLinearScaling();
+    static css::uno::Reference< css::chart2::XScaling > createLogarithmicScaling( double fBase = 10.0 );
 
-    static ::com::sun::star::chart2::ScaleData createDefaultScale();
+    static css::chart2::ScaleData createDefaultScale();
 
-    static void removeExplicitScaling( ::com::sun::star::chart2::ScaleData& rScaleData );
+    static void removeExplicitScaling( css::chart2::ScaleData& rScaleData );
 
-    static bool isLogarithmic( const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XScaling >& xScaling );
+    static bool isLogarithmic( const css::uno::Reference< css::chart2::XScaling >& xScaling );
 
-    static void checkDateAxis( ::com::sun::star::chart2::ScaleData& rScale, ExplicitCategoriesProvider* pExplicitCategoriesProvider, bool bChartTypeAllowsDateAxis );
-    static ::com::sun::star::chart2::ScaleData getDateCheckedScale( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis, ChartModel& rModel );
+    static void checkDateAxis( css::chart2::ScaleData& rScale, ExplicitCategoriesProvider* pExplicitCategoriesProvider, bool bChartTypeAllowsDateAxis );
+    static css::chart2::ScaleData getDateCheckedScale( const css::uno::Reference< css::chart2::XAxis >& xAxis, ChartModel& rModel );
 
     static sal_Int32 getExplicitNumberFormatKeyForAxis(
-                  const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis
-                , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& xCorrespondingCoordinateSystem
-                , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument>& xChartDoc
+                  const css::uno::Reference< css::chart2::XAxis >& xAxis
+                , const css::uno::Reference< css::chart2::XCoordinateSystem >& xCorrespondingCoordinateSystem
+                , const css::uno::Reference< css::chart2::XChartDocument>& xChartDoc
                 , bool bSearchForParallelAxisIfNothingIsFound );
 
-    static ::com::sun::star::uno::Reference<
-           ::com::sun::star::chart2::XAxis >
+    static css::uno::Reference<
+           css::chart2::XAxis >
         createAxis( sal_Int32 nDimensionIndex, bool bMainAxis
-                , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram
-                , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext
+                , const css::uno::Reference< css::chart2::XDiagram >& xDiagram
+                , const css::uno::Reference< css::uno::XComponentContext >& xContext
                 , ReferenceSizeProvider * pRefSizeProvider = nullptr );
 
-    static ::com::sun::star::uno::Reference<
-           ::com::sun::star::chart2::XAxis >
+    static css::uno::Reference< css::chart2::XAxis >
         createAxis(
             sal_Int32 nDimensionIndex
             , sal_Int32 nAxisIndex // 0==main or 1==secondary axis
-            , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XCoordinateSystem >& xCooSys
-            , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::uno::XComponentContext > & xContext
+            , const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys
+            , const css::uno::Reference< css::uno::XComponentContext > & xContext
             , ReferenceSizeProvider * pRefSizeProvider = nullptr );
 
     static void showAxis( sal_Int32 nDimensionIndex, bool bMainAxis
-                , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram
-                , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext
+                , const css::uno::Reference< css::chart2::XDiagram >& xDiagram
+                , const css::uno::Reference< css::uno::XComponentContext >& xContext
                 , ReferenceSizeProvider * pRefSizeProvider = nullptr );
 
     static void showGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid
-                , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram
-                , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
+                , const css::uno::Reference< css::chart2::XDiagram >& xDiagram
+                , const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
     static void hideAxis( sal_Int32 nDimensionIndex, bool bMainAxis
-                , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram );
+                , const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
     static void hideGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid
-                , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram );
+                , const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
 
     static bool isAxisShown( sal_Int32 nDimensionIndex, bool bMainAxis
-                , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram );
+                , const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
     static bool isGridShown( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid
-                , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram );
+                , const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
 
-    static void makeAxisVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis );
-    static void makeGridVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xGridProperties );
+    static void makeAxisVisible( const css::uno::Reference< css::chart2::XAxis >& xAxis );
+    static void makeGridVisible( const css::uno::Reference< css::beans::XPropertySet >& xGridProperties );
 
-    static void makeAxisInvisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis );
-    static void makeGridInvisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xGridProperties );
+    static void makeAxisInvisible( const css::uno::Reference< css::chart2::XAxis >& xAxis );
+    static void makeGridInvisible( const css::uno::Reference< css::beans::XPropertySet >& xGridProperties );
 
-    static void hideAxisIfNoDataIsAttached( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis
-                                          , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram);
+    static void hideAxisIfNoDataIsAttached( const css::uno::Reference< css::chart2::XAxis >& xAxis
+                                          , const css::uno::Reference< css::chart2::XDiagram >& xDiagram);
 
-    SAL_DLLPRIVATE static bool areAxisLabelsVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xAxisProperties );
-    static bool isAxisVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis );
-    static bool isGridVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xGridProperties );
+    SAL_DLLPRIVATE static bool areAxisLabelsVisible( const css::uno::Reference< css::beans::XPropertySet >& xAxisProperties );
+    static bool isAxisVisible( const css::uno::Reference< css::chart2::XAxis >& xAxis );
+    static bool isGridVisible( const css::uno::Reference< css::beans::XPropertySet >& xGridProperties );
 
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XCoordinateSystem >
+    static css::uno::Reference< css::chart2::XCoordinateSystem >
         getCoordinateSystemByIndex(
-            const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram >& xDiagram
+            const css::uno::Reference< css::chart2::XDiagram >& xDiagram
             , sal_Int32 nIndex );
 
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XCoordinateSystem >
+    static css::uno::Reference< css::chart2::XCoordinateSystem >
         getCoordinateSystemOfAxis(
-              const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XAxis >& xAxis
-            , const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDiagram >& xDiagram );
+              const css::uno::Reference< css::chart2::XAxis >& xAxis
+            , const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
 
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XAxis >
+    static css::uno::Reference< css::chart2::XAxis >
         getAxis( sal_Int32 nDimensionIndex, bool bMainAxis
-                , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XDiagram >& xDiagram );
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XAxis >
+                , const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
+    static css::uno::Reference< css::chart2::XAxis >
         getAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex
-            , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XCoordinateSystem >& xCooSys );
-
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XAxis >
-        getCrossingMainAxis( const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XAxis >& xAxis
-            , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XCoordinateSystem >& xCooSys );
-
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XAxis >
-        getParallelAxis( const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XAxis >& xAxis
-            , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XDiagram >& xDiagram );
-
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet >
-        getGridProperties( const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XCoordinateSystem >& xCooSys
+            , const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys );
+
+    static css::uno::Reference< css::chart2::XAxis >
+        getCrossingMainAxis( const css::uno::Reference< css::chart2::XAxis >& xAxis
+            , const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys );
+
+    static css::uno::Reference< css::chart2::XAxis >
+        getParallelAxis( const css::uno::Reference< css::chart2::XAxis >& xAxis
+            , const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
+
+    static css::uno::Reference< css::beans::XPropertySet >
+        getGridProperties( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys
                 , sal_Int32 nDimensionIndex
                 , sal_Int32 nAxisIndex //0: Primary axis, 1: secondary axis
                 , sal_Int32 nSubGridIndex = -1 //-1: Main Grid; 0: First SubGrid etc
                 );
 
     static sal_Int32 getDimensionIndexOfAxis(
-              const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XAxis >& xAxis
-            , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XDiagram >& xDiagram );
+              const css::uno::Reference< css::chart2::XAxis >& xAxis
+            , const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
 
     static bool getIndicesForAxis(
-              const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XAxis >& xAxis
-            , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XCoordinateSystem >& xCooSys
+              const css::uno::Reference< css::chart2::XAxis >& xAxis
+            , const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys
             , sal_Int32& rOutDimensionIndex, sal_Int32& rOutAxisIndex );
 
     static bool getIndicesForAxis(
-              const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XAxis >& xAxis
-            , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XDiagram >& xDiagram
+              const css::uno::Reference< css::chart2::XAxis >& xAxis
+            , const css::uno::Reference< css::chart2::XDiagram >& xDiagram
             , sal_Int32& rOutCooSysIndex, sal_Int32& rOutDimensionIndex, sal_Int32& rOutAxisIndex );
 
     /** @param bOnlyVisible if </TRUE>, only axes with property "Show" set to
                </sal_True> are returned
      */
-    static ::com::sun::star::uno::Sequence<
-                ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XAxis > >
-            getAllAxesOfDiagram( const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XDiagram >& xDiagram
+    static css::uno::Sequence< css::uno::Reference< css::chart2::XAxis > >
+            getAllAxesOfDiagram( const css::uno::Reference< css::chart2::XDiagram >& xDiagram
             , bool bOnlyVisible = false );
 
     /** @param bOnlyVisible if </TRUE>, only axes with property "Show" set to
                </sal_True> are returned
      */
-    SAL_DLLPRIVATE static std::vector<
-                ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XAxis > >
-            getAllAxesOfCoordinateSystem( const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XCoordinateSystem >& xCooSys
+    SAL_DLLPRIVATE static std::vector< css::uno::Reference< css::chart2::XAxis > >
+            getAllAxesOfCoordinateSystem( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys
             , bool bOnlyVisible = false );
 
-    static ::com::sun::star::uno::Sequence<
-                ::com::sun::star::uno::Reference<
-                    ::com::sun::star::beans::XPropertySet > >
-            getAllGrids( const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XDiagram >& xDiagram );
+    static css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > >
+            getAllGrids( const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
 
-    static void getAxisOrGridPossibilities( ::com::sun::star::uno::Sequence< sal_Bool >& rPossibilityList
-        , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram>& xDiagram, bool bAxis=true );
+    static void getAxisOrGridPossibilities( css::uno::Sequence< sal_Bool >& rPossibilityList
+        , const css::uno::Reference< css::chart2::XDiagram>& xDiagram, bool bAxis=true );
 
-    static void getAxisOrGridExcistence( ::com::sun::star::uno::Sequence< sal_Bool >& rExcistenceList
-        , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram>& xDiagram, bool bAxis=true );
+    static void getAxisOrGridExcistence( css::uno::Sequence< sal_Bool >& rExcistenceList
+        , const css::uno::Reference< css::chart2::XDiagram>& xDiagram, bool bAxis=true );
 
-    static bool changeVisibilityOfGrids( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram>& xDiagram
-                        , const ::com::sun::star::uno::Sequence< sal_Bool >& rOldExistenceList
-                        , const ::com::sun::star::uno::Sequence< sal_Bool >& rNewExistenceList
-                        , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
+    static bool changeVisibilityOfGrids( const css::uno::Reference< css::chart2::XDiagram>& xDiagram
+                        , const css::uno::Sequence< sal_Bool >& rOldExistenceList
+                        , const css::uno::Sequence< sal_Bool >& rNewExistenceList
+                        , const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
-    static bool changeVisibilityOfAxes( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram>& xDiagram
-                        , const ::com::sun::star::uno::Sequence< sal_Bool >& rOldExistenceList
-                        , const ::com::sun::star::uno::Sequence< sal_Bool >& rNewExistenceList
-                        , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext
+    static bool changeVisibilityOfAxes( const css::uno::Reference< css::chart2::XDiagram>& xDiagram
+                        , const css::uno::Sequence< sal_Bool >& rOldExistenceList
+                        , const css::uno::Sequence< sal_Bool >& rNewExistenceList
+                        , const css::uno::Reference< css::uno::XComponentContext >& xContext
                         , ReferenceSizeProvider * pRefSizeProvider = nullptr );
 
-    static bool shouldAxisBeDisplayed( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis
-                                       , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& xCooSys );
-    static bool isSecondaryYAxisNeeded( const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XCoordinateSystem >& xCooSys );
+    static bool shouldAxisBeDisplayed( const css::uno::Reference< css::chart2::XAxis >& xAxis
+                                       , const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys );
+    static bool isSecondaryYAxisNeeded( const css::uno::Reference<
+                    css::chart2::XCoordinateSystem >& xCooSys );
 
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartType >
-        getChartTypeByIndex( const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XCoordinateSystem >& xCooSys, sal_Int32 nIndex );
+    static css::uno::Reference< css::chart2::XChartType >
+        getChartTypeByIndex( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys,
+                             sal_Int32 nIndex );
 
-    static void setRTLAxisLayout( const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XCoordinateSystem >& xCooSys );
+    static void setRTLAxisLayout( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys );
 
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartType >
-        getFirstChartTypeWithSeriesAttachedToAxisIndex( const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram >& xDiagram, const sal_Int32 nAttachedAxisIndex );
+    static css::uno::Reference< css::chart2::XChartType >
+        getFirstChartTypeWithSeriesAttachedToAxisIndex( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, const sal_Int32 nAttachedAxisIndex );
 
     static bool isAxisPositioningEnabled();
 };
diff --git a/chart2/source/inc/BaseGFXHelper.hxx b/chart2/source/inc/BaseGFXHelper.hxx
index 713cccb8ff60..2a35146f1660 100644
--- a/chart2/source/inc/BaseGFXHelper.hxx
+++ b/chart2/source/inc/BaseGFXHelper.hxx
@@ -41,37 +41,37 @@ namespace chart
 namespace BaseGFXHelper
 {
 
-OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DRange getBoundVolume( const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPoly );
+OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DRange getBoundVolume( const css::drawing::PolyPolygonShape3D& rPolyPoly );
 
 OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B2IRectangle makeRectangle(
-            const com::sun::star::awt::Point& rPosition,
-            const com::sun::star::awt::Size& rSize );
+            const css::awt::Point& rPosition,
+            const css::awt::Size& rSize );
 
 OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B2IRectangle makeRectangle( const css::awt::Rectangle& rRect );
 
-OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::awt::Point B2IRectangleToAWTPoint(
+OOO_DLLPUBLIC_CHARTTOOLS css::awt::Point B2IRectangleToAWTPoint(
             const ::basegfx::B2IRectangle& rB2IRectangle );
 
-OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::awt::Size B2IRectangleToAWTSize(
+OOO_DLLPUBLIC_CHARTTOOLS css::awt::Size B2IRectangleToAWTSize(
             const ::basegfx::B2IRectangle& rB2IRectangle );
 
 ::basegfx::B3DVector Direction3DToB3DVector(
-    const com::sun::star::drawing::Direction3D& rDirection );
+    const css::drawing::Direction3D& rDirection );
 
-com::sun::star::drawing::Direction3D B3DVectorToDirection3D(
+css::drawing::Direction3D B3DVectorToDirection3D(
     const ::basegfx::B3DVector& rB3DVector );
 
 ::basegfx::B3DVector Position3DToB3DVector(
-    const com::sun::star::drawing::Position3D& rPosition );
+    const css::drawing::Position3D& rPosition );
 
-com::sun::star::drawing::Position3D B3DVectorToPosition3D(
+css::drawing::Position3D B3DVectorToPosition3D(
     const ::basegfx::B3DVector& rB3DVector );
 
 OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DHomMatrix HomogenMatrixToB3DHomMatrix(
-    const ::com::sun::star::drawing::HomogenMatrix & rHomogenMatrix );
+    const css::drawing::HomogenMatrix & rHomogenMatrix );
 
 OOO_DLLPUBLIC_CHARTTOOLS
-::com::sun::star::drawing::HomogenMatrix B3DHomMatrixToHomogenMatrix(
+css::drawing::HomogenMatrix B3DHomMatrixToHomogenMatrix(
     const ::basegfx::B3DHomMatrix & rB3DMatrix );
 
 OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DTuple GetRotationFromMatrix(
diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx
index 0ae04ab2d39a..b9cca8739b2f 100644
--- a/chart2/source/inc/CachedDataSequence.hxx
+++ b/chart2/source/inc/CachedDataSequence.hxx
@@ -45,13 +45,13 @@ namespace chart
 namespace impl
 {
 typedef ::cppu::WeakComponentImplHelper<
-    ::com::sun::star::chart2::data::XDataSequence,
-    ::com::sun::star::chart2::data::XNumericalDataSequence,
-    ::com::sun::star::chart2::data::XTextualDataSequence,
-    ::com::sun::star::util::XCloneable,
-    ::com::sun::star::util::XModifyBroadcaster,
-    ::com::sun::star::lang::XInitialization,
-    ::com::sun::star::lang::XServiceInfo >
+    css::chart2::data::XDataSequence,
+    css::chart2::data::XNumericalDataSequence,
+    css::chart2::data::XTextualDataSequence,
+    css::util::XCloneable,
+    css::util::XModifyBroadcaster,
+    css::lang::XInitialization,
+    css::lang::XServiceInfo >
     CachedDataSequence_Base;
 }
 
@@ -69,9 +69,7 @@ public:
      */
     CachedDataSequence();
 
-    explicit CachedDataSequence(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::uno::XComponentContext > & xContext );
+    explicit CachedDataSequence( const css::uno::Reference< css::uno::XComponentContext > & xContext );
 
     /** creates a sequence and initializes it with the given string.  This is
         especially useful for labels, which only have one element.
@@ -101,49 +99,49 @@ public:
 
 protected:
     // ____ XPropertySet ____
-    /// @see ::com::sun::star::beans::XPropertySet
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    /// @see css::beans::XPropertySet
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
+        throw (css::uno::RuntimeException, std::exception) override;
     /// @see ::comphelper::OPropertySetHelper
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
     /// @see ::comphelper::OPropertyArrayUsageHelper
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override;
 
     // ____ XDataSequence ____
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData()
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getSourceRangeRepresentation()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel(
-        ::com::sun::star::chart2::data::LabelOrigin nLabelOrigin )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL generateLabel(
+        css::chart2::data::LabelOrigin nLabelOrigin )
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex )
-        throw (::com::sun::star::lang::IndexOutOfBoundsException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::IndexOutOfBoundsException,
+               css::uno::RuntimeException, std::exception) override;
 
     // ____ XNumericalDataSequence ____
-    /// @see ::com::sun::star::chart::data::XNumericalDataSequence
-    virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    /// @see css::chart::data::XNumericalDataSequence
+    virtual css::uno::Sequence< double > SAL_CALL getNumericalData() throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XTextualDataSequence ____
-    /// @see ::com::sun::star::chart::data::XTextualDataSequence
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    /// @see css::chart::data::XTextualDataSequence
+    virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XCloneable ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL removeModifyListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
 
-    // ::com::sun::star::lang::XInitialization:
-    virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments)
-        throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception, std::exception) override;
+    // css::lang::XInitialization:
+    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments)
+        throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
 
     // <properties>
     sal_Int32                                       m_nNumberFormatKey;
@@ -165,23 +163,21 @@ protected:
 private:
     /** is used by interface method getNumericalData().
      */
-    ::com::sun::star::uno::Sequence< double > Impl_getNumericalData() const;
+    css::uno::Sequence< double > Impl_getNumericalData() const;
     /** is used by interface method getTextualData().
      */
-    ::com::sun::star::uno::Sequence< OUString > Impl_getTextualData() const;
+    css::uno::Sequence< OUString > Impl_getTextualData() const;
     /** is used by interface method getData().
      */
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > Impl_getMixedData() const;
+    css::uno::Sequence< css::uno::Any > Impl_getMixedData() const;
 
 private:
-    enum DataType                                       m_eCurrentDataType;
-
-    ::com::sun::star::uno::Sequence< double >           m_aNumericalSequence;
-    ::com::sun::star::uno::Sequence< OUString >  m_aTextualSequence;
-    ::com::sun::star::uno::Sequence<
-        ::com::sun::star::uno::Any >                    m_aMixedSequence;
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >
-        m_xModifyEventForwarder;
+    enum DataType                                          m_eCurrentDataType;
+
+    css::uno::Sequence< double >                           m_aNumericalSequence;
+    css::uno::Sequence< OUString >                         m_aTextualSequence;
+    css::uno::Sequence< css::uno::Any >                    m_aMixedSequence;
+    css::uno::Reference< css::util::XModifyListener >      m_xModifyEventForwarder;
 };
 
 }  // namespace chart
diff --git a/chart2/source/inc/CharacterProperties.hxx b/chart2/source/inc/CharacterProperties.hxx
index a5cf8e9d3203..5435afe6dca7 100644
--- a/chart2/source/inc/CharacterProperties.hxx
+++ b/chart2/source/inc/CharacterProperties.hxx
@@ -121,14 +121,14 @@ namespace CharacterProperties
     };
 
     OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector(
-        ::std::vector< ::com::sun::star::beans::Property > & rOutProperties );
+        ::std::vector< css::beans::Property > & rOutProperties );
 
     OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap );
 
     OOO_DLLPUBLIC_CHARTTOOLS bool IsCharacterPropertyHandle( sal_Int32 nHandle );
 
-    OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::FontDescriptor createFontDescriptorFromPropertySet(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > & xMultiPropSet );
+    OOO_DLLPUBLIC_CHARTTOOLS css::awt::FontDescriptor createFontDescriptorFromPropertySet(
+        const css::uno::Reference< css::beans::XMultiPropertySet > & xMultiPropSet );
 }
 
 } //  namespace chart
diff --git a/chart2/source/inc/ChartModelHelper.hxx b/chart2/source/inc/ChartModelHelper.hxx
index 426bdafa8687..3ddf4720027c 100644
--- a/chart2/source/inc/ChartModelHelper.hxx
+++ b/chart2/source/inc/ChartModelHelper.hxx
@@ -44,60 +44,44 @@ namespace chart
 class OOO_DLLPUBLIC_CHARTTOOLS ChartModelHelper
 {
 public:
-    static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XRangeHighlighter > createRangeHighlighter(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier >& xSelectionSupplier );
+    static css::uno::Reference< css::chart2::data::XRangeHighlighter > createRangeHighlighter(
+            const css::uno::Reference< css::view::XSelectionSupplier >& xSelectionSupplier );
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > createInternalDataProvider(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc, bool bConnectToModel );
+    static css::uno::Reference< css::chart2::data::XDataProvider > createInternalDataProvider(
+            const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc, bool bConnectToModel );
 
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram >
-        findDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
+    static css::uno::Reference< css::chart2::XDiagram >
+        findDiagram( const css::uno::Reference< css::frame::XModel >& xModel );
 
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram >
-        findDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc );
+    static css::uno::Reference< css::chart2::XDiagram >
+        findDiagram( const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc );
 
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XCoordinateSystem >
+    static css::uno::Reference< css::chart2::XCoordinateSystem >
         getFirstCoordinateSystem( ChartModel& rModel );
 
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XCoordinateSystem >
-        getFirstCoordinateSystem( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
-
-    SAL_DLLPRIVATE static ::std::vector< ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XDataSeries > > getDataSeries(
-            ChartModel& rModel );
-
-    SAL_DLLPRIVATE static ::std::vector< ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XDataSeries > > getDataSeries(
-            const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartDocument > & xChartDoc );
-    static ::std::vector< ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XDataSeries > > getDataSeries(
-            const ::com::sun::star::uno::Reference<
-            ::com::sun::star::frame::XModel > & xModel );
-
-    static ::com::sun::star::uno::Reference<
-    ::com::sun::star::chart2::XChartType >
+    static css::uno::Reference< css::chart2::XCoordinateSystem >
+        getFirstCoordinateSystem( const css::uno::Reference< css::frame::XModel >& xModel );
+
+    SAL_DLLPRIVATE static ::std::vector< css::uno::Reference< css::chart2::XDataSeries > >
+        getDataSeries( ChartModel& rModel );
+
+    SAL_DLLPRIVATE static ::std::vector< css::uno::Reference< css::chart2::XDataSeries > >
+            getDataSeries( const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc );
+    static ::std::vector< css::uno::Reference< css::chart2::XDataSeries > >
+            getDataSeries( const css::uno::Reference< css::frame::XModel > & xModel );
+
+    static css::uno::Reference< css::chart2::XChartType >
         getChartTypeOfSeries(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::frame::XModel >& xModel
-            , const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDataSeries >& xGivenDataSeries );
+            const css::uno::Reference< css::frame::XModel >& xModel
+            , const css::uno::Reference< css::chart2::XDataSeries >& xGivenDataSeries );
 
-    static ::com::sun::star::awt::Size getDefaultPageSize();
+    static css::awt::Size getDefaultPageSize();
 
-    static ::com::sun::star::awt::Size getPageSize(
-        const ::com::sun::star::uno::Reference<
-                ::com::sun::star::frame::XModel >& xModel );
+    static css::awt::Size getPageSize( const css::uno::Reference< css::frame::XModel >& xModel );
 
-    static void triggerRangeHighlighting( const ::com::sun::star::uno::Reference<
-                                ::com::sun::star::frame::XModel >& xModel );
+    static void triggerRangeHighlighting( const css::uno::Reference< css::frame::XModel >& xModel );
 
-    static bool isIncludeHiddenCells( const ::com::sun::star::uno::Reference<
-                                ::com::sun::star::frame::XModel >& xChartModel );
+    static bool isIncludeHiddenCells( const css::uno::Reference< css::frame::XModel >& xChartModel );
 
     static bool setIncludeHiddenCells( bool bIncludeHiddenCells, ChartModel& rModel);
 };
diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx
index 1751a83cc850..9e66c59e6684 100644
--- a/chart2/source/inc/ChartTypeHelper.hxx
+++ b/chart2/source/inc/ChartTypeHelper.hxx
@@ -36,56 +36,56 @@ namespace chart
 class OOO_DLLPUBLIC_CHARTTOOLS ChartTypeHelper
 {
 public:
-    static bool isSupportingGeometryProperties(  const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
-    static bool isSupportingStatisticProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
-    static bool isSupportingRegressionProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
-    static bool isSupportingMainAxis(            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex );
-    static bool isSupportingSecondaryAxis(       const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex );
-    static bool isSupportingAreaProperties(      const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
-    static bool isSupportingSymbolProperties(    const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
-    static bool isSupportingOverlapAndGapWidthProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
-    static bool isSupportingBarConnectors(       const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
-    static bool isSupportingRightAngledAxes(     const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
-    static bool     isSupportingAxisSideBySide(      const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
-    static bool     isSupportingStartingAngle(       const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
+    static bool isSupportingGeometryProperties(  const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+    static bool isSupportingStatisticProperties( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+    static bool isSupportingRegressionProperties(const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+    static bool isSupportingMainAxis(            const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex );
+    static bool isSupportingSecondaryAxis(       const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex );
+    static bool isSupportingAreaProperties(      const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+    static bool isSupportingSymbolProperties(    const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+    static bool isSupportingOverlapAndGapWidthProperties( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+    static bool isSupportingBarConnectors(       const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+    static bool isSupportingRightAngledAxes(     const css::uno::Reference< css::chart2::XChartType >& xChartType );
+    static bool     isSupportingAxisSideBySide(      const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+    static bool     isSupportingStartingAngle(       const css::uno::Reference< css::chart2::XChartType >& xChartType );
     //starting value for bars or baseline for areas for example
-    static bool     isSupportingBaseValue(           const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
-    static bool     shiftCategoryPosAtXAxisPerDefault(     const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
-    static bool     isSupportingAxisPositioning(     const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex );
-    static bool     isSupportingDateAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex );
-
-    //returns sequence of ::com::sun::star::chart::DataLabelPlacement
-    static ::com::sun::star::uno::Sequence < sal_Int32 > getSupportedLabelPlacements(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, bool bSwapXAndY
-        , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries );
-
-    //returns sequence of ::com::sun::star::chart::MissingValueTreatment
-    static ::com::sun::star::uno::Sequence < sal_Int32 > getSupportedMissingValueTreatments(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
-
-    SAL_DLLPRIVATE static ::com::sun::star::drawing::Direction3D getDefaultSimpleLightDirection( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
-    SAL_DLLPRIVATE static ::com::sun::star::drawing::Direction3D getDefaultRealisticLightDirection( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
-    SAL_DLLPRIVATE static sal_Int32 getDefaultDirectLightColor( bool bSimple, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
-    SAL_DLLPRIVATE static sal_Int32 getDefaultAmbientLightColor( bool bSimple, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
-    static sal_Int32 getNumberOfDisplayedSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nNumberOfSeries );
-    SAL_DLLPRIVATE static bool noBordersForSimpleScheme( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
-
-    static bool isSeriesInFrontOfAxisLine( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
-
-    static sal_Int32 //one of ::com::sun::star::chart2::AxisType
-                    getAxisType( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType
+    static bool     isSupportingBaseValue(           const css::uno::Reference< css::chart2::XChartType >& xChartType );
+    static bool     shiftCategoryPosAtXAxisPerDefault(     const css::uno::Reference< css::chart2::XChartType >& xChartType );
+    static bool     isSupportingAxisPositioning(     const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex );
+    static bool     isSupportingDateAxis( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex );
+
+    //returns sequence of css::chart::DataLabelPlacement
+    static css::uno::Sequence < sal_Int32 > getSupportedLabelPlacements(
+        const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, bool bSwapXAndY
+        , const css::uno::Reference< css::chart2::XDataSeries >& xSeries );
+
+    //returns sequence of css::chart::MissingValueTreatment
+    static css::uno::Sequence < sal_Int32 > getSupportedMissingValueTreatments(
+        const css::uno::Reference< css::chart2::XChartType >& xChartType );
+
+    SAL_DLLPRIVATE static css::drawing::Direction3D getDefaultSimpleLightDirection( const css::uno::Reference< css::chart2::XChartType >& xChartType );
+    SAL_DLLPRIVATE static css::drawing::Direction3D getDefaultRealisticLightDirection( const css::uno::Reference< css::chart2::XChartType >& xChartType );
+    SAL_DLLPRIVATE static sal_Int32 getDefaultDirectLightColor( bool bSimple, const css::uno::Reference< css::chart2::XChartType >& xChartType );
+    SAL_DLLPRIVATE static sal_Int32 getDefaultAmbientLightColor( bool bSimple, const css::uno::Reference< css::chart2::XChartType >& xChartType );
+    static sal_Int32 getNumberOfDisplayedSeries( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nNumberOfSeries );
+    SAL_DLLPRIVATE static bool noBordersForSimpleScheme( const css::uno::Reference< css::chart2::XChartType >& xChartType );
+
+    static bool isSeriesInFrontOfAxisLine( const css::uno::Reference< css::chart2::XChartType >& xChartType );
+
+    static sal_Int32 //one of css::chart2::AxisType
+                    getAxisType( const css::uno::Reference< css::chart2::XChartType >& xChartType
                                 , sal_Int32 nDimensionIndex );
 
-    static OUString getRoleOfSequenceForYAxisNumberFormatDetection( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XChartType >& xChartType );
+    static OUString getRoleOfSequenceForYAxisNumberFormatDetection( const css::uno::Reference<
+        css::chart2::XChartType >& xChartType );
 
-    static OUString getRoleOfSequenceForDataLabelNumberFormatDetection( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XChartType >& xChartType );
+    static OUString getRoleOfSequenceForDataLabelNumberFormatDetection( const css::uno::Reference<
+        css::chart2::XChartType >& xChartType );
 
-    static bool shouldLabelNumberFormatKeyBeDetectedFromYAxis( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XChartType >& xChartType );
+    static bool shouldLabelNumberFormatKeyBeDetectedFromYAxis( const css::uno::Reference<
+        css::chart2::XChartType >& xChartType );
 
-    static bool isSupportingOnlyDeepStackingFor3D( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
+    static bool isSupportingOnlyDeepStackingFor3D( const css::uno::Reference< css::chart2::XChartType >& xChartType );
 };
 
 } //namespace chart
diff --git a/chart2/source/inc/ChartViewHelper.hxx b/chart2/source/inc/ChartViewHelper.hxx
index 7c6f0e8b7656..1925511a9c00 100644
--- a/chart2/source/inc/ChartViewHelper.hxx
+++ b/chart2/source/inc/ChartViewHelper.hxx
@@ -31,7 +31,7 @@ namespace chart
 class OOO_DLLPUBLIC_CHARTTOOLS ChartViewHelper
 {
 public:
-    static void setViewToDirtyState( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel );
+    static void setViewToDirtyState( const css::uno::Reference< css::frame::XModel >& xChartModel );
 };
 
 } //namespace chart
diff --git a/chart2/source/inc/CloneHelper.hxx b/chart2/source/inc/CloneHelper.hxx
index 6d1f44f130ed..7f01b041a467 100644
--- a/chart2/source/inc/CloneHelper.hxx
+++ b/chart2/source/inc/CloneHelper.hxx
@@ -38,10 +38,10 @@ template< class Interface >
     Interface operator() ( const Interface & xOther )
     {
         Interface xResult;
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >
-              xCloneable( xOther, ::com::sun::star::uno::UNO_QUERY );
+        css::uno::Reference< css::util::XCloneable >
+              xCloneable( xOther, css::uno::UNO_QUERY );
         if( xCloneable.is())
-            xResult.set( xCloneable->createClone(), ::com::sun::star::uno::UNO_QUERY );
+            xResult.set( xCloneable->createClone(), css::uno::UNO_QUERY );
 
         return xResult;
     }
@@ -61,8 +61,8 @@ template< class Interface >
 /// clones a UNO-sequence of UNO-References
 template< class Interface >
     void CloneRefSequence(
-        const ::com::sun::star::uno::Sequence< Interface > & rSource,
-        ::com::sun::star::uno::Sequence< Interface > & rDestination )
+        const css::uno::Sequence< Interface > & rSource,
+        css::uno::Sequence< Interface > & rDestination )
 {
     rDestination.realloc( rSource.getLength());
     ::std::transform( rSource.getConstArray(), rSource.getConstArray() + rSource.getLength(),
diff --git a/chart2/source/inc/ColorPerPointHelper.hxx b/chart2/source/inc/ColorPerPointHelper.hxx
index 31dc130d248a..12df360f1b53 100644
--- a/chart2/source/inc/ColorPerPointHelper.hxx
+++ b/chart2/source/inc/ColorPerPointHelper.hxx
@@ -33,18 +33,15 @@ class OOO_DLLPUBLIC_CHARTTOOLS ColorPerPointHelper
 {
 public:
     static bool hasPointOwnColor(
-        const ::com::sun::star::uno::Reference<
-              ::com::sun::star::beans::XPropertySet >& xDataSeriesProperties
+        const css::uno::Reference< css::beans::XPropertySet >& xDataSeriesProperties
         , sal_Int32 nPointIndex
-        , const ::com::sun::star::uno::Reference<
-              ::com::sun::star::beans::XPropertySet >& xDataPointProperties //may be NULL this is just for performance
+        , const css::uno::Reference< css::beans::XPropertySet >& xDataPointProperties //may be NULL this is just for performance
          );
 
     // returns true if AttributedDataPoints contains nPointIndex and the
     // property Color is DEFAULT
     SAL_DLLPRIVATE static bool hasPointOwnProperties(
-        const ::com::sun::star::uno::Reference<
-              ::com::sun::star::beans::XPropertySet >& xSeriesProperties
+        const css::uno::Reference< css::beans::XPropertySet >& xSeriesProperties
         , sal_Int32 nPointIndex );
 };
 
diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx
index af72ba1c2844..c218bf761f49 100644
--- a/chart2/source/inc/CommonConverters.hxx
+++ b/chart2/source/inc/CommonConverters.hxx
@@ -50,12 +50,12 @@ and operations e.g  drawing::Position3D + drawing::Direction3D
 
 /** ::basegfx::B3DHomMatrix -> HomogenMatrix
 */
-OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::HomogenMatrix
+OOO_DLLPUBLIC_CHARTTOOLS css::drawing::HomogenMatrix
                  B3DHomMatrixToHomogenMatrix( const ::basegfx::B3DHomMatrix& rM );
 
 /** HomogenMatrix -> ::basegfx::B3DHomMatrix
 */
-OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DHomMatrix HomogenMatrixToB3DHomMatrix( const com::sun::star::drawing::HomogenMatrix& rHM );
+OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DHomMatrix HomogenMatrixToB3DHomMatrix( const css::drawing::HomogenMatrix& rHM );
 
 /** ::basegfx::B3DHomMatrix -> B2DHomMatrix
 */
@@ -64,135 +64,131 @@ OOO_DLLPUBLIC_CHARTTOOLS
 
 /** B2DHomMatrix <-> HomogenMatrix3
 */
-OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::HomogenMatrix3
+OOO_DLLPUBLIC_CHARTTOOLS css::drawing::HomogenMatrix3
                 B2DHomMatrixToHomogenMatrix3( const ::basegfx::B2DHomMatrix& rM );
 
 /** Position3D -> B3DPoint
 */
-OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DPoint Position3DToB3DPoint( const com::sun::star::drawing::Position3D& rPosition );
+OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DPoint Position3DToB3DPoint( const css::drawing::Position3D& rPosition );
 
 /** B3DVector -> Direction3D
 */
-OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D B3DVectorToDirection3D( const ::basegfx::B3DVector& rVector);
+OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Direction3D B3DVectorToDirection3D( const ::basegfx::B3DVector& rVector);
 
 /** B3DPoint -> Position3D
 */
-OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPoint& rPoint);
+OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPoint& rPoint);
 
 /** Direction3D -> B3DVector
 */
-OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DVector Direction3DToB3DVector( const com::sun::star::drawing::Direction3D& rDirection);
+OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DVector Direction3DToB3DVector( const css::drawing::Direction3D& rDirection);
 
 /** PolyPolygonShape3D + drawing::Position3D -> PolyPolygonShape3D
 */
 OOO_DLLPUBLIC_CHARTTOOLS
-void AddPointToPoly( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly
-                , const com::sun::star::drawing::Position3D& rPos
+void AddPointToPoly( css::drawing::PolyPolygonShape3D& rPoly
+                , const css::drawing::Position3D& rPos
                 , sal_Int32 nSequenceIndex=0 );
 
 /** get a single Point from a Polygon
 */
-OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::drawing::Position3D getPointFromPoly(
-                  const ::com::sun::star::drawing::PolyPolygonShape3D& rPolygon
+OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Position3D getPointFromPoly(
+                  const css::drawing::PolyPolygonShape3D& rPolygon
                 , sal_Int32 nPointIndex, sal_Int32 nPolyIndex=0 );
 
 OOO_DLLPUBLIC_CHARTTOOLS
-void addPolygon( com::sun::star::drawing::PolyPolygonShape3D& rRet
-                , const com::sun::star::drawing::PolyPolygonShape3D& rAdd );
+void addPolygon( css::drawing::PolyPolygonShape3D& rRet
+                , const css::drawing::PolyPolygonShape3D& rAdd );
 /** PolyPolygonShape3D + PolyPolygonShape3D -> PolyPolygonShape3D
 */
 OOO_DLLPUBLIC_CHARTTOOLS
-void appendPoly( com::sun::star::drawing::PolyPolygonShape3D& rRet
-                , const com::sun::star::drawing::PolyPolygonShape3D& rAdd );
+void appendPoly( css::drawing::PolyPolygonShape3D& rRet
+                , const css::drawing::PolyPolygonShape3D& rAdd );
 
 /** PolyPolygonBezierCoords -> PolyPolygonShape3D
 */
 OOO_DLLPUBLIC_CHARTTOOLS
-com::sun::star::drawing::PolyPolygonShape3D BezierToPoly(
-    const com::sun::star::drawing::PolyPolygonBezierCoords& rBezier );
+css::drawing::PolyPolygonShape3D BezierToPoly(
+    const css::drawing::PolyPolygonBezierCoords& rBezier );
 
 /** PolyPolygonShape3D -> drawing::PointSequenceSequence (2D)
 */
 OOO_DLLPUBLIC_CHARTTOOLS
-com::sun::star::drawing::PointSequenceSequence PolyToPointSequence(
-                const com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon );
+css::drawing::PointSequenceSequence PolyToPointSequence(
+                const css::drawing::PolyPolygonShape3D& rPolyPolygon );
 
 /** drawing::PointSequenceSequence + drawing::PointSequenceSequence
 */
 OOO_DLLPUBLIC_CHARTTOOLS
-void appendPointSequence( com::sun::star::drawing::PointSequenceSequence& rTarget
-                        , com::sun::star::drawing::PointSequenceSequence& rAdd );
+void appendPointSequence( css::drawing::PointSequenceSequence& rTarget
+                        , css::drawing::PointSequenceSequence& rAdd );
 
 /** Position3D + Direction3D == Position3D
 */
-OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D
-                operator+( const com::sun::star::drawing::Position3D& rPos
-                           , const com::sun::star::drawing::Direction3D& rDirection);
+OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Position3D
+                operator+( const css::drawing::Position3D& rPos
+                           , const css::drawing::Direction3D& rDirection);
 
 /** Position3D - Position3D == Direction3D
 */
-OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D
-                operator-( const com::sun::star::drawing::Position3D& rPos1
-                           , const com::sun::star::drawing::Position3D& rPos2);
-
+OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Direction3D
+                operator-( const css::drawing::Position3D& rPos1
+                           , const css::drawing::Position3D& rPos2);
 
 /** awt::Rect --> awt::Point (2D)
 */
-OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Point ToPoint( const com::sun::star::awt::Rectangle& rRectangle );
+OOO_DLLPUBLIC_CHARTTOOLS css::awt::Point ToPoint( const css::awt::Rectangle& rRectangle );
 
 /** awt::Rect --> awt::Size (2D)
 */
-OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Size ToSize( const com::sun::star::awt::Rectangle& rRectangle );
+OOO_DLLPUBLIC_CHARTTOOLS css::awt::Size ToSize( const css::awt::Rectangle& rRectangle );
 
 /** Position3D --> awt::Point (2D)
 */
-OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Point Position3DToAWTPoint( const com::sun::star::drawing::Position3D& rPos );
+OOO_DLLPUBLIC_CHARTTOOLS css::awt::Point Position3DToAWTPoint( const css::drawing::Position3D& rPos );
 
 /** Direction3D --> awt::Size (2D)
 */
-OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Size Direction3DToAWTSize( const com::sun::star::drawing::Direction3D& rDirection );
+OOO_DLLPUBLIC_CHARTTOOLS css::awt::Size Direction3DToAWTSize( const css::drawing::Direction3D& rDirection );
 
 /** B3DPoint -> Sequence<double>
 */
-OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::uno::Sequence< double > B3DPointToSequence( const ::basegfx::B3DPoint& rPoint );
+OOO_DLLPUBLIC_CHARTTOOLS css::uno::Sequence< double > B3DPointToSequence( const ::basegfx::B3DPoint& rPoint );
 
 /** Sequence<double> -> drawing::Position3D
 */
-OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D
-                SequenceToPosition3D( const com::sun::star::uno::Sequence< double >& rSeq );
+OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Position3D
+                SequenceToPosition3D( const css::uno::Sequence< double >& rSeq );
 
 /** drawing::Position3D -> Sequence<double>
 */
 
-OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::uno::Sequence< double >
-                Position3DToSequence( const com::sun::star::drawing::Position3D& rPosition );
+OOO_DLLPUBLIC_CHARTTOOLS css::uno::Sequence< double >
+                Position3DToSequence( const css::drawing::Position3D& rPosition );
 
 /** chart2::XDataSequence -> uno::Sequence< double >
 */
 
 OOO_DLLPUBLIC_CHARTTOOLS
-::com::sun::star::uno::Sequence< double > DataSequenceToDoubleSequence(
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::data::XDataSequence > & xDataSequence );
+css::uno::Sequence< double > DataSequenceToDoubleSequence(
+    const css::uno::Reference< css::chart2::data::XDataSequence > & xDataSequence );
 
 OOO_DLLPUBLIC_CHARTTOOLS
-::com::sun::star::uno::Sequence< OUString > DataSequenceToStringSequence(
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::data::XDataSequence > & xDataSequence );
+css::uno::Sequence< OUString > DataSequenceToStringSequence(
+    const css::uno::Reference< css::chart2::data::XDataSequence > & xDataSequence );
 
 /** uno::Sequence< uno::Sequence< T > > -> uno::Sequence< T >
  */
 template< typename T >
-::com::sun::star::uno::Sequence< T >
-    FlattenSequence( const ::com::sun::star::uno::Sequence<
-                         ::com::sun::star::uno::Sequence< T > > & aSeqSeq )
+css::uno::Sequence< T >
+    FlattenSequence( const css::uno::Sequence< css::uno::Sequence< T > > & aSeqSeq )
 {
     sal_Int32 nOuter, nInner, nCount = 0,
         nResultSize = 0;
     const sal_Int32 nOuterSize = aSeqSeq.getLength();
     for( nOuter=0; nOuter<nOuterSize; ++nOuter )
         nResultSize += aSeqSeq[nOuter].getLength();
-    ::com::sun::star::uno::Sequence< T > aResult( nResultSize );
+    css::uno::Sequence< T > aResult( nResultSize );
 
     for( nOuter=0; nOuter<nOuterSize; ++nOuter )
     {
@@ -218,12 +214,12 @@ template< typename T >
 }
 
 OOO_DLLPUBLIC_CHARTTOOLS
-bool hasDoubleValue( const ::com::sun::star::uno::Any& rAny );
+bool hasDoubleValue( const css::uno::Any& rAny );
 
 OOO_DLLPUBLIC_CHARTTOOLS
-bool  hasLongOrShortValue( const ::com::sun::star::uno::Any& rAny );
+bool  hasLongOrShortValue( const css::uno::Any& rAny );
 OOO_DLLPUBLIC_CHARTTOOLS
-sal_Int16 getShortForLongAlso( const ::com::sun::star::uno::Any& rAny );
+sal_Int16 getShortForLongAlso( const css::uno::Any& rAny );
 
 OOO_DLLPUBLIC_CHARTTOOLS
 bool replaceParamterInString( OUString & rInOutResourceString,
diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx
index 4599d0c47bad..ce49d68f274d 100644
--- a/chart2/source/inc/CommonFunctors.hxx
+++ b/chart2/source/inc/CommonFunctors.hxx
@@ -32,34 +32,34 @@ namespace chart
 namespace CommonFunctors
 {
 
-/** unary function to convert any type T into a ::com::sun::star::uno::Any.
+/** unary function to convert any type T into a css::uno::Any.
 
     <p>uno::makeAny is an inline function.  Thus is cannot be taken directly
     (via mem_fun_ptr)</p>
 */
 template< typename T >
-    struct makeAny : public ::std::unary_function< T, ::com::sun::star::uno::Any >
+    struct makeAny : public ::std::unary_function< T, css::uno::Any >
 {
-    ::com::sun::star::uno::Any operator() ( const T & aVal )
+    css::uno::Any operator() ( const T & aVal )
     {
-        return ::com::sun::star::uno::makeAny( aVal );
+        return css::uno::makeAny( aVal );
     }
 };
 
-/** unary function to convert ::com::sun::star::uno::Any into a double number.
+/** unary function to convert css::uno::Any into a double number.
 
     <p>In case no number can be generated from the Any, NaN (see
     rtl::math::SetNAN()) is returned.</p>
 */
-struct OOO_DLLPUBLIC_CHARTTOOLS AnyToDouble : public ::std::unary_function< ::com::sun::star::uno::Any, double >
+struct OOO_DLLPUBLIC_CHARTTOOLS AnyToDouble : public ::std::unary_function< css::uno::Any, double >
 {
-    double operator() ( const ::com::sun::star::uno::Any & rAny )
+    double operator() ( const css::uno::Any & rAny )
     {
         double fResult;
         ::rtl::math::setNan( & fResult );
 
-        ::com::sun::star::uno::TypeClass eClass( rAny.getValueType().getTypeClass() );
-        if( eClass == ::com::sun::star::uno::TypeClass_DOUBLE )
+        css::uno::TypeClass eClass( rAny.getValueType().getTypeClass() );
+        if( eClass == css::uno::TypeClass_DOUBLE )
         {
             fResult = * static_cast< const double * >( rAny.getValue() );
         }
@@ -68,15 +68,15 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToDouble : public ::std::unary_function< ::co
     }
 };
 
-/** unary function to convert ::com::sun::star::uno::Any into an
+/** unary function to convert css::uno::Any into an
     OUString.
 */
-struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::com::sun::star::uno::Any,  OUString >
+struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< css::uno::Any,  OUString >
 {
-    OUString operator() ( const ::com::sun::star::uno::Any & rAny )
+    OUString operator() ( const css::uno::Any & rAny )
     {
-        ::com::sun::star::uno::TypeClass eClass( rAny.getValueType().getTypeClass() );
-        if( eClass == ::com::sun::star::uno::TypeClass_DOUBLE )
+        css::uno::TypeClass eClass( rAny.getValueType().getTypeClass() );
+        if( eClass == css::uno::TypeClass_DOUBLE )
         {
             const double* pDouble = static_cast< const double * >( rAny.getValue() );
             if( ::rtl::math::isNan(*pDouble) )
@@ -89,7 +89,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::co
                 true // remove trailing zeros
                 );
         }
-        else if( eClass == ::com::sun::star::uno::TypeClass_STRING )
+        else if( eClass == css::uno::TypeClass_STRING )
         {
             return * static_cast< const OUString * >( rAny.getValue() );
         }
diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx
index 9c3a853b4612..834e8d45a0b4 100644
--- a/chart2/source/inc/ConfigColorScheme.hxx
+++ b/chart2/source/inc/ConfigColorScheme.hxx
@@ -31,9 +31,8 @@
 namespace chart
 {
 
-OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XColorScheme > createConfigColorScheme(
-    const ::com::sun::star::uno::Reference<
-            ::com::sun::star::uno::XComponentContext > & xContext );
+OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::chart2::XColorScheme > createConfigColorScheme(
+    const css::uno::Reference< css::uno::XComponentContext > & xContext );
 
 namespace impl
 {
@@ -42,13 +41,11 @@ class ChartConfigItem;
 
 class ConfigColorScheme :
     public ::cppu::WeakImplHelper<
-        ::com::sun::star::chart2::XColorScheme,
-        ::com::sun::star::lang::XServiceInfo >
+        css::chart2::XColorScheme,
+        css::lang::XServiceInfo >
 {
 public:
-    explicit ConfigColorScheme(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::uno::XComponentContext > & xContext );
+    explicit ConfigColorScheme( const css::uno::Reference< css::uno::XComponentContext > & xContext );
     SAL_DLLPRIVATE virtual ~ConfigColorScheme();
 
     /// declare XServiceInfo methods
@@ -68,16 +65,15 @@ public:
 protected:
     // ____ XColorScheme ____
     SAL_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getColorByIndex( ::sal_Int32 nIndex )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
 private:
     SAL_DLLPRIVATE void retrieveConfigColors();
 
     // member variables
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::uno::XComponentContext >        m_xContext;
-    ::std::unique_ptr< impl::ChartConfigItem >              m_apChartConfigItem;
-    mutable ::com::sun::star::uno::Sequence< sal_Int64 >  m_aColorSequence;
+    css::uno::Reference< css::uno::XComponentContext >    m_xContext;
+    ::std::unique_ptr< impl::ChartConfigItem >            m_apChartConfigItem;
+    mutable css::uno::Sequence< sal_Int64 >               m_aColorSequence;
     mutable sal_Int32                                     m_nNumberOfColors;
     bool                                                  m_bNeedsUpdate;
 };
diff --git a/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx
index a50554d8a0b0..531e3bd00ae8 100644
--- a/chart2/source/inc/ContainerHelper.hxx
+++ b/chart2/source/inc/ContainerHelper.hxx
@@ -47,7 +47,7 @@ namespace ContainerHelper
 */
 template< class Container >
     Container
-    SequenceToSTLSequenceContainer( const ::com::sun::star::uno::Sequence< typename Container::value_type > & rSeq )
+    SequenceToSTLSequenceContainer( const css::uno::Sequence< typename Container::value_type > & rSeq )
 {
     Container aResult( rSeq.getLength());
     ::std::copy( rSeq.begin(), rSeq.end(), aResult.begin() );
@@ -65,7 +65,7 @@ template< class Container >
  */
 template< typename T >
     ::std::vector< T >
-    SequenceToVector( const ::com::sun::star::uno::Sequence< T > & rSeq )
+    SequenceToVector( const css::uno::Sequence< T > & rSeq )
 {
     return SequenceToSTLSequenceContainer< ::std::vector< T > >( rSeq );
 }
diff --git a/chart2/source/inc/ControllerLockGuard.hxx b/chart2/source/inc/ControllerLockGuard.hxx
index 22036d0605f0..e690f5ac475b 100644
--- a/chart2/source/inc/ControllerLockGuard.hxx
+++ b/chart2/source/inc/ControllerLockGuard.hxx
@@ -33,13 +33,11 @@ namespace chart
 class OOO_DLLPUBLIC_CHARTTOOLS ControllerLockGuardUNO
 {
 public:
-    explicit ControllerLockGuardUNO(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::frame::XModel > & xModel );
+    explicit ControllerLockGuardUNO( const css::uno::Reference< css::frame::XModel > & xModel );
     ~ControllerLockGuardUNO();
 
 private:
-    com::sun::star::uno::Reference< com::sun::star::frame::XModel > mxModel;
+    css::uno::Reference< css::frame::XModel > mxModel;
 };
 
 class OOO_DLLPUBLIC_CHARTTOOLS ControllerLockGuard
@@ -62,16 +60,14 @@ class OOO_DLLPUBLIC_CHARTTOOLS ControllerLockHelper
 {
 public:
     explicit ControllerLockHelper(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::frame::XModel > & xModel );
+        const css::uno::Reference< css::frame::XModel > & xModel );
     ~ControllerLockHelper();
 
     SAL_DLLPRIVATE void lockControllers();
     SAL_DLLPRIVATE void unlockControllers();
 
 private:
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::frame::XModel > m_xModel;
+    css::uno::Reference< css::frame::XModel > m_xModel;
 };
 
 /** This guard calls lockControllers at the given ControllerLockHelper in the
diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx
index 1c1e6c0c98b1..748721cd2214 100644
--- a/chart2/source/inc/DataSeriesHelper.hxx
+++ b/chart2/source/inc/DataSeriesHelper.hxx
@@ -51,9 +51,8 @@ OOO_DLLPUBLIC_CHARTTOOLS OUString
     @param aRole
         The role that is to be filtered out.
 */
-OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >
-    getDataSequenceByRole( const ::com::sun::star::uno::Reference<
-                               ::com::sun::star::chart2::data::XDataSource > & xSource,
+OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::chart2::data::XLabeledDataSequence >
+    getDataSequenceByRole( const css::uno::Reference< css::chart2::data::XDataSource > & xSource,
                            const OUString& aRole,
                            bool bMatchPrefix = false );
 
@@ -67,10 +66,8 @@ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::cha
         The role that is to be filtered out.
 */
 OOO_DLLPUBLIC_CHARTTOOLS ::std::vector<
-  ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > >
-    getAllDataSequencesByRole( const ::com::sun::star::uno::Sequence<
-                                   ::com::sun::star::uno::Reference<
-                                       ::com::sun::star::chart2::data::XLabeledDataSequence > > & aDataSequences,
+  css::uno::Reference< css::chart2::data::XLabeledDataSequence > >
+    getAllDataSequencesByRole( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > & aDataSequences,
                                const OUString& aRole,
                                bool bMatchPrefix = false );
 
@@ -83,11 +80,8 @@ getAllDataSequences(
     into a data source.  The order of sequences will match the order of the data
     series.
  */
-OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::data::XDataSource >
-    getDataSource( const ::com::sun::star::uno::Sequence<
-                          ::com::sun::star::uno::Reference<
-                              ::com::sun::star::chart2::XDataSeries > > & aSeries );
+OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::chart2::data::XDataSource >
+    getDataSource( const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > > & aSeries );
 
 /** Get the label of a series (e.g. for the legend)
 
@@ -96,109 +90,90 @@ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference<
         to take its label.
  */
 OOO_DLLPUBLIC_CHARTTOOLS OUString getDataSeriesLabel(
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XDataSeries > & xSeries,
+    const css::uno::Reference< css::chart2::XDataSeries > & xSeries,
     const OUString & rLabelSequenceRole );
 
 /** Get the label of a labeled sequence including necessary automatic generation
  */
 OOO_DLLPUBLIC_CHARTTOOLS OUString getLabelForLabeledDataSequence(
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::data::XLabeledDataSequence > & xLabeledSeq );
+    const css::uno::Reference< css::chart2::data::XLabeledDataSequence > & xLabeledSeq );
 
 OOO_DLLPUBLIC_CHARTTOOLS void setStackModeAtSeries(
-    const ::com::sun::star::uno::Sequence<
-        ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > > & aSeries,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem,
+    const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > > & aSeries,
+    const css::uno::Reference< css::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem,
     StackMode eStackMode );
 
 OOO_DLLPUBLIC_CHARTTOOLS sal_Int32 getAttachedAxisIndex(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries );
+    const css::uno::Reference< css::chart2::XDataSeries > & xSeries );
 
 /// @param nAxisIndex, if -1 it is determined by the given data series via getAttachedAxisIndex
 OOO_DLLPUBLIC_CHARTTOOLS sal_Int32 getNumberFormatKeyFromAxis(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem,
+    const css::uno::Reference< css::chart2::XDataSeries > & xSeries,
+    const css::uno::Reference< css::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem,
     sal_Int32 nDimensionIndex,
     sal_Int32 nAxisIndex = -1 );
 
 OOO_DLLPUBLIC_CHARTTOOLS
-::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >
+css::uno::Reference< css::chart2::XCoordinateSystem >
     getCoordinateSystemOfSeries(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram );
+        const css::uno::Reference< css::chart2::XDataSeries > & xSeries,
+        const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
 
 OOO_DLLPUBLIC_CHARTTOOLS
-::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >
+css::uno::Reference< css::chart2::XChartType >
     getChartTypeOfSeries(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram );
+        const css::uno::Reference< css::chart2::XDataSeries > & xSeries,
+        const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
 
 OOO_DLLPUBLIC_CHARTTOOLS void deleteSeries(
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XDataSeries > & xSeries,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XChartType > & xChartType );
+    const css::uno::Reference< css::chart2::XDataSeries > & xSeries,
+    const css::uno::Reference< css::chart2::XChartType > & xChartType );
 
 OOO_DLLPUBLIC_CHARTTOOLS void switchSymbolsOnOrOff(
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet > & xSeriesProperties,
+    const css::uno::Reference< css::beans::XPropertySet > & xSeriesProperties,
     bool bSymbolsOn, sal_Int32 nSeriesIndex );
 
 OOO_DLLPUBLIC_CHARTTOOLS void switchLinesOnOrOff(
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet > & xSeriesProperties,
+    const css::uno::Reference< css::beans::XPropertySet > & xSeriesProperties,
     bool bLinesOn );
 
 OOO_DLLPUBLIC_CHARTTOOLS
-void makeLinesThickOrThin( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet > & xSeriesProperties, bool bThick );
+void makeLinesThickOrThin( const css::uno::Reference< css::beans::XPropertySet > & xSeriesProperties, bool bThick );
 
 OOO_DLLPUBLIC_CHARTTOOLS void setPropertyAlsoToAllAttributedDataPoints(
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XDataSeries >& xSeries,
+        const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
         const OUString& rPropertyName,
-        const ::com::sun::star::uno::Any& rPropertyValue );
+        const css::uno::Any& rPropertyValue );
 
 OOO_DLLPUBLIC_CHARTTOOLS bool hasAttributedDataPointDifferentValue(
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XDataSeries >& xSeries,
+    const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
     const OUString& rPropertyName,
-    const ::com::sun::star::uno::Any& rPropertyValue );
+    const css::uno::Any& rPropertyValue );
 
 OOO_DLLPUBLIC_CHARTTOOLS bool areAllSeriesAttachedToSameAxis(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType,
+        const css::uno::Reference< css::chart2::XChartType >& xChartType,
         sal_Int32 & rOutAxisIndex );
 
-OOO_DLLPUBLIC_CHARTTOOLS bool hasUnhiddenData( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XDataSeries >& xSeries );
+OOO_DLLPUBLIC_CHARTTOOLS bool hasUnhiddenData( const css::uno::Reference<
+        css::chart2::XDataSeries >& xSeries );
 
 OOO_DLLPUBLIC_CHARTTOOLS
-sal_Int32 translateIndexFromHiddenToFullSequence( sal_Int32 nClippedIndex, const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::data::XDataSequence >& xDataSequence, bool bTranslate );
+sal_Int32 translateIndexFromHiddenToFullSequence( sal_Int32 nClippedIndex, const css::uno::Reference<
+        css::chart2::data::XDataSequence >& xDataSequence, bool bTranslate );
 
-OOO_DLLPUBLIC_CHARTTOOLS bool hasDataLabelsAtSeries( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XDataSeries >& xSeries );
+OOO_DLLPUBLIC_CHARTTOOLS bool hasDataLabelsAtSeries( const css::uno::Reference< css::chart2::XDataSeries >& xSeries );
 
-OOO_DLLPUBLIC_CHARTTOOLS bool hasDataLabelsAtPoints( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XDataSeries >& xSeries );
+OOO_DLLPUBLIC_CHARTTOOLS bool hasDataLabelsAtPoints( const css::uno::Reference< css::chart2::XDataSeries >& xSeries );
 
-OOO_DLLPUBLIC_CHARTTOOLS bool hasDataLabelAtPoint( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XDataSeries >& xSeries, sal_Int32 nPointIndex );
+OOO_DLLPUBLIC_CHARTTOOLS bool hasDataLabelAtPoint( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, sal_Int32 nPointIndex );
 
-OOO_DLLPUBLIC_CHARTTOOLS void insertDataLabelsToSeriesAndAllPoints( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XDataSeries >& xSeries );
+OOO_DLLPUBLIC_CHARTTOOLS void insertDataLabelsToSeriesAndAllPoints( const css::uno::Reference< css::chart2::XDataSeries >& xSeries );
 
-OOO_DLLPUBLIC_CHARTTOOLS void insertDataLabelToPoint( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >& xPointPropertySet );
+OOO_DLLPUBLIC_CHARTTOOLS void insertDataLabelToPoint( const css::uno::Reference< css::beans::XPropertySet >& xPointPropertySet );
 
-OOO_DLLPUBLIC_CHARTTOOLS void deleteDataLabelsFromSeriesAndAllPoints( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XDataSeries >& xSeries );
+OOO_DLLPUBLIC_CHARTTOOLS void deleteDataLabelsFromSeriesAndAllPoints( const css::uno::Reference< css::chart2::XDataSeries >& xSeries );
 
-OOO_DLLPUBLIC_CHARTTOOLS void deleteDataLabelsFromPoint( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >& xPointPropertySet );
+OOO_DLLPUBLIC_CHARTTOOLS void deleteDataLabelsFromPoint( const css::uno::Reference< css::beans::XPropertySet >& xPointPropertySet );
 
 } //  namespace DataSeriesHelper
 } //  namespace chart
diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx
index df0f8dedc4c5..ebf2058fe793 100644
--- a/chart2/source/inc/DataSource.hxx
+++ b/chart2/source/inc/DataSource.hxx
@@ -31,18 +31,14 @@ namespace chart
 
 class DataSource : public
     ::cppu::WeakImplHelper<
-        ::com::sun::star::lang::XServiceInfo,
-        ::com::sun::star::chart2::data::XDataSource,
-        ::com::sun::star::chart2::data::XDataSink >
+        css::lang::XServiceInfo,
+        css::chart2::data::XDataSource,
+        css::chart2::data::XDataSink >
 {
 public:
+    explicit DataSource( const css::uno::Reference< css::uno::XComponentContext > & xContext );
     explicit DataSource(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::uno::XComponentContext > & xContext );
-    explicit DataSource(
-        const ::com::sun::star::uno::Sequence<
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::data::XLabeledDataSequence > > & rSequences );
+        const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > & rSequences );
 
     virtual ~DataSource();
 
@@ -59,18 +55,16 @@ public:
 
 protected:
     // ____ XDataSource ____
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL
+    virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL
         getDataSequences()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XDataSink ____
-    virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > >& aData )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData )
+        throw (css::uno::RuntimeException, std::exception) override;
 
 private:
-    ::com::sun::star::uno::Sequence<
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::data::XLabeledDataSequence > >
+    css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >
         m_aDataSeq;
 };
 
diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx
index 4ad1a289a4e3..9bfc3360aeb1 100644
--- a/chart2/source/inc/DataSourceHelper.hxx
+++ b/chart2/source/inc/DataSourceHelper.hxx
@@ -43,82 +43,71 @@ namespace chart
 class OOO_DLLPUBLIC_CHARTTOOLS DataSourceHelper
 {
 public:
-        static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >
-            createDataSource( const ::com::sun::star::uno::Sequence<
-                ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::data::XLabeledDataSequence > > & rSequences );
+        static css::uno::Reference< css::chart2::data::XDataSource >
+            createDataSource( const css::uno::Sequence<
+                css::uno::Reference<  css::chart2::data::XLabeledDataSequence > > & rSequences );
 
-        static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >
+        static css::uno::Reference< css::chart2::data::XDataSequence >
             createCachedDataSequence();
 
-        static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >
+        static css::uno::Reference< css::chart2::data::XDataSequence >
             createCachedDataSequence( const OUString & rSingleText );
 
-        static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >
+        static css::uno::Reference< css::chart2::data::XLabeledDataSequence >
             createLabeledDataSequence(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xValues ,
-                const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xLabels );
+                const css::uno::Reference< css::chart2::data::XDataSequence >& xValues ,
+                const css::uno::Reference< css::chart2::data::XDataSequence >& xLabels );
 
-        static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >
+        static css::uno::Reference< css::chart2::data::XLabeledDataSequence >
             createLabeledDataSequence(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xValues );
+                const css::uno::Reference< css::chart2::data::XDataSequence >& xValues );
 
-        static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >
+        static css::uno::Reference< css::chart2::data::XLabeledDataSequence >
             createLabeledDataSequence();
 
-        static ::com::sun::star::uno::Sequence<
-               ::com::sun::star::beans::PropertyValue > createArguments(
+        static css::uno::Sequence< css::beans::PropertyValue >
+            createArguments(
                    bool bUseColumns, bool bFirstCellAsLabel, bool bHasCategories );
 
-        static ::com::sun::star::uno::Sequence<
-               ::com::sun::star::beans::PropertyValue > createArguments(
+        static css::uno::Sequence<
+               css::beans::PropertyValue > createArguments(
                    const OUString & rRangeRepresentation,
-                   const ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping,
+                   const css::uno::Sequence< sal_Int32 >& rSequenceMapping,
                    bool bUseColumns, bool bFirstCellAsLabel, bool bHasCategories );
 
-        SAL_DLLPRIVATE static void readArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArguments
-            , OUString & rRangeRepresentation, ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping
+        SAL_DLLPRIVATE static void readArguments( const css::uno::Sequence< css::beans::PropertyValue >& rArguments
+            , OUString & rRangeRepresentation, css::uno::Sequence< sal_Int32 >& rSequenceMapping
             , bool& bUseColumns, bool& bFirstCellAsLabel, bool& bHasCategories );
 
-        static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >
-            pressUsedDataIntoRectangularFormat( const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XChartDocument >& xChartDoc );
+        static css::uno::Reference< css::chart2::data::XDataSource >
+            pressUsedDataIntoRectangularFormat( const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc );
 
-        SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getUsedDataRanges(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDiagram > & xDiagram );
+        SAL_DLLPRIVATE static css::uno::Sequence< OUString > getUsedDataRanges(
+            const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
 
-        static ::com::sun::star::uno::Sequence< OUString > getUsedDataRanges(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::frame::XModel > & xChartModel );
+        static css::uno::Sequence< OUString > getUsedDataRanges(
+            const css::uno::Reference< css::frame::XModel > & xChartModel );
 
-        static ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::data::XDataSource > getUsedData(
+        static css::uno::Reference< css::chart2::data::XDataSource > getUsedData(
                 ChartModel& rModel );
 
-        static ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::data::XDataSource > getUsedData(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::frame::XModel >& xChartModel );
+        static css::uno::Reference< css::chart2::data::XDataSource > getUsedData(
+            const css::uno::Reference< css::frame::XModel >& xChartModel );
 
-        static ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::data::XDataSource > getUsedData(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XChartDocument >& xChartDoc );
+        static css::uno::Reference< css::chart2::data::XDataSource > getUsedData(
+            const css::uno::Reference<css::chart2::XChartDocument >& xChartDoc );
 
         static bool detectRangeSegmentation(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::frame::XModel >& xChartModel
+            const css::uno::Reference< css::frame::XModel >& xChartModel
             , OUString& rOutRangeString
-            , ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping
+            , css::uno::Sequence< sal_Int32 >& rSequenceMapping
             , bool& rOutUseColumns
             , bool& rOutFirstCellAsLabel
             , bool& rOutHasCategories );
 
         static void setRangeSegmentation(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::frame::XModel >& xChartModel
-            , const ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping
+            const css::uno::Reference< css::frame::XModel >& xChartModel
+            , const css::uno::Sequence< sal_Int32 >& rSequenceMapping
             , bool bUseColumns
             , bool bFirstCellAsLabel
             , bool bUseCategories );
@@ -131,19 +120,16 @@ public:
             HasCategories and FirstCellAsLabel.
          */
         static bool allArgumentsForRectRangeDetected(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument );
+            const css::uno::Reference< css::chart2::XChartDocument >& xChartDocument );
 
-        SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getRangesFromLabeledDataSequence(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::data::XLabeledDataSequence > & xLSeq );
+        SAL_DLLPRIVATE static css::uno::Sequence< OUString > getRangesFromLabeledDataSequence(
+            const css::uno::Reference< css::chart2::data::XLabeledDataSequence > & xLSeq );
 
         SAL_DLLPRIVATE static OUString getRangeFromValues(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::data::XLabeledDataSequence > & xLSeq );
+            const css::uno::Reference< css::chart2::data::XLabeledDataSequence > & xLSeq );
 
-        SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getRangesFromDataSource(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::data::XDataSource > & xSource );
+        SAL_DLLPRIVATE static css::uno::Sequence< OUString > getRangesFromDataSource(
+            const css::uno::Reference< css::chart2::data::XDataSource > & xSource );
 };
 
 } //namespace chart
diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx
index cbd78081edc8..f4d3945a46f0 100644
--- a/chart2/source/inc/DiagramHelper.hxx
+++ b/chart2/source/inc/DiagramHelper.hxx
@@ -52,8 +52,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS DiagramHelper
 {
 public:
     typedef ::std::pair<
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XChartTypeTemplate >,
+            css::uno::Reference< css::chart2::XChartTypeTemplate >,
             OUString >
         tTemplateWithServiceName;
 
@@ -67,18 +66,15 @@ public:
      */
     static tTemplateWithServiceName
         getTemplateForDiagram(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDiagram > & xDiagram,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::lang::XMultiServiceFactory > & xChartTypeManager);
+            const css::uno::Reference< css::chart2::XDiagram > & xDiagram,
+            const css::uno::Reference< css::lang::XMultiServiceFactory > & xChartTypeManager);
 
     /** Sets the "SwapXAndYAxis" property at all coordinate systems found in the
         given diagram.
 
         "vertical==true" for bar charts, "vertical==false" for column charts
      */
-    static void setVertical( const ::com::sun::star::uno::Reference<
-                                 ::com::sun::star::chart2::XDiagram > & xDiagram,
+    static void setVertical( const css::uno::Reference< css::chart2::XDiagram > & xDiagram,
                              bool bVertical = true );
 
     /** Gets the "SwapXAndYAxis" property at all coordinate systems found in the
@@ -86,13 +82,11 @@ public:
 
         "vertical==true" for bar charts, "vertical==false" for column charts
     */
-    static bool getVertical( const ::com::sun::star::uno::Reference<
-                                 ::com::sun::star::chart2::XDiagram > & xDiagram,
+    static bool getVertical( const css::uno::Reference< css::chart2::XDiagram > & xDiagram,
                              bool& rbOutFoundResult, bool& rbOutAmbiguousResult );
 
     static StackMode getStackMode(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram > & xDiagram,
+        const css::uno::Reference< css::chart2::XDiagram > & xDiagram,
         bool& rbFound, bool& rbAmbiguous
         );
 
@@ -103,8 +97,7 @@ public:
         applies to the first chart type/the bars)
      */
     static void setStackMode(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram > & xDiagram,
+        const css::uno::Reference< css::chart2::XDiagram > & xDiagram,
         StackMode eStackMode
         );
 
@@ -118,20 +111,17 @@ public:
             "ambiguous")
      */
     static StackMode getStackModeFromChartType(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartType > & xChartType,
+        const css::uno::Reference< css::chart2::XChartType > & xChartType,
         bool& rbFound, bool& rbAmbiguous,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem =
-                ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >()
+        const css::uno::Reference< css::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem =
+                css::uno::Reference< css::chart2::XCoordinateSystem >()
         );
 
     /** Returns the dimension found for all chart types in the tree.  If the
         dimension is not unique, 0 is returned.
      */
     static sal_Int32 getDimension(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram > & xDiagram );
+        const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
 
     /** Sets the dimension of the diagram given.
 
@@ -141,122 +131,92 @@ public:
            XCoordinateSystemContainer of the diagram.
      */
     static void setDimension(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram > & xDiagram,
+        const css::uno::Reference< css::chart2::XDiagram > & xDiagram,
         sal_Int32 nNewDimensionCount );
 
     /** Replaces all occurrences of xCooSysToReplace in the tree with
         xReplacement in the diagram's tree
      */
     SAL_DLLPRIVATE static void replaceCoordinateSystem(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram > & xDiagram,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XCoordinateSystem > & xCooSysToReplace,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XCoordinateSystem > & xReplacement );
+        const css::uno::Reference< css::chart2::XDiagram > & xDiagram,
+        const css::uno::Reference< css::chart2::XCoordinateSystem > & xCooSysToReplace,
+        const css::uno::Reference< css::chart2::XCoordinateSystem > & xReplacement );
 
     static bool isSeriesAttachedToMainAxis(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDataSeries >& xDataSeries );
+        const css::uno::Reference< css::chart2::XDataSeries >& xDataSeries );
 
     static bool attachSeriesToAxis( bool bMainAxis,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDataSeries >& xSeries,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram >& xDiagram,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::uno::XComponentContext > & xContext,
+        const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
+        const css::uno::Reference< css::chart2::XDiagram >& xDiagram,
+        const css::uno::Reference< css::uno::XComponentContext > & xContext,
         bool bAdaptAxes=true );
 
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XAxis > getAttachedAxis(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDataSeries >& xSeries,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram >& xDiagram );
+    static css::uno::Reference< css::chart2::XAxis > getAttachedAxis(
+        const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
+        const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
 
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartType >
+    static css::uno::Reference< css::chart2::XChartType >
         getChartTypeOfSeries(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDiagram >& xDiagram,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDataSeries >& xSeries );
-
-    static ::std::vector<
-            ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDataSeries > >
+            const css::uno::Reference< css::chart2::XDiagram >& xDiagram,
+            const css::uno::Reference< css::chart2::XDataSeries >& xSeries );
+
+    static ::std::vector< css::uno::Reference< css::chart2::XDataSeries > >
         getDataSeriesFromDiagram(
-            const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram > & xDiagram );
+            const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
 
     /** return all data series in this diagram grouped by chart-types
      */
-    static ::com::sun::star::uno::Sequence<
-               ::com::sun::star::uno::Sequence<
-                   ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > > >
+    static css::uno::Sequence<
+               css::uno::Sequence<
+                   css::uno::Reference< css::chart2::XDataSeries > > >
         getDataSeriesGroups(
-            const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram > & xDiagram );
+            const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
 
     static bool isCategoryDiagram(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDiagram >& xDiagram );
+            const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
 
     static void setCategoriesToDiagram(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::data::XLabeledDataSequence >& xCategories,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDiagram >& xDiagram,
+            const css::uno::Reference< css::chart2::data::XLabeledDataSequence >& xCategories,
+            const css::uno::Reference< css::chart2::XDiagram >& xDiagram,
             bool bSetAxisType = false, // when this flag is true ...
             bool bCategoryAxis = true);// set the AxisType to CATEGORY or back to REALNUMBER
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >
+    static css::uno::Reference< css::chart2::data::XLabeledDataSequence >
         getCategoriesFromDiagram(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDiagram > & xDiagram );
+            const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
 
-    static ::com::sun::star::uno::Sequence< OUString >
+    static css::uno::Sequence< OUString >
         getExplicitSimpleCategories( ChartModel& rModel );
 
-    SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString >
+    SAL_DLLPRIVATE static css::uno::Sequence< OUString >
         generateAutomaticCategoriesFromCooSys(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XCoordinateSystem > & xCooSys );
+            const css::uno::Reference< css::chart2::XCoordinateSystem > & xCooSys );
 
     static void switchToDateCategories(
-        const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XChartDocument > & xChartDoc );
+        const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc );
 
     static void switchToTextCategories(
-        const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XChartDocument > & xChartDoc );
+        const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc );
 
-    static bool isSupportingDateAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram );
-    static bool isDateNumberFormat( sal_Int32 nNumberFormat, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& xNumberFormats );
-    static sal_Int32 getDateNumberFormat( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier );
-    static sal_Int32 getDateTimeInputNumberFormat( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier, double fNumber );
+    static bool isSupportingDateAxis( const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
+    static bool isDateNumberFormat( sal_Int32 nNumberFormat, const css::uno::Reference< css::util::XNumberFormats >& xNumberFormats );
+    static sal_Int32 getDateNumberFormat( const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier );
+    static sal_Int32 getDateTimeInputNumberFormat( const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier, double fNumber );
 
-    static sal_Int32 getPercentNumberFormat( const ::com::sun::star::uno::Reference<
-                ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier );
+    static sal_Int32 getPercentNumberFormat( const css::uno::Reference<
+                css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier );
 
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartType >
-        getChartTypeByIndex( const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Int32 nIndex );
+    static css::uno::Reference< css::chart2::XChartType >
+        getChartTypeByIndex( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, sal_Int32 nIndex );
 
-    static ::com::sun::star::uno::Sequence<
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XChartType > >
+    static css::uno::Sequence<
+            css::uno::Reference< css::chart2::XChartType > >
         getChartTypesFromDiagram(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDiagram > & xDiagram );
+            const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
 
-    SAL_DLLPRIVATE static bool areChartTypesCompatible( const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XChartType >& xFirstType,
-                const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XChartType >& xSecondType );
+    SAL_DLLPRIVATE static bool areChartTypesCompatible( const css::uno::Reference<
+                css::chart2::XChartType >& xFirstType,
+                const css::uno::Reference< css::chart2::XChartType >& xSecondType );
 
     /**
         * Test if a series can be moved.
@@ -274,10 +234,8 @@ public:
         *
         */
     static bool isSeriesMoveable(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDiagram >& xDiagram,
-            const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XDataSeries >& xGivenDataSeries,
+            const css::uno::Reference< css::chart2::XDiagram >& xDiagram,
+            const css::uno::Reference< css::chart2::XDataSeries >& xGivenDataSeries,
             bool bForward );
 
     /**
@@ -296,42 +254,33 @@ public:
         *
         */
     static bool moveSeries(
-                const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::chart2::XDiagram >& xDiagram,
-                const ::com::sun::star::uno::Reference<
-          ::com::sun::star::chart2::XDataSeries >& xGivenDataSeries,
+                const css::uno::Reference< css::chart2::XDiagram >& xDiagram,
+                const css::uno::Reference< css::chart2::XDataSeries >& xGivenDataSeries,
                 bool bForward );
 
-    static bool isSupportingFloorAndWall( const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDiagram > & xDiagram );
+    static bool isSupportingFloorAndWall( const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
 
-    static bool isPieOrDonutChart( const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDiagram >& xDiagram );
+    static bool isPieOrDonutChart( const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
 
     static sal_Int32 getGeometry3D(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram > & xDiagram,
+        const css::uno::Reference< css::chart2::XDiagram > & xDiagram,
         bool& rbFound, bool& rbAmbiguous );
 
     static void setGeometry3D(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram > & xDiagram,
+        const css::uno::Reference< css::chart2::XDiagram > & xDiagram,
         sal_Int32 nNewGeometry );
 
-    //returns integer from constant group ::com::sun::star::chart::MissingValueTreatment
+    //returns integer from constant group css::chart::MissingValueTreatment
     static sal_Int32 getCorrectedMissingValueTreatment(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDiagram > & xDiagram,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XChartType >& xChartType );
+            const css::uno::Reference< css::chart2::XDiagram > & xDiagram,
+            const css::uno::Reference< css::chart2::XChartType >& xChartType );
 
-    static DiagramPositioningMode getDiagramPositioningMode( const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDiagram > & xDiagram );
+    static DiagramPositioningMode getDiagramPositioningMode( const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
 
-    static bool setDiagramPositioning( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel,
-        const ::com::sun::star::awt::Rectangle& rPosRect /*100th mm*/ );
+    static bool setDiagramPositioning( const css::uno::Reference< css::frame::XModel >& xChartModel,
+        const css::awt::Rectangle& rPosRect /*100th mm*/ );
 
-    static ::com::sun::star::awt::Rectangle getDiagramRectangleFromModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel );
+    static css::awt::Rectangle getDiagramRectangleFromModel( const css::uno::Reference< css::frame::XModel >& xChartModel );
 
     static bool switchDiagramPositioningToExcludingPositioning( ChartModel& rModel
         , bool bResetModifiedState //set model back to unchanged if it was unchanged before
diff --git a/chart2/source/inc/DisposeHelper.hxx b/chart2/source/inc/DisposeHelper.hxx
index a2f1bba814af..72642a23121c 100644
--- a/chart2/source/inc/DisposeHelper.hxx
+++ b/chart2/source/inc/DisposeHelper.hxx
@@ -30,16 +30,15 @@ namespace DisposeHelper
 template< class T >
     void Dispose( const T & xIntf )
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComp(
-        xIntf, ::com::sun::star::uno::UNO_QUERY );
+    css::uno::Reference< css::lang::XComponent > xComp( xIntf, css::uno::UNO_QUERY );
     if( xComp.is())
         xComp->dispose();
 }
 
 template< class Intf >
-    void DisposeAndClear( ::com::sun::star::uno::Reference< Intf > & rIntf )
+    void DisposeAndClear( css::uno::Reference< Intf > & rIntf )
 {
-    Dispose< ::com::sun::star::uno::Reference< Intf > >( rIntf );
+    Dispose< css::uno::Reference< Intf > >( rIntf );
     rIntf.set( 0 );
 }
 
diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx
index 9f8a187f816d..97333e3c5e8a 100644
--- a/chart2/source/inc/ErrorBar.hxx
+++ b/chart2/source/inc/ErrorBar.hxx
@@ -41,21 +41,20 @@
 namespace chart
 {
 
-OOO_DLLPUBLIC_CHARTTOOLS    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createErrorBar(
-    const ::com::sun::star::uno::Reference<
-            ::com::sun::star::uno::XComponentContext > & xContext );
+OOO_DLLPUBLIC_CHARTTOOLS    css::uno::Reference< css::beans::XPropertySet > createErrorBar(
+    const css::uno::Reference< css::uno::XComponentContext > & xContext );
 
 namespace impl
 {
 typedef ::cppu::WeakImplHelper<
-        ::com::sun::star::lang::XServiceInfo,
-        ::com::sun::star::util::XCloneable,
-        ::com::sun::star::util::XModifyBroadcaster,
-        ::com::sun::star::util::XModifyListener,
-        ::com::sun::star::chart2::data::XDataSource,
-        ::com::sun::star::chart2::data::XDataSink,
-        ::com::sun::star::beans::XPropertySet,
-        ::com::sun::star::beans::XPropertyState >
+        css::lang::XServiceInfo,
+        css::util::XCloneable,
+        css::util::XModifyBroadcaster,
+        css::util::XModifyListener,
+        css::chart2::data::XDataSource,
+        css::chart2::data::XDataSink,
+        css::beans::XPropertySet,
+        css::beans::XPropertyState >
     ErrorBar_Base;
 }
 
@@ -73,9 +72,7 @@ private:
     sal_Int32 meStyle;
 
 public:
-    explicit ErrorBar(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::uno::XComponentContext > & xContext );
+    explicit ErrorBar( const css::uno::Reference< css::uno::XComponentContext > & xContext );
     virtual ~ErrorBar();
 
     /// XServiceInfo declarations
@@ -90,75 +87,74 @@ public:
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
     // 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 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 OUString& PropertyName )
-        throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::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;
-    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;
-    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;
-    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;
+    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 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 (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, 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 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 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 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( const OUString& rPropName )
-        throw (com::sun::star::beans::UnknownPropertyException, std::exception) override;
-    virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates(
-            const com::sun::star::uno::Sequence< OUString >& rPropNames )
-        throw (com::sun::star::beans::UnknownPropertyException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropName )
+        throw (css::beans::UnknownPropertyException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates(
+            const css::uno::Sequence< OUString >& rPropNames )
+        throw (css::beans::UnknownPropertyException, std::exception) override;
     virtual void SAL_CALL setPropertyToDefault( const OUString& rPropName )
-        throw (com::sun::star::beans::UnknownPropertyException, std::exception) override;
-    virtual com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropName )
-        throw (com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, std::exception) override;
+        throw (css::beans::UnknownPropertyException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropName )
+        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override;
 
 protected:
     ErrorBar( const ErrorBar & rOther );
 
     // ____ XCloneable ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL removeModifyListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const ::com::sun::star::lang::EventObject& aEvent )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const ::com::sun::star::lang::EventObject& Source )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XDataSink ____
-    virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > >& aData )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XDataSource ____
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences()
+        throw (css::uno::RuntimeException, std::exception) override;
 
 private:
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::uno::XComponentContext >
+    css::uno::Reference< css::uno::XComponentContext >
                         m_xContext;
 
-    typedef ::std::vector< ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::data::XLabeledDataSequence > > tDataSequenceContainer;
+    typedef ::std::vector< css::uno::Reference<
+            css::chart2::data::XLabeledDataSequence > > tDataSequenceContainer;
     tDataSequenceContainer m_aDataSequences;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder;
+    css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
 };
 
 } //  namespace chart
diff --git a/chart2/source/inc/EventListenerHelper.hxx b/chart2/source/inc/EventListenerHelper.hxx
index 7e190df645a0..07de4ca91c43 100644
--- a/chart2/source/inc/EventListenerHelper.hxx
+++ b/chart2/source/inc/EventListenerHelper.hxx
@@ -38,39 +38,37 @@ namespace impl
 template< class InterfaceRef >
 struct addListenerFunctor : public ::std::unary_function< InterfaceRef, void >
 {
-    explicit addListenerFunctor( const ::com::sun::star::uno::Reference<
-                                     ::com::sun::star::lang::XEventListener > & xListener ) :
+    explicit addListenerFunctor( const css::uno::Reference< css::lang::XEventListener > & xListener ) :
             m_xListener( xListener )
     {}
 
     void operator() ( const InterfaceRef & xObject )
     {
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
-              xBroadcaster( xObject, ::com::sun::star::uno::UNO_QUERY );
+        css::uno::Reference< css::lang::XComponent >
+              xBroadcaster( xObject, css::uno::UNO_QUERY );
         if( xBroadcaster.is() && m_xListener.is())
             xBroadcaster->addEventListener( m_xListener );
     }
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > m_xListener;
+    css::uno::Reference< css::lang::XEventListener > m_xListener;
 };
 
 template< class InterfaceRef >
 struct removeListenerFunctor : public ::std::unary_function< InterfaceRef, void >
 {
-    explicit removeListenerFunctor( const ::com::sun::star::uno::Reference<
-                                        ::com::sun::star::lang::XEventListener > & xListener ) :
+    explicit removeListenerFunctor( const css::uno::Reference<  css::lang::XEventListener > & xListener ) :
             m_xListener( xListener )
     {}
 
     void operator() ( const InterfaceRef & xObject )
     {
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
-              xBroadcaster( xObject, ::com::sun::star::uno::UNO_QUERY );
+        css::uno::Reference< css::lang::XComponent >
+              xBroadcaster( xObject, css::uno::UNO_QUERY );
         if( xBroadcaster.is() && m_xListener.is())
             xBroadcaster->removeEventListener( m_xListener );
     }
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > m_xListener;
+    css::uno::Reference< css::lang::XEventListener > m_xListener;
 };
 
 } //  namespace impl
@@ -78,8 +76,7 @@ private:
 template< class InterfaceRef >
 void addListener(
     const InterfaceRef & xObject,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::lang::XEventListener > & xListener )
+    const css::uno::Reference< css::lang::XEventListener > & xListener )
 {
     if( xListener.is())
     {
@@ -91,8 +88,7 @@ void addListener(
 template< class Container >
 void addListenerToAllElements(
     const Container & rContainer,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::lang::XEventListener > & xListener )
+    const css::uno::Reference< css::lang::XEventListener > & xListener )
 {
     if( xListener.is())
         ::std::for_each( rContainer.begin(), rContainer.end(),
@@ -102,8 +98,7 @@ void addListenerToAllElements(
 template< class InterfaceRef >
 void removeListener(
     const InterfaceRef & xObject,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::lang::XEventListener > & xListener )
+    const css::uno::Reference< css::lang::XEventListener > & xListener )
 {
     if( xListener.is())
     {
@@ -115,8 +110,7 @@ void removeListener(
 template< class Container >
 void removeListenerFromAllElements(
     const Container & rContainer,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::lang::XEventListener > & xListener )
+    const css::uno::Reference< css::lang::XEventListener > & xListener )
 {
     if( xListener.is())
         ::std::for_each( rContainer.begin(), rContainer.end(),
diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx
index 6297ad1da067..60de98f6a00a 100644
--- a/chart2/source/inc/ExplicitCategoriesProvider.hxx
+++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx
@@ -44,61 +44,56 @@ public:
     virtual ~SplitCategoriesProvider();
 
     virtual sal_Int32 getLevelCount() const = 0;
-    virtual ::com::sun::star::uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const = 0;
+    virtual css::uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const = 0;
 };
 
 class OOO_DLLPUBLIC_CHARTTOOLS ExplicitCategoriesProvider
 {
 public:
-    ExplicitCategoriesProvider( const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::chart2::XCoordinateSystem >& xCooSysModel
+    ExplicitCategoriesProvider( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSysModel
                        , ChartModel& rChartModel
                        );
     virtual ~ExplicitCategoriesProvider();
 
     void init();
 
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::data::XDataSequence > getOriginalCategories();
+    css::uno::Reference< css::chart2::data::XDataSequence > getOriginalCategories();
 
-    ::com::sun::star::uno::Sequence< OUString > getSimpleCategories();
+    css::uno::Sequence< OUString > getSimpleCategories();
     const std::vector<ComplexCategory>* getCategoriesByLevel( sal_Int32 nLevel );
 
     static OUString getCategoryByIndex(
-          const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XCoordinateSystem >& xCooSysModel
+          const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSysModel
         , ChartModel& rModel
         , sal_Int32 nIndex );
 
-    static ::com::sun::star::uno::Sequence< OUString > getExplicitSimpleCategories(
+    static css::uno::Sequence< OUString > getExplicitSimpleCategories(
             const SplitCategoriesProvider& rSplitCategoriesProvider );
 
-    static void convertCategoryAnysToText( ::com::sun::star::uno::Sequence< OUString >& rOutTexts
-        , const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rInAnys
+    static void convertCategoryAnysToText( css::uno::Sequence< OUString >& rOutTexts
+        , const css::uno::Sequence< css::uno::Any >& rInAnys
         , ChartModel& rModel );
 
     bool hasComplexCategories() const;
     sal_Int32 getCategoryLevelCount() const;
 
-    const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::data::XLabeledDataSequence> >& getSplitCategoriesList() { return m_aSplitCategoriesList;}
+    const css::uno::Sequence< css::uno::Reference<
+        css::chart2::data::XLabeledDataSequence> >& getSplitCategoriesList() { return m_aSplitCategoriesList;}
 
     bool isDateAxis();
     const std::vector< double >&  getDateCategories();
 
 private: //member
     bool volatile m_bDirty;
-    ::com::sun::star::uno::WeakReference<
-        ::com::sun::star::chart2::XCoordinateSystem >   m_xCooSysModel;
+    css::uno::WeakReference< css::chart2::XCoordinateSystem >   m_xCooSysModel;
     ChartModel& mrModel;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::data::XLabeledDataSequence> m_xOriginalCategories;
+    css::uno::Reference< css::chart2::data::XLabeledDataSequence> m_xOriginalCategories;
 
     bool m_bIsExplicitCategoriesInited;
-    ::com::sun::star::uno::Sequence< OUString >  m_aExplicitCategories;
+    css::uno::Sequence< OUString >  m_aExplicitCategories;
     ::std::vector< ::std::vector< ComplexCategory > >   m_aComplexCats;
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::data::XLabeledDataSequence> > m_aSplitCategoriesList;
+    css::uno::Sequence< css::uno::Reference<
+        css::chart2::data::XLabeledDataSequence> > m_aSplitCategoriesList;
 
     bool m_bIsDateAxis;
     bool m_bIsAutoDate;
diff --git a/chart2/source/inc/FillProperties.hxx b/chart2/source/inc/FillProperties.hxx
index 43024262c399..f33d7207bb12 100644
--- a/chart2/source/inc/FillProperties.hxx
+++ b/chart2/source/inc/FillProperties.hxx
@@ -64,7 +64,7 @@ namespace FillProperties
     };
 
     OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector(
-        ::std::vector< ::com::sun::star::beans::Property > & rOutProperties );
+        ::std::vector< css::beans::Property > & rOutProperties );
 
     OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap );
 }
diff --git a/chart2/source/inc/FormattedStringHelper.hxx b/chart2/source/inc/FormattedStringHelper.hxx
index 1cbdeba7974d..8432c5728fb9 100644
--- a/chart2/source/inc/FormattedStringHelper.hxx
+++ b/chart2/source/inc/FormattedStringHelper.hxx
@@ -30,15 +30,12 @@ namespace chart
 class OOO_DLLPUBLIC_CHARTTOOLS FormattedStringHelper
 {
 public:
-    static ::com::sun::star::uno::Sequence<
-            ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XFormattedString2 > >
+    static css::uno::Sequence<
+            css::uno::Reference< css::chart2::XFormattedString2 > >
             createFormattedStringSequence(
-                     const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::uno::XComponentContext > & xContext
+                     const css::uno::Reference< css::uno::XComponentContext > & xContext
                     , const OUString & rString
-                    , const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::beans::XPropertySet > & xTextProperties ) throw();
+                    , const css::uno::Reference< css::beans::XPropertySet > & xTextProperties ) throw();
 };
 
 } //namespace chart
diff --git a/chart2/source/inc/InternalData.hxx b/chart2/source/inc/InternalData.hxx
index 488be162cdad..26ec9fc40e67 100644
--- a/chart2/source/inc/InternalData.hxx
+++ b/chart2/source/inc/InternalData.hxx
@@ -34,22 +34,20 @@ public:
 
     void createDefaultData();
 
-    void setData( const ::com::sun::star::uno::Sequence<
-        ::com::sun::star::uno::Sequence< double > > & rDataInRows );
-    ::com::sun::star::uno::Sequence<
-        ::com::sun::star::uno::Sequence< double > > getData() const;
+    void setData( const css::uno::Sequence< css::uno::Sequence< double > > & rDataInRows );
+    css::uno::Sequence< css::uno::Sequence< double > > getData() const;
 
-    ::com::sun::star::uno::Sequence< double > getColumnValues( sal_Int32 nColumnIndex ) const;
-    ::com::sun::star::uno::Sequence< double > getRowValues( sal_Int32 nRowIndex ) const;
+    css::uno::Sequence< double > getColumnValues( sal_Int32 nColumnIndex ) const;
+    css::uno::Sequence< double > getRowValues( sal_Int32 nRowIndex ) const;
 
     void setColumnValues( sal_Int32 nColumnIndex, const ::std::vector< double > & rNewData );
     void setRowValues( sal_Int32 nRowIndex, const ::std::vector< double > & rNewData );
 
-    void setComplexColumnLabel( sal_Int32 nColumnIndex, const ::std::vector< ::com::sun::star::uno::Any >& rComplexLabel );
-    void setComplexRowLabel( sal_Int32 nRowIndex, const ::std::vector< ::com::sun::star::uno::Any >& rComplexLabel );
+    void setComplexColumnLabel( sal_Int32 nColumnIndex, const ::std::vector< css::uno::Any >& rComplexLabel );
+    void setComplexRowLabel( sal_Int32 nRowIndex, const ::std::vector< css::uno::Any >& rComplexLabel );
 
-    ::std::vector< ::com::sun::star::uno::Any > getComplexColumnLabel( sal_Int32 nColumnIndex ) const;
-    ::std::vector< ::com::sun::star::uno::Any > getComplexRowLabel( sal_Int32 nRowIndex ) const;
+    ::std::vector< css::uno::Any > getComplexColumnLabel( sal_Int32 nColumnIndex ) const;
+    ::std::vector< css::uno::Any > getComplexRowLabel( sal_Int32 nRowIndex ) const;
 
     void swapRowWithNext( sal_Int32 nRowIndex );
     void swapColumnWithNext( sal_Int32 nColumnIndex );
@@ -67,7 +65,7 @@ public:
     sal_Int32 getRowCount() const;
     sal_Int32 getColumnCount() const;
 
-    typedef ::std::vector< ::std::vector< ::com::sun::star::uno::Any > > tVecVecAny; //inner index is hierarchical level
+    typedef ::std::vector< ::std::vector< css::uno::Any > > tVecVecAny; //inner index is hierarchical level
 
     void setComplexRowLabels( const tVecVecAny& rNewRowLabels );
     tVecVecAny getComplexRowLabels() const;
diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx
index daaa4ecad43f..8355d8269f18 100644
--- a/chart2/source/inc/InternalDataProvider.hxx
+++ b/chart2/source/inc/InternalDataProvider.hxx
@@ -44,13 +44,13 @@ namespace impl
 {
 
 typedef ::cppu::WeakImplHelper<
-        ::com::sun::star::chart2::XInternalDataProvider,
-        ::com::sun::star::chart2::data::XRangeXMLConversion,
-        ::com::sun::star::chart2::XAnyDescriptionAccess,
-        ::com::sun::star::chart::XDateCategories,
-        ::com::sun::star::util::XCloneable,
-        ::com::sun::star::lang::XInitialization,
-        ::com::sun::star::lang::XServiceInfo >
+        css::chart2::XInternalDataProvider,
+        css::chart2::data::XRangeXMLConversion,
+        css::chart2::XAnyDescriptionAccess,
+        css::chart::XDateCategories,
+        css::util::XCloneable,
+        css::lang::XInitialization,
+        css::lang::XServiceInfo >
     InternalDataProvider_Base;
 }
 
@@ -68,12 +68,12 @@ class InternalDataProvider :
         public impl::InternalDataProvider_Base
 {
 public:
-    explicit InternalDataProvider(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & _xContext);
+    explicit InternalDataProvider(const css::uno::Reference< css::uno::XComponentContext > & _xContext);
 
     // #i120559# allow handing over a default for data orientation
     // (DataInColumns) that will be used when no data is available
     explicit InternalDataProvider(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDoc,
+        const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc,
         bool bConnectToModel,
         bool bDefaultDataInColumns );
     explicit InternalDataProvider( const InternalDataProvider & rOther );
@@ -94,151 +94,144 @@ public:
 
     // ____ XInternalDataProvider ____
     virtual sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL
         getDataByRangeRepresentation( const OUString& aRange )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setDataByRangeRepresentation(
         const OUString& aRange,
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aNewData )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Any >& aNewData )
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL insertSequence( ::sal_Int32 nAfterIndex )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL deleteSequence( ::sal_Int32 nAtIndex )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL appendSequence()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL insertComplexCategoryLevel( ::sal_Int32 nLevel )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL deleteComplexCategoryLevel( ::sal_Int32 nLevel )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL insertDataPointForAllSequences( ::sal_Int32 nAfterIndex )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL deleteDataPointForAllSequences( ::sal_Int32 nAtIndex )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL registerDataSequenceForChanges(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSeq )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::data::XDataSequence >& xSeq )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XDataProvider (base of XInternalDataProvider) ____
     virtual sal_Bool SAL_CALL createDataSourcePossible(
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL createDataSource(
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL detectArguments(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& aArguments )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL createDataSource(
+        const css::uno::Sequence< css::beans::PropertyValue >& aArguments )
+        throw (css::lang::IllegalArgumentException,
+               css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL detectArguments(
+        const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource )
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible(
         const OUString& aRangeRepresentation )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation(
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation(
         const OUString& aRangeRepresentation )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::IllegalArgumentException,
+               css::uno::RuntimeException, std::exception) override;
 
     virtual css::uno::Reference<css::chart2::data::XDataSequence> SAL_CALL
         createDataSequenceByValueArray( const OUString& aRole, const OUString& aRangeRepresentation )
             throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection()
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XRangeXMLConversion ____
     virtual OUString SAL_CALL convertRangeToXML(
         const OUString& aRangeRepresentation )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::IllegalArgumentException,
+               css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL convertRangeFromXML(
         const OUString& aXMLRange )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::IllegalArgumentException,
+               css::uno::RuntimeException, std::exception) override;
 
     // ____ XDateCategories ____
-    virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getDateCategories() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDateCategories( const ::com::sun::star::uno::Sequence< double >& rDates ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< double > SAL_CALL getDateCategories() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XAnyDescriptionAccess ____
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL
-        getAnyRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL
+        getAnyRowDescriptions() throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setAnyRowDescriptions(
-        const ::com::sun::star::uno::Sequence<
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aRowDescriptions )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL
-        getAnyColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL
+        getAnyColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setAnyColumnDescriptions(
-        const ::com::sun::star::uno::Sequence<
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aColumnDescriptions )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL
-        getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL
+        getComplexRowDescriptions() throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setComplexRowDescriptions(
-        const ::com::sun::star::uno::Sequence<
-        ::com::sun::star::uno::Sequence< OUString > >& aRowDescriptions )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL
-        getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL
+        getComplexColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setComplexColumnDescriptions(
-        const ::com::sun::star::uno::Sequence<
-        ::com::sun::star::uno::Sequence< OUString > >& aColumnDescriptions )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XChartDataArray (base of XComplexDescriptionAccess) ____
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData()
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setData(
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Sequence< double > >& aData )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions()
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setRowDescriptions(
-        const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< OUString >& aRowDescriptions )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions()
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setColumnDescriptions(
-        const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< OUString >& aColumnDescriptions )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XChartData (base of XChartDataArray) ____
     virtual void SAL_CALL addChartDataChangeEventListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL removeChartDataChangeEventListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual double SAL_CALL getNotANumber()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL isNotANumber(
         double nNumber )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XCloneable ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    // ::com::sun::star::lang::XInitialization:
-    virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments)
-        throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
+        throw (css::uno::RuntimeException, std::exception) override;
+    // css::lang::XInitialization:
+    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments)
+        throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
 
 private:
     void addDataSequenceToMap(
         const OUString & rRangeRepresentation,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::data::XDataSequence > & xSequence );
+        const css::uno::Reference< css::chart2::data::XDataSequence > & xSequence );
 
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::data::XDataSequence >
+    css::uno::Reference< css::chart2::data::XDataSequence >
         createDataSequenceAndAddToMap( const OUString & rRangeRepresentation,
                                        const OUString & rRole );
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::data::XDataSequence >
+    css::uno::Reference< css::chart2::data::XDataSequence >
         createDataSequenceAndAddToMap( const OUString & rRangeRepresentation );
 
     css::uno::Reference<css::chart2::data::XDataSequence>
@@ -254,7 +247,7 @@ private:
     void decreaseMapReferences( sal_Int32 nBegin, sal_Int32 nEnd );
 
     typedef ::std::multimap< OUString,
-            ::com::sun::star::uno::WeakReference< ::com::sun::star::chart2::data::XDataSequence > >
+            css::uno::WeakReference< css::chart2::data::XDataSequence > >
         tSequenceMap;
     typedef ::std::pair< tSequenceMap::iterator, tSequenceMap::iterator > tSequenceMapRange;
     typedef ::std::pair< tSequenceMap::const_iterator, tSequenceMap::const_iterator > tConstSequenceMapRange;
diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx
index 3a641f15bd6b..a68bb703aadd 100644
--- a/chart2/source/inc/LabeledDataSequence.hxx
+++ b/chart2/source/inc/LabeledDataSequence.hxx
@@ -35,8 +35,8 @@ namespace chart
 namespace impl
 {
 typedef cppu::WeakImplHelper<
-        ::com::sun::star::chart2::data::XLabeledDataSequence2,
-        ::com::sun::star::lang::XServiceInfo >
+        css::chart2::data::XLabeledDataSequence2,
+        css::lang::XServiceInfo >
     LabeledDataSequence_Base;
 }
 
@@ -47,13 +47,10 @@ class LabeledDataSequence :
 public:
     explicit LabeledDataSequence();
     explicit LabeledDataSequence(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::data::XDataSequence > & rValues );
+        const css::uno::Reference< css::chart2::data::XDataSequence > & rValues );
     explicit LabeledDataSequence(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::data::XDataSequence > & rValues,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::data::XDataSequence > & rLabels );
+        const css::uno::Reference< css::chart2::data::XDataSequence > & rValues,
+        const css::uno::Reference< css::chart2::data::XDataSequence > & rLabels );
 
     virtual ~LabeledDataSequence();
 
@@ -70,34 +67,34 @@ public:
 
 protected:
     // ____ XLabeledDataSequence ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getValues()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getValues()
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setValues(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getLabel()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getLabel()
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setLabel(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XCloneable ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL removeModifyListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > m_xData;
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > m_xLabel;
+    css::uno::Reference< css::chart2::data::XDataSequence > m_xData;
+    css::uno::Reference< css::chart2::data::XDataSequence > m_xLabel;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >       m_xModifyEventForwarder;
+    css::uno::Reference< css::util::XModifyListener >       m_xModifyEventForwarder;
 };
 
 } //  namespace chart
diff --git a/chart2/source/inc/LegendHelper.hxx b/chart2/source/inc/LegendHelper.hxx
index 26008b882956..44095006a939 100644
--- a/chart2/source/inc/LegendHelper.hxx
+++ b/chart2/source/inc/LegendHelper.hxx
@@ -36,26 +36,22 @@ namespace chart
 class OOO_DLLPUBLIC_CHARTTOOLS LegendHelper
 {
 public:
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XLegend >
+    static css::uno::Reference< css::chart2::XLegend >
         showLegend( ChartModel& rModel
-                  , const ::com::sun::star::uno::Reference<
-                       ::com::sun::star::uno::XComponentContext >& xContext );
+                  , const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
     static  void hideLegend( ChartModel& rModel );
 
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XLegend >
+    static css::uno::Reference< css::chart2::XLegend >
         getLegend( ChartModel& rModel
-                 , const ::com::sun::star::uno::Reference<
-                       ::com::sun::star::uno::XComponentContext >& xContext = nullptr
+                 , const css::uno::Reference< css::uno::XComponentContext >& xContext = nullptr
                  , bool bCreate = false );
 
     /** returns <FALSE/>, if either there is no legend at the diagram, or there
         is a legend which has a "Show" property of value <FALSE/>. Otherwise,
         <TRUE/> is returned.
      */
-    static bool hasLegend( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram );
+    static bool hasLegend( const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
 };
 
 } //namespace chart
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index 6034027ed176..ef65f007d360 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -39,11 +39,11 @@ friend class LifeTimeGuard;
 protected:
     mutable ::osl::Mutex                    m_aAccessMutex;
 public:
-    LifeTimeManager( ::com::sun::star::lang::XComponent* pComponent, bool bLongLastingCallsCancelable = false );
+    LifeTimeManager( css::lang::XComponent* pComponent, bool bLongLastingCallsCancelable = false );
     virtual ~LifeTimeManager();
 
     bool        impl_isDisposed( bool bAssert=true );
-    bool    dispose() throw(::com::sun::star::uno::RuntimeException);
+    bool    dispose() throw(css::uno::RuntimeException);
 
 public:
     ::cppu::OMultiTypeInterfaceContainerHelper      m_aListenerContainer;
@@ -58,7 +58,7 @@ protected:
     SAL_DLLPRIVATE void        impl_init();
 
 protected:
-    ::com::sun::star::lang::XComponent*     m_pComponent;
+    css::lang::XComponent*     m_pComponent;
 
     ::osl::Condition        m_aNoAccessCountCondition;
     sal_Int32 volatile      m_nAccessCount;
@@ -74,7 +74,7 @@ protected:
 class CloseableLifeTimeManager : public LifeTimeManager
 {
 protected:
-    ::com::sun::star::util::XCloseable*         m_pCloseable;
+    css::util::XCloseable*         m_pCloseable;
 
     ::osl::Condition        m_aEndTryClosingCondition;
     bool volatile       m_bClosed;
@@ -85,21 +85,20 @@ protected:
     bool volatile       m_bOwnership;
 
 public:
-OOO_DLLPUBLIC_CHARTTOOLS    CloseableLifeTimeManager( ::com::sun::star::util::XCloseable* pCloseable
-        , ::com::sun::star::lang::XComponent* pComponent
+OOO_DLLPUBLIC_CHARTTOOLS    CloseableLifeTimeManager( css::util::XCloseable* pCloseable
+        , css::lang::XComponent* pComponent
         , bool bLongLastingCallsCancelable = false );
 OOO_DLLPUBLIC_CHARTTOOLS    virtual ~CloseableLifeTimeManager();
 
 OOO_DLLPUBLIC_CHARTTOOLS    bool        impl_isDisposedOrClosed( bool bAssert=true );
 OOO_DLLPUBLIC_CHARTTOOLS    bool    g_close_startTryClose(bool bDeliverOwnership)
-                    throw ( ::com::sun::star::uno::Exception );
-OOO_DLLPUBLIC_CHARTTOOLS    bool    g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, ::com::sun::star::util::CloseVetoException& ex )
-                    throw ( ::com::sun::star::util::CloseVetoException );
+                    throw ( css::uno::Exception );
+OOO_DLLPUBLIC_CHARTTOOLS    bool    g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, css::util::CloseVetoException& ex )
+                    throw ( css::util::CloseVetoException );
 OOO_DLLPUBLIC_CHARTTOOLS    void        g_close_endTryClose(bool bDeliverOwnership, bool bMyVeto );
 OOO_DLLPUBLIC_CHARTTOOLS    void        g_close_endTryClose_doClose();
-OOO_DLLPUBLIC_CHARTTOOLS    void        g_addCloseListener( const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::util::XCloseListener > & xListener )
-                    throw(::com::sun::star::uno::RuntimeException);
+OOO_DLLPUBLIC_CHARTTOOLS    void    g_addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener )
+                    throw(css::uno::RuntimeException);
 
 protected:
     virtual bool    impl_canStartApiCall() override;
diff --git a/chart2/source/inc/LineProperties.hxx b/chart2/source/inc/LineProperties.hxx
index 2b61fdd4e74a..6c9d413a656e 100644
--- a/chart2/source/inc/LineProperties.hxx
+++ b/chart2/source/inc/LineProperties.hxx
@@ -20,19 +20,19 @@ class LineProperties
 {
 private:
     OUString maDashName;
-    com::sun::star::drawing::LineDash maLineDash;
+    css::drawing::LineDash maLineDash;
     sal_Int32 mnLineWidth;
-    com::sun::star::drawing::LineStyle meLineStyle;
-    com::sun::star::util::Color maLineColor;
+    css::drawing::LineStyle meLineStyle;
+    css::util::Color maLineColor;
     sal_Int16 mnLineTransparence;
-    com::sun::star::drawing::LineJoint meLineJoint;
+    css::drawing::LineJoint meLineJoint;
 
 public:
     LineProperties();
     LineProperties(const LineProperties&);
 
-    com::sun::star::uno::Any getPropertyValue(const OUString& rName);
-    void setPropertyValue(const OUString& rName, const com::sun::star::uno::Any& rAny);
+    css::uno::Any getPropertyValue(const OUString& rName);
+    void setPropertyValue(const OUString& rName, const css::uno::Any& rAny);
 };
 
 #endif
diff --git a/chart2/source/inc/LinePropertiesHelper.hxx b/chart2/source/inc/LinePropertiesHelper.hxx
index a5fd2b93c482..45b086810346 100644
--- a/chart2/source/inc/LinePropertiesHelper.hxx
+++ b/chart2/source/inc/LinePropertiesHelper.hxx
@@ -46,18 +46,18 @@ namespace LinePropertiesHelper
     };
 
     OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector(
-        ::std::vector< ::com::sun::star::beans::Property > & rOutProperties );
+        ::std::vector< css::beans::Property > & rOutProperties );
 
     OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap );
 
-    bool IsLineVisible( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >& xLineProperties );
-    void SetLineVisible( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >& xLineProperties );
-    void SetLineInvisible( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >& xLineProperties );
-    void SetLineColor( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >& xGridProperties, sal_Int32 nColor  );
+    bool IsLineVisible( const css::uno::Reference<
+        css::beans::XPropertySet >& xLineProperties );
+    void SetLineVisible( const css::uno::Reference<
+        css::beans::XPropertySet >& xLineProperties );
+    void SetLineInvisible( const css::uno::Reference<
+        css::beans::XPropertySet >& xLineProperties );
+    void SetLineColor( const css::uno::Reference<
+        css::beans::XPropertySet >& xGridProperties, sal_Int32 nColor  );
 }
 
 } //  namespace chart
diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx
index dead054ca0a2..e1c573d58d12 100644
--- a/chart2/source/inc/MediaDescriptorHelper.hxx
+++ b/chart2/source/inc/MediaDescriptorHelper.hxx
@@ -48,30 +48,24 @@ class OOO_DLLPUBLIC_CHARTTOOLS MediaDescriptorHelper
 private:
     //MediaDescriptorHelper(){};
 public:
-    MediaDescriptorHelper( const ::com::sun::star::uno::Sequence<
-                            ::com::sun::star::beans::PropertyValue > & rMediaDescriptor );
+    MediaDescriptorHelper( const css::uno::Sequence< css::beans::PropertyValue > & rMediaDescriptor );
 
-    ::com::sun::star::uno::Sequence<
-                ::com::sun::star::beans::PropertyValue > getReducedForModel() { return m_aModelProperties;}
+    css::uno::Sequence< css::beans::PropertyValue > getReducedForModel() { return m_aModelProperties;}
 
 public:
     //all properties given in the constructor are stored in the following three sequences
 
-    ::com::sun::star::uno::Sequence<
-        ::com::sun::star::beans::PropertyValue >
+    css::uno::Sequence< css::beans::PropertyValue >
                         m_aRegularProperties; //these are the properties which are described in service com.sun.star.document.MediaDescriptor and not marked as deprecated
 
-    ::com::sun::star::uno::Sequence<
-        ::com::sun::star::beans::PropertyValue >
+    css::uno::Sequence< css::beans::PropertyValue >
                         m_aDeprecatedProperties; //these are properties which are described in service com.sun.star.document.MediaDescriptor but are marked as deprecated
 
-    ::com::sun::star::uno::Sequence<
-        ::com::sun::star::beans::PropertyValue >
+    css::uno::Sequence< css::beans::PropertyValue >
                         m_aAdditionalProperties; //these are properties which are not described in service com.sun.star.document.MediaDescriptor
 
     //properties which should be given to a model are additionally stored in this sequence (not documented properties and deprecated properties are not included!)
-    ::com::sun::star::uno::Sequence<
-        ::com::sun::star::beans::PropertyValue >
+    css::uno::Sequence< css::beans::PropertyValue >
                         m_aModelProperties; //these are properties which are not described in service com.sun.star.document.MediaDescriptor
 
     //@todo define this for debug only, except URL
@@ -84,12 +78,12 @@ public:
     OUString     Comment;
     bool            ISSET_Comment;
 
-    ::com::sun::star::uno::Any
+    css::uno::Any
                         ComponentData;
     bool            ISSET_ComponentData;
     OUString     FileName; //deprecated, same as url
     bool            ISSET_FileName;
-    ::com::sun::star::uno::Any
+    css::uno::Any
                         FilterData;
     bool            ISSET_FilterData;
     OUString     FilterName; //internal filter name.
@@ -107,14 +101,14 @@ public:
     OUString     HierarchicalDocumentName;
     bool            ISSET_HierarchicalDocumentName;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
+    css::uno::Reference< css::io::XOutputStream >
                         OutputStream; //a stream to receive the document data for saving
     bool            ISSET_OutputStream;
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+    css::uno::Reference< css::io::XInputStream >
                         InputStream; //content of document.
     bool            ISSET_InputStream;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-                        InteractionHandler; //::com::sun::star::task::XInteractionHandler
+    css::uno::Reference< css::uno::XInterface >
+                        InteractionHandler; //css::task::XInteractionHandler
     bool            ISSET_InteractionHandler;
 
     OUString     JumpMark;   //specifies the name of a mark within the document where the first view is to position itself.
@@ -131,11 +125,11 @@ public:
     bool            ISSET_Password;
 
         //not documented ... @todo remove?
-    ::com::sun::star::awt::Rectangle
+    css::awt::Rectangle
                         PosSize; //position and size of document window.
     bool            ISSET_PosSize;
 
-    ::com::sun::star::uno::Sequence< sal_Int8 >
+    css::uno::Sequence< sal_Int8 >
                         PostData; //contains the data for HTTP post method as a sequence of bytes.
     bool            ISSET_PostData;
     OUString     PostString; //deprecated, contains the data for HTTP post method as a sequence of bytes.
@@ -147,8 +141,8 @@ public:
     OUString     Referer; //name of document referrer.
     bool            ISSET_Referer;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-                        StatusIndicator; //::com::sun::star::task::XStatusIndicator
+    css::uno::Reference< css::uno::XInterface >
+                        StatusIndicator; //css::task::XStatusIndicator
     bool            ISSET_StatusIndicator;
         //not documented ... @todo remove?
     bool            Silent; //prevents dialogs to query for more information.
@@ -164,22 +158,22 @@ public:
     sal_Int16           Version; //storage version.
     bool            ISSET_Version;
 
-    ::com::sun::star::uno::Any
+    css::uno::Any
                         ViewData;
     bool            ISSET_ViewData;
     sal_Int16           ViewId; //id of the initial view.
     bool            ISSET_ViewId;
 
     // new framework objects
-    ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
+    css::uno::Reference< css::embed::XStorage >
                         Storage;
     bool            ISSET_Storage;
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
+    css::uno::Reference< css::io::XStream >
                         Stream;
     bool            ISSET_Stream;
 
     // undocumented SFX Properties
-    ::com::sun::star::uno::Sequence< sal_Int32 >
+    css::uno::Sequence< sal_Int32 >
                         WinExtent;
     bool            ISSET_WinExtent;
     bool            SetEmbedded;
diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx b/chart2/source/inc/ModifyListenerCallBack.hxx
index ad1b2b3d2083..99c075a68289 100644
--- a/chart2/source/inc/ModifyListenerCallBack.hxx
+++ b/chart2/source/inc/ModifyListenerCallBack.hxx
@@ -47,8 +47,7 @@ private: //methods
 
 private: //member
     ModifyListenerCallBack_impl* pModifyListener_impl;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::util::XModifyListener >   m_xModifyListener;
+    css::uno::Reference< css::util::XModifyListener >   m_xModifyListener;
 };
 
 } // namespace chart
diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx
index 2216588184e5..8d1b20d81361 100644
--- a/chart2/source/inc/ModifyListenerHelper.hxx
+++ b/chart2/source/inc/ModifyListenerHelper.hxx
@@ -40,7 +40,7 @@ namespace chart
 namespace ModifyListenerHelper
 {
 
-OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > createModifyEventForwarder();
+OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::util::XModifyListener > createModifyEventForwarder();
 
 /** This helper class serves as forwarder of modify events.  It can be used
     whenever an object has to send modify events after it gets a modify event of
@@ -53,53 +53,53 @@ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::uti
 class ModifyEventForwarder :
         public MutexContainer,
         public ::cppu::WeakComponentImplHelper<
-            ::com::sun::star::util::XModifyBroadcaster,
-            ::com::sun::star::util::XModifyListener >
+            css::util::XModifyBroadcaster,
+            css::util::XModifyListener >
 {
 public:
     ModifyEventForwarder();
 
-    void FireEvent( const ::com::sun::star::lang::EventObject & rEvent );
+    void FireEvent( const css::lang::EventObject & rEvent );
 
     void AddListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener );
+        const css::uno::Reference< css::util::XModifyListener >& aListener );
     void RemoveListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener );
+        const css::uno::Reference< css::util::XModifyListener >& aListener );
 
 protected:
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL removeModifyListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const ::com::sun::star::lang::EventObject& aEvent )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const ::com::sun::star::lang::EventObject& Source )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ WeakComponentImplHelperBase ____
     virtual void SAL_CALL disposing() override;
 
 private:
     /// call disposing() at all listeners and remove all listeners
-    void DisposeAndClear( const ::com::sun::star::uno::Reference<
-                              ::com::sun::star::uno::XWeak > & xSource );
+    void DisposeAndClear( const css::uno::Reference<
+                              css::uno::XWeak > & xSource );
 
 //     ::osl::Mutex & m_rMutex;
     ::cppu::OBroadcastHelper  m_aModifyListeners;
 
     typedef ::std::list<
             ::std::pair<
-            ::com::sun::star::uno::WeakReference< ::com::sun::star::util::XModifyListener >,
-            ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > > >
+            css::uno::WeakReference< css::util::XModifyListener >,
+            css::uno::Reference< css::util::XModifyListener > > >
         tListenerMap;
 
     tListenerMap m_aListenerMap;
@@ -111,77 +111,73 @@ namespace impl
 template< class InterfaceRef >
 struct addListenerFunctor : public ::std::unary_function< InterfaceRef, void >
 {
-    explicit addListenerFunctor( const ::com::sun::star::uno::Reference<
-                                     ::com::sun::star::util::XModifyListener > & xListener ) :
+    explicit addListenerFunctor( const css::uno::Reference< css::util::XModifyListener > & xListener ) :
             m_xListener( xListener )
     {}
 
     void operator() ( const InterfaceRef & xObject )
     {
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyBroadcaster >
-              xBroadcaster( xObject, ::com::sun::star::uno::UNO_QUERY );
+        css::uno::Reference< css::util::XModifyBroadcaster >
+              xBroadcaster( xObject, css::uno::UNO_QUERY );
         if( xBroadcaster.is() && m_xListener.is())
             xBroadcaster->addModifyListener( m_xListener );
     }
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xListener;
+    css::uno::Reference< css::util::XModifyListener > m_xListener;
 };
 
 template< class InterfaceRef >
 struct removeListenerFunctor : public ::std::unary_function< InterfaceRef, void >
 {
-    explicit removeListenerFunctor( const ::com::sun::star::uno::Reference<
-                                        ::com::sun::star::util::XModifyListener > & xListener ) :
+    explicit removeListenerFunctor( const css::uno::Reference< css::util::XModifyListener > & xListener ) :
             m_xListener( xListener )
     {}
 
     void operator() ( const InterfaceRef & xObject )
     {
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyBroadcaster >
-              xBroadcaster( xObject, ::com::sun::star::uno::UNO_QUERY );
+        css::uno::Reference< css::util::XModifyBroadcaster >
+              xBroadcaster( xObject, css::uno::UNO_QUERY );
         if( xBroadcaster.is() && m_xListener.is())
             xBroadcaster->removeModifyListener( m_xListener );
     }
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xListener;
+    css::uno::Reference< css::util::XModifyListener > m_xListener;
 };
 
 template< class Pair >
 struct addListenerToMappedElementFunctor : public ::std::unary_function< Pair, void >
 {
-    explicit addListenerToMappedElementFunctor( const ::com::sun::star::uno::Reference<
-                                                    ::com::sun::star::util::XModifyListener > & xListener ) :
+    explicit addListenerToMappedElementFunctor( const css::uno::Reference< css::util::XModifyListener > & xListener ) :
             m_xListener( xListener )
     {}
 
     void operator() ( const Pair & aPair )
     {
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyBroadcaster >
-              xBroadcaster( aPair.second, ::com::sun::star::uno::UNO_QUERY );
+        css::uno::Reference< css::util::XModifyBroadcaster >
+              xBroadcaster( aPair.second, css::uno::UNO_QUERY );
         if( xBroadcaster.is() && m_xListener.is())
             xBroadcaster->addModifyListener( m_xListener );
     }
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xListener;
+    css::uno::Reference< css::util::XModifyListener > m_xListener;
 };
 
 template< class Pair >
 struct removeListenerFromMappedElementFunctor : public ::std::unary_function< Pair, void >
 {
-    explicit removeListenerFromMappedElementFunctor( const ::com::sun::star::uno::Reference<
-                                                         ::com::sun::star::util::XModifyListener > & xListener ) :
+    explicit removeListenerFromMappedElementFunctor( const css::uno::Reference< css::util::XModifyListener > & xListener ) :
             m_xListener( xListener )
     {}
 
     void operator() ( const Pair & aPair )
     {
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyBroadcaster >
-              xBroadcaster( aPair.second, ::com::sun::star::uno::UNO_QUERY );
+        css::uno::Reference< css::util::XModifyBroadcaster >
+              xBroadcaster( aPair.second, css::uno::UNO_QUERY );
         if( xBroadcaster.is() && m_xListener.is())
             xBroadcaster->removeModifyListener( m_xListener );
     }
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xListener;
+    css::uno::Reference< css::util::XModifyListener > m_xListener;
 };
 
 } //  namespace impl
@@ -189,8 +185,7 @@ private:
 template< class InterfaceRef >
 void addListener(
     const InterfaceRef & xObject,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::util::XModifyListener > & xListener )
+    const css::uno::Reference< css::util::XModifyListener > & xListener )
 {
     if( xListener.is())
     {
@@ -202,8 +197,7 @@ void addListener(
 template< class Container >
 void addListenerToAllElements(
     const Container & rContainer,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::util::XModifyListener > & xListener )
+    const css::uno::Reference< css::util::XModifyListener > & xListener )
 {
     if( xListener.is())
         ::std::for_each( rContainer.begin(), rContainer.end(),
@@ -213,8 +207,7 @@ void addListenerToAllElements(
 template< class Container >
 void addListenerToAllMapElements(
     const Container & rContainer,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::util::XModifyListener > & xListener )
+    const css::uno::Reference< css::util::XModifyListener > & xListener )
 {
     if( xListener.is())
         ::std::for_each( rContainer.begin(), rContainer.end(),
@@ -223,9 +216,8 @@ void addListenerToAllMapElements(
 
 template< typename T >
 void addListenerToAllSequenceElements(
-    const ::com::sun::star::uno::Sequence< T > & rSequence,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::util::XModifyListener > & xListener )
+    const css::uno::Sequence< T > & rSequence,
+    const css::uno::Reference< css::util::XModifyListener > & xListener )
 {
     if( xListener.is())
         ::std::for_each( rSequence.getConstArray(), rSequence.getConstArray() + rSequence.getLength(),
@@ -235,8 +227,7 @@ void addListenerToAllSequenceElements(
 template< class InterfaceRef >
 void removeListener(
     const InterfaceRef & xObject,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::util::XModifyListener > & xListener )
+    const css::uno::Reference< css::util::XModifyListener > & xListener )
 {
     if( xListener.is())
     {
@@ -248,8 +239,7 @@ void removeListener(
 template< class Container >
 void removeListenerFromAllElements(
     const Container & rContainer,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::util::XModifyListener > & xListener )
+    const css::uno::Reference< css::util::XModifyListener > & xListener )
 {
     if( xListener.is())
         ::std::for_each( rContainer.begin(), rContainer.end(),
@@ -259,8 +249,7 @@ void removeListenerFromAllElements(
 template< class Container >
 void removeListenerFromAllMapElements(
     const Container & rContainer,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::util::XModifyListener > & xListener )
+    const css::uno::Reference< css::util::XModifyListener > & xListener )
 {
     if( xListener.is())
         ::std::for_each( rContainer.begin(), rContainer.end(),
@@ -269,9 +258,8 @@ void removeListenerFromAllMapElements(
 
 template< typename T >
 void removeListenerFromAllSequenceElements(
-    const ::com::sun::star::uno::Sequence< T > & rSequence,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::util::XModifyListener > & xListener )
+    const css::uno::Sequence< T > & rSequence,
+    const css::uno::Reference< css::util::XModifyListener > & xListener )
 {
     if( xListener.is())
         ::std::for_each( rSequence.getConstArray(), rSequence.getConstArray() + rSequence.getLength(),
diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx
index 72c5055051a7..b00c90a405e2 100644
--- a/chart2/source/inc/NameContainer.hxx
+++ b/chart2/source/inc/NameContainer.hxx
@@ -32,58 +32,58 @@
 namespace chart
 {
 
-OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createNameContainer(
-    const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName );
+OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::container::XNameContainer > createNameContainer(
+    const css::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName );
 
 namespace impl
 {
 typedef ::cppu::WeakImplHelper<
-        ::com::sun::star::container::XNameContainer,
-        ::com::sun::star::lang::XServiceInfo,
-        ::com::sun::star::util::XCloneable >
+        css::container::XNameContainer,
+        css::lang::XServiceInfo,
+        css::util::XCloneable >
     NameContainer_Base;
 }
 
 class NameContainer : public impl::NameContainer_Base
 {
 public:
-    NameContainer( const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName );
+    NameContainer( const css::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName );
     explicit NameContainer( const NameContainer & rOther );
     virtual ~NameContainer();
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const  OUString& aName, const  com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const  OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const  OUString& aName, const  css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeByName( const  OUString& Name ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const  OUString& aName, const  com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const  OUString& aName, const  css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
     // XNameAccess
-    virtual com::sun::star::uno::Any SAL_CALL getByName( const  OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual com::sun::star::uno::Sequence<  OUString > SAL_CALL getElementNames(  ) throw( com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const  OUString& aName ) throw( com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const  OUString& aName ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<  OUString > SAL_CALL getElementNames(  ) throw( css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasByName( const  OUString& aName ) throw( css::uno::RuntimeException, std::exception) override;
 
     // XElementAccess
-    virtual sal_Bool SAL_CALL hasElements(  ) throw( com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual com::sun::star::uno::Type SAL_CALL getElementType(  ) throw( com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) throw( css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) throw( css::uno::RuntimeException, std::exception) override;
 
     // XCloneable
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() throw (css::uno::RuntimeException, std::exception) override;
 
 private: //methods
     NameContainer();//no default constructor
 
 private: //member
-    const ::com::sun::star::uno::Type   m_aType;
+    const css::uno::Type           m_aType;
     const OUString                 m_aServicename;
     const OUString                 m_aImplementationName;
 
-    typedef ::std::map< OUString, com::sun::star::uno::Any > tContentMap;
+    typedef ::std::map< OUString, css::uno::Any > tContentMap;
 
     tContentMap m_aMap;
 };
diff --git a/chart2/source/inc/NumberFormatterWrapper.hxx b/chart2/source/inc/NumberFormatterWrapper.hxx
index d199ef7b4005..ae9c40ca67ae 100644
--- a/chart2/source/inc/NumberFormatterWrapper.hxx
+++ b/chart2/source/inc/NumberFormatterWrapper.hxx
@@ -33,28 +33,28 @@ class FixedNumberFormatter;
 class OOO_DLLPUBLIC_CHARTTOOLS NumberFormatterWrapper
 {
 public:
-    NumberFormatterWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier );
+    NumberFormatterWrapper( const css::uno::Reference< css::util::XNumberFormatsSupplier >& xSupplier );
     virtual ~NumberFormatterWrapper();
 
     SvNumberFormatter* getSvNumberFormatter() const { return m_pNumberFormatter;}
-    ::com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier >
+    css::uno::Reference< css::util::XNumberFormatsSupplier >
                 getNumberFormatsSupplier() { return m_xNumberFormatsSupplier; };
 
     OUString getFormattedString( sal_Int32 nNumberFormatKey, double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const;
     Date    getNullDate() const;
 
 private: //private member
-    ::com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier >
+    css::uno::Reference< css::util::XNumberFormatsSupplier >
                         m_xNumberFormatsSupplier;
 
     SvNumberFormatter* m_pNumberFormatter;
-    ::com::sun::star::uno::Any m_aNullDate;
+    css::uno::Any m_aNullDate;
 };
 
 class OOO_DLLPUBLIC_CHARTTOOLS FixedNumberFormatter
 {
 public:
-    FixedNumberFormatter( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier
+    FixedNumberFormatter( const css::uno::Reference< css::util::XNumberFormatsSupplier >& xSupplier
         , sal_Int32 nNumberFormatKey );
     virtual ~FixedNumberFormatter();
 
diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx
index 93aed4ba63ae..a5c7de8eb602 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -47,10 +47,10 @@ class OOO_DLLPUBLIC_CHARTTOOLS OPropertySet :
     public ::cppu::OPropertySetHelper,
     // includes uno::XWeak (and XInterface, esp. ref-counting)
 
-    public ::com::sun::star::lang::XTypeProvider,
-    public ::com::sun::star::beans::XPropertyState,
-    public ::com::sun::star::beans::XMultiPropertyStates,
-    public ::com::sun::star::style::XStyleSupplier
+    public css::lang::XTypeProvider,
+    public css::beans::XPropertyState,
+    public css::beans::XMultiPropertyStates,
+    public css::style::XStyleSupplier
 {
 public:
     OPropertySet( ::osl::Mutex & rMutex );
@@ -65,7 +65,7 @@ protected:
         supporting defaults.  If a property does not have a default value, you
         may throw an UnknownPropertyException.
      */
-    virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
         throw (css::beans::UnknownPropertyException,
                css::uno::RuntimeException) = 0;
 
@@ -104,11 +104,11 @@ protected:
         @see ::cppu::OPropertySetHelper
      */
     virtual sal_Bool SAL_CALL convertFastPropertyValue
-        ( ::com::sun::star::uno::Any & rConvertedValue,
-          ::com::sun::star::uno::Any & rOldValue,
+        ( css::uno::Any & rConvertedValue,
+          css::uno::Any & rOldValue,
           sal_Int32 nHandle,
-          const ::com::sun::star::uno::Any& rValue )
-        throw (::com::sun::star::lang::IllegalArgumentException) override;
+          const css::uno::Any& rValue )
+        throw (css::lang::IllegalArgumentException) override;
 
     /** The same as setFastProperyValue; nHandle is always valid.
         The changes must not be broadcasted in this method.
@@ -116,11 +116,11 @@ protected:
         @attention
         Although you are permitted to throw any UNO exception, only the following
         are valid for usage:
-        -- ::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
+        -- css::beans::UnknownPropertyException
+        -- css::beans::PropertyVetoException
+        -- css::lang::IllegalArgumentException
+        -- css::lang::WrappedTargetException
+        -- css::uno::RuntimeException
 
         @param nHandle handle
         @param rValue  value
@@ -129,8 +129,8 @@ protected:
     */
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast
         ( sal_Int32 nHandle,
-          const ::com::sun::star::uno::Any& rValue )
-        throw (::com::sun::star::uno::Exception, std::exception) override;
+          const css::uno::Any& rValue )
+        throw (css::uno::Exception, std::exception) override;
 
     /**
        The same as getFastProperyValue, but return the value through rValue and
@@ -139,7 +139,7 @@ protected:
         @see ::cppu::OPropertySetHelper
      */
     virtual void SAL_CALL getFastPropertyValue
-        ( ::com::sun::star::uno::Any& rValue,
+        ( css::uno::Any& rValue,
           sal_Int32 nHandle ) const override;
 
     /// make original interface function visible again
@@ -153,68 +153,68 @@ protected:
     // Interfaces
 
     // ____ XInterface ____
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XTypeProvider ____
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL
         getTypes()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL
         getImplementationId()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XPropertyState ____
-    virtual ::com::sun::star::beans::PropertyState SAL_CALL
+    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
+        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;
 
     // ____ XMultiPropertyStates ____
     // Note: getPropertyStates() is already implemented in XPropertyState with the
     // same signature
     virtual void SAL_CALL
         setAllPropertiesToDefault()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL
-        setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames )
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL
-        getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames )
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames )
+        throw (css::beans::UnknownPropertyException,
+               css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL
+        getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames )
+        throw (css::beans::UnknownPropertyException,
+               css::lang::WrappedTargetException,
+               css::uno::RuntimeException, std::exception) override;
 
     // ____ XStyleSupplier ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > SAL_CALL getStyle()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >& xStyle )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::style::XStyle > SAL_CALL getStyle()
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setStyle( const css::uno::Reference< css::style::XStyle >& xStyle )
+        throw (css::lang::IllegalArgumentException,
+               css::uno::RuntimeException, std::exception) override;
 
     // ____ XMultiPropertySet ____
     virtual void SAL_CALL setPropertyValues(
-        const ::com::sun::star::uno::Sequence< OUString >& PropertyNames,
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values )
-        throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< OUString >& PropertyNames,
+        const css::uno::Sequence< css::uno::Any >& Values )
+        throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
     // ____ XFastPropertySet ____
-    virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue )
-        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 void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue )
+        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
     // Note: it is assumed that the base class implements setPropertyValue by
     // using setFastPropertyValue
diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx
index 7b40bed8bb6b..a59c2e6b4c49 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -91,8 +91,8 @@ class OOO_DLLPUBLIC_CHARTTOOLS ObjectIdentifier
 public:
     ObjectIdentifier();
     ObjectIdentifier( const OUString& rObjectCID );
-    ObjectIdentifier( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape );
-    ObjectIdentifier( const ::com::sun::star::uno::Any& rAny );
+    ObjectIdentifier( const css::uno::Reference< css::drawing::XShape >& rxShape );
+    ObjectIdentifier( const css::uno::Any& rAny );
     virtual ~ObjectIdentifier();
 
     ObjectIdentifier( const ObjectIdentifier& rOID );
@@ -102,15 +102,12 @@ public:
     bool operator<( const ObjectIdentifier& rOID ) const;
 
     static OUString createClassifiedIdentifierForObject(
-          const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::uno::XInterface >& xObject
+          const css::uno::Reference< css::uno::XInterface >& xObject
         , ChartModel& rModel);
 
     static OUString createClassifiedIdentifierForObject(
-          const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::uno::XInterface >& xObject
-        , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::frame::XModel >& xChartModel );
+          const css::uno::Reference< css::uno::XInterface >& xObject
+        , const css::uno::Reference< css::frame::XModel >& xChartModel );
 
     static OUString createClassifiedIdentifierForParticle(
         const OUString& rParticle );
@@ -122,33 +119,25 @@ public:
           , const OUString& rDragParameterString = OUString() );
 
     static OUString createClassifiedIdentifierForGrid(
-          const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XAxis >& xAxis
-        , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::frame::XModel >& xChartModel
+          const css::uno::Reference< css::chart2::XAxis >& xAxis
+        , const css::uno::Reference< css::frame::XModel >& xChartModel
         , sal_Int32 nSubIndex = -1 );//-1: main grid, 0: first subgrid etc
 
     SAL_DLLPRIVATE static OUString createParticleForDiagram(
-          const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XDiagram >& xDiagram
+          const css::uno::Reference< css::chart2::XDiagram >& xDiagram
         , ChartModel& rModel);
 
     SAL_DLLPRIVATE static OUString createParticleForDiagram(
-          const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XDiagram >& xDiagram
-        , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::frame::XModel >& xChartModel );
+          const css::uno::Reference< css::chart2::XDiagram >& xDiagram
+        , const css::uno::Reference< css::frame::XModel >& xChartModel );
 
     static OUString createParticleForCoordinateSystem(
-          const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XCoordinateSystem >& xCooSys
+          const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys
         , ChartModel& rModel );
 
     static OUString createParticleForCoordinateSystem(
-          const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XCoordinateSystem >& xCooSys
-        , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::frame::XModel >& xChartModel );
+          const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys
+        , const css::uno::Reference< css::frame::XModel >& xChartModel );
 
     static OUString createParticleForAxis(
                       sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
@@ -160,15 +149,12 @@ public:
             , sal_Int32 nChartTypeIndex, sal_Int32 nSeriesIndex );
 
     static OUString createParticleForLegend(
-          const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XLegend >& xLegend
+          const css::uno::Reference< css::chart2::XLegend >& xLegend
         , ChartModel& rModel );
 
     static OUString createParticleForLegend(
-          const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XLegend >& xLegend
-        , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::frame::XModel >& xChartModel );
+          const css::uno::Reference< css::chart2::XLegend >& xLegend
+        , const css::uno::Reference< css::frame::XModel >& xChartModel );
 
     static OUString addChildParticle( const OUString& rParticle, const OUString& rChildParticle );
     static OUString createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex );
@@ -217,46 +203,41 @@ public:
     static OUString getSeriesParticleFromCID( const OUString& rCID );
 
     //return the model object that is indicated by rObjectCID
-    static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
+    static css::uno::Reference< css::beans::XPropertySet >
             getObjectPropertySet(
                   const OUString& rObjectCID
-                , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::frame::XModel >& xChartModel );
-    static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
+                , const css::uno::Reference< css::frame::XModel >& xChartModel );
+    static css::uno::Reference< css::beans::XPropertySet >
             getObjectPropertySet(
                   const OUString& rObjectCID
-                , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XChartDocument >& xChartDocument );
+                , const css::uno::Reference< css::chart2::XChartDocument >& xChartDocument );
 
     //return the axis object that belongs to rObjectCID if any
-    static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >
+    static css::uno::Reference< css::chart2::XAxis >
             getAxisForCID(
                   const OUString& rObjectCID
-                , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::frame::XModel >& xChartModel );
+                , const css::uno::Reference< css::frame::XModel >& xChartModel );
 
     //return the series object that belongs to rObjectCID if any
-    static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >
+    static css::uno::Reference< css::chart2::XDataSeries >
             getDataSeriesForCID(
                   const OUString& rObjectCID
-                , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::frame::XModel >& xChartModel );
+                , const css::uno::Reference< css::frame::XModel >& xChartModel );
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >
+    static css::uno::Reference< css::chart2::XDiagram >
             getDiagramForCID(
                   const OUString& rObjectCID
-                , const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::frame::XModel >& xChartModel );
+                , const css::uno::Reference< css::frame::XModel >& xChartModel );
 
     static const OUString& getPieSegmentDragMethodServiceName();
     static OUString createPieSegmentDragParameterString(
           sal_Int32 nOffsetPercent
-        , const ::com::sun::star::awt::Point& rMinimumPosition
-        , const ::com::sun::star::awt::Point& rMaximumPosition );
+        , const css::awt::Point& rMinimumPosition
+        , const css::awt::Point& rMaximumPosition );
     static bool parsePieSegmentDragParameterString( const OUString& rDragParameterString
         , sal_Int32& rOffsetPercent
-        , ::com::sun::star::awt::Point& rMinimumPosition
-        , ::com::sun::star::awt::Point& rMaximumPosition );
+        , css::awt::Point& rMinimumPosition
+        , css::awt::Point& rMaximumPosition );
 
     static TitleHelper::eTitleType getTitleTypeForCID( const OUString& rCID );
 
@@ -266,8 +247,8 @@ public:
     bool isAutoGeneratedObject() const;
     bool isAdditionalShape() const;
     OUString getObjectCID() const { return m_aObjectCID;}
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getAdditionalShape() const { return m_xAdditionalShape;}
-    ::com::sun::star::uno::Any getAny() const;
+    css::uno::Reference< css::drawing::XShape > getAdditionalShape() const { return m_xAdditionalShape;}
+    css::uno::Any getAny() const;
 
 private:
     // #i12587# support for shapes in chart
@@ -276,7 +257,7 @@ private:
     // Note, that if m_aObjectCID is set, m_xAdditionalShape must be empty
     // and vice versa.
     OUString m_aObjectCID;
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xAdditionalShape;
+    css::uno::Reference< css::drawing::XShape > m_xAdditionalShape;
 };
 
 } //namespace chart
diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx
index 5e82292d2762..565778777f1c 100644
--- a/chart2/source/inc/PropertyHelper.hxx
+++ b/chart2/source/inc/PropertyHelper.hxx
@@ -46,9 +46,8 @@ namespace PropertyHelper
     @return The name used for storing this element in the table
 */
 OOO_DLLPUBLIC_CHARTTOOLS OUString addLineDashUniqueNameToTable(
-    const ::com::sun::star::uno::Any & rValue,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::lang::XMultiServiceFactory > & xFact,
+    const css::uno::Any & rValue,
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact,
     const OUString & rPreferredName );
 
 /** adds a gradient with a unique name to the gradient obtained by the given
@@ -57,9 +56,8 @@ OOO_DLLPUBLIC_CHARTTOOLS OUString addLineDashUniqueNameToTable(
     @return The name used for storing this element in the table
 */
 OOO_DLLPUBLIC_CHARTTOOLS OUString addGradientUniqueNameToTable(
-    const ::com::sun::star::uno::Any & rValue,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::lang::XMultiServiceFactory > & xFact,
+    const css::uno::Any & rValue,
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact,
     const OUString & rPreferredName );
 
 /** adds a transparency gradient with a unique name to the gradient obtained
@@ -69,9 +67,8 @@ OOO_DLLPUBLIC_CHARTTOOLS OUString addGradientUniqueNameToTable(
 */
 OOO_DLLPUBLIC_CHARTTOOLS
 OUString addTransparencyGradientUniqueNameToTable(
-    const ::com::sun::star::uno::Any & rValue,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::lang::XMultiServiceFactory > & xFact,
+    const css::uno::Any & rValue,
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact,
     const OUString & rPreferredName );
 
 /** adds a hatch with a unique name to the gradient obtained by the given
@@ -80,9 +77,8 @@ OUString addTransparencyGradientUniqueNameToTable(
     @return The name used for storing this element in the table
 */
 OOO_DLLPUBLIC_CHARTTOOLS OUString addHatchUniqueNameToTable(
-    const ::com::sun::star::uno::Any & rValue,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::lang::XMultiServiceFactory > & xFact,
+    const css::uno::Any & rValue,
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact,
     const OUString & rPreferredName );
 
 /** adds a bitmap with a unique name to the gradient obtained by the given
@@ -91,9 +87,8 @@ OOO_DLLPUBLIC_CHARTTOOLS OUString addHatchUniqueNameToTable(
     @return The name used for storing this element in the table
 */
 OOO_DLLPUBLIC_CHARTTOOLS OUString addBitmapUniqueNameToTable(
-    const ::com::sun::star::uno::Any & rValue,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::lang::XMultiServiceFactory > & xFact,
+    const css::uno::Any & rValue,
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact,
     const OUString & rPreferredName );
 
 /** Set a property to a certain value in the given map.  This works for
@@ -103,7 +98,7 @@ OOO_DLLPUBLIC_CHARTTOOLS OUString addBitmapUniqueNameToTable(
  */
 OOO_DLLPUBLIC_CHARTTOOLS
 void setPropertyValueAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key,
-                          const ::com::sun::star::uno::Any & rAny );
+                          const css::uno::Any & rAny );
 
 /** Set a property to a certain value in the given map.  This works for
     properties that are already set, and those which are not yet in the map.
@@ -114,13 +109,13 @@ void setPropertyValueAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key,
 template< typename Value >
     void setPropertyValue( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const Value & value )
 {
-    setPropertyValueAny( rOutMap, key, ::com::sun::star::uno::makeAny( value ));
+    setPropertyValueAny( rOutMap, key, css::uno::makeAny( value ));
 }
 
 template<>
-    void setPropertyValue< ::com::sun::star::uno::Any >( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const ::com::sun::star::uno::Any & rAny );
+    void setPropertyValue< css::uno::Any >( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const css::uno::Any & rAny );
 
-OOO_DLLPUBLIC_CHARTTOOLS void setPropertyValueDefaultAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const ::com::sun::star::uno::Any & rAny );
+OOO_DLLPUBLIC_CHARTTOOLS void setPropertyValueDefaultAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const css::uno::Any & rAny );
 
 /** Calls setPropertyValue() but asserts that the given property hasn't been set
     before.
@@ -128,14 +123,14 @@ OOO_DLLPUBLIC_CHARTTOOLS void setPropertyValueDefaultAny( tPropertyValueMap & rO
 template< typename Value >
     void setPropertyValueDefault( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const Value & value )
 {
-    setPropertyValueDefaultAny( rOutMap, key, ::com::sun::star::uno::makeAny( value ));
+    setPropertyValueDefaultAny( rOutMap, key, css::uno::makeAny( value ));
 }
 
 /** Calls setPropertyValue() but asserts that the given property hasn't been set
     before.
  */
 template<>
-    void setPropertyValueDefault< ::com::sun::star::uno::Any >( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const ::com::sun::star::uno::Any & rAny );
+    void setPropertyValueDefault< css::uno::Any >( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const css::uno::Any & rAny );
 
 /** Calls setPropertyValueDefault() with an empty Any as value
  */
@@ -145,8 +140,8 @@ OOO_DLLPUBLIC_CHARTTOOLS void setEmptyPropertyValueDefault( tPropertyValueMap &
 
 struct OOO_DLLPUBLIC_CHARTTOOLS PropertyNameLess
 {
-    inline bool operator() ( const ::com::sun::star::beans::Property & first,
-                             const ::com::sun::star::beans::Property & second )
+    inline bool operator() ( const css::beans::Property & first,
+                             const css::beans::Property & second )
     {
         return ( first.Name.compareTo( second.Name ) < 0 );
     }
diff --git a/chart2/source/inc/RangeHighlighter.hxx b/chart2/source/inc/RangeHighlighter.hxx
index 798484ff47d4..2fe6291ece72 100644
--- a/chart2/source/inc/RangeHighlighter.hxx
+++ b/chart2/source/inc/RangeHighlighter.hxx
@@ -38,8 +38,8 @@ namespace chart
 namespace impl
 {
 typedef ::cppu::WeakComponentImplHelper<
-        ::com::sun::star::chart2::data::XRangeHighlighter,
-        ::com::sun::star::view::XSelectionChangeListener
+        css::chart2::data::XRangeHighlighter,
+        css::view::XSelectionChangeListener
     >
     RangeHighlighter_Base;
 }
@@ -50,30 +50,29 @@ class RangeHighlighter :
 {
 public:
     explicit RangeHighlighter(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::view::XSelectionSupplier > & xSelectionSupplier );
+        const css::uno::Reference< css::view::XSelectionSupplier > & xSelectionSupplier );
     virtual ~RangeHighlighter();
 
 protected:
     // ____ XRangeHighlighter ____
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::data::HighlightedRange > SAL_CALL getSelectedRanges()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::chart2::data::HighlightedRange > SAL_CALL getSelectedRanges()
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL addSelectionChangeListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::view::XSelectionChangeListener >& xListener )
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL removeSelectionChangeListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::view::XSelectionChangeListener >& xListener )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XSelectionChangeListener ____
     virtual void SAL_CALL selectionChanged(
-        const ::com::sun::star::lang::EventObject& aEvent )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XEventListener (base of XSelectionChangeListener) ____
     virtual void SAL_CALL disposing(
-        const ::com::sun::star::lang::EventObject& Source )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ WeakComponentImplHelperBase ____
     // is called when dispose() is called at this component
@@ -85,18 +84,18 @@ private:
     void stopListening();
     void determineRanges();
 
-    void fillRangesForDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram );
-    void fillRangesForDataSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries );
-    void fillRangesForCategories( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > & xAxis );
-    void fillRangesForDataPoint( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xDataSeries, sal_Int32 nIndex );
-    void fillRangesForErrorBars( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xErrorBar,
-                                 const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xDataSeries );
+    void fillRangesForDiagram( const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
+    void fillRangesForDataSeries( const css::uno::Reference< css::chart2::XDataSeries > & xSeries );
+    void fillRangesForCategories( const css::uno::Reference< css::chart2::XAxis > & xAxis );
+    void fillRangesForDataPoint( const css::uno::Reference< css::uno::XInterface > & xDataSeries, sal_Int32 nIndex );
+    void fillRangesForErrorBars( const css::uno::Reference< css::beans::XPropertySet > & xErrorBar,
+                                 const css::uno::Reference< css::chart2::XDataSeries > & xDataSeries );
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier >
+    css::uno::Reference< css::view::XSelectionSupplier >
         m_xSelectionSupplier;
-    ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >
+    css::uno::Reference< css::view::XSelectionChangeListener >
         m_xListener;
-    ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::data::HighlightedRange >
+    css::uno::Sequence< css::chart2::data::HighlightedRange >
         m_aSelectedRanges;
     sal_Int32 m_nAddedListenerCount;
     bool m_bIncludeHiddenCells;
diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx b/chart2/source/inc/ReferenceSizeProvider.hxx
index 9c15afd3ad69..02dac03b273e 100644
--- a/chart2/source/inc/ReferenceSizeProvider.hxx
+++ b/chart2/source/inc/ReferenceSizeProvider.hxx
@@ -47,11 +47,10 @@ public:
     };
 
     ReferenceSizeProvider(
-        ::com::sun::star::awt::Size aPageSize,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartDocument > & xChartDoc );
+        css::awt::Size aPageSize,
+        const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc );
 
-    ::com::sun::star::awt::Size getPageSize() const { return m_aPageSize;}
+    css::awt::Size getPageSize() const { return m_aPageSize;}
 
     /** Retrieves the state auto-resize from all objects that support this
         feature.  If all objects return the same state, AUTO_RESIZE_YES or
@@ -62,8 +61,7 @@ public:
         with state NO, AUTO_RESIZE_AMBIGUOUS is returned.
     */
     static AutoResizeState getAutoResizeState(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartDocument > & xChartDoc );
+        const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc );
 
     /** sets or resets the auto-resize at all objects that support this feature
         for text to the opposite of the current setting.  If the current state
@@ -77,8 +75,7 @@ public:
         is </sal_True>.
      */
     SAL_DLLPRIVATE void setValuesAtPropertySet(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet > & xProp,
+        const css::uno::Reference< css::beans::XPropertySet > & xProp,
         bool bAdaptFontSizes = true );
 
     /** Sets the ReferencePageSize according to the internal settings of this
@@ -86,8 +83,7 @@ public:
         XFormattedStrings
      */
     SAL_DLLPRIVATE void setValuesAtTitle(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XTitle > & xTitle );
+        const css::uno::Reference< css::chart2::XTitle > & xTitle );
 
     /** Sets the internal value at all data series in the currently set model.
         This is useful, if you have changed a chart-type and thus probably added
@@ -111,21 +107,17 @@ private:
         the current property set, or the other way round.
      */
     SAL_DLLPRIVATE static void getAutoResizeFromPropSet(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet > & xProp,
+        const css::uno::Reference< css::beans::XPropertySet > & xProp,
         AutoResizeState & rInOutState );
 
     SAL_DLLPRIVATE void impl_setValuesAtTitled(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XTitled > & xTitled );
+        const css::uno::Reference< css::chart2::XTitled > & xTitled );
     SAL_DLLPRIVATE static void impl_getAutoResizeFromTitled(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XTitled > & xTitled,
+        const css::uno::Reference< css::chart2::XTitled > & xTitled,
         AutoResizeState & rInOutState );
 
-    ::com::sun::star::awt::Size m_aPageSize;
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartDocument > m_xChartDoc;
+    css::awt::Size m_aPageSize;
+    css::uno::Reference< css::chart2::XChartDocument > m_xChartDoc;
     bool      m_bUseAutoScale;
 };
 
diff --git a/chart2/source/inc/RegressionCalculationHelper.hxx b/chart2/source/inc/RegressionCalculationHelper.hxx
index 8c886877f6c5..87dd524d3f17 100644
--- a/chart2/source/inc/RegressionCalculationHelper.hxx
+++ b/chart2/source/inc/RegressionCalculationHelper.hxx
@@ -42,8 +42,8 @@ typedef ::std::pair< ::std::vector< double >, ::std::vector< double > > tDoubleV
  */
 template< class Pred >
 tDoubleVectorPair
-    cleanup( const ::com::sun::star::uno::Sequence< double > & rXValues,
-             const ::com::sun::star::uno::Sequence< double > & rYValues,
+    cleanup( const css::uno::Sequence< double > & rXValues,
+             const css::uno::Sequence< double > & rYValues,
              Pred aPred )
 {
     tDoubleVectorPair aResult;
diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx
index 7a58ffbb43e8..afd0164e15fc 100644
--- a/chart2/source/inc/RegressionCurveCalculator.hxx
+++ b/chart2/source/inc/RegressionCurveCalculator.hxx
@@ -28,25 +28,25 @@ namespace chart
 {
 
 class RegressionCurveCalculator : public
-    cppu::WeakImplHelper< com::sun::star::chart2::XRegressionCurveCalculator >
+    cppu::WeakImplHelper< css::chart2::XRegressionCurveCalculator >
 {
 public:
     RegressionCurveCalculator();
     virtual ~RegressionCurveCalculator();
 
     static bool isLinearScaling(
-        const com::sun::star::uno::Reference< com::sun::star::chart2::XScaling >& xScaling );
+        const css::uno::Reference< css::chart2::XScaling >& xScaling );
 
     static bool isLogarithmicScaling(
-        const com::sun::star::uno::Reference< com::sun::star::chart2::XScaling >& xScaling );
+        const css::uno::Reference< css::chart2::XScaling >& xScaling );
 
 protected:
     virtual OUString ImplGetRepresentation(
-        const com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatter >& xNumFormatter,
+        const css::uno::Reference< css::util::XNumberFormatter >& xNumFormatter,
         sal_Int32 nNumberFormatKey ) const = 0;
 
     static OUString getFormattedString(
-        const com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatter >& xNumFormatter,
+        const css::uno::Reference< css::util::XNumberFormatter >& xNumFormatter,
         sal_Int32 nNumberFormatKey,
         double fNumber );
 
@@ -63,37 +63,37 @@ protected:
         sal_Bool  aForceIntercept,
         double    aInterceptValue,
         sal_Int32 aPeriod)
-            throw (com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL recalculateRegression(
-        const com::sun::star::uno::Sequence< double >& aXValues,
-        const com::sun::star::uno::Sequence< double >& aYValues )
-        throw (com::sun::star::uno::RuntimeException, std::exception) override = 0;
+        const css::uno::Sequence< double >& aXValues,
+        const css::uno::Sequence< double >& aYValues )
+        throw (css::uno::RuntimeException, std::exception) override = 0;
 
     virtual double SAL_CALL getCurveValue( double x )
-        throw (com::sun::star::lang::IllegalArgumentException,
-               com::sun::star::uno::RuntimeException, std::exception) override = 0;
+        throw (css::lang::IllegalArgumentException,
+               css::uno::RuntimeException, std::exception) override = 0;
 
-    virtual com::sun::star::uno::Sequence< com::sun::star::geometry::RealPoint2D > SAL_CALL getCurveValues(
+    virtual css::uno::Sequence< css::geometry::RealPoint2D > SAL_CALL getCurveValues(
         double min,
         double max,
         sal_Int32 nPointCount,
-        const com::sun::star::uno::Reference< com::sun::star::chart2::XScaling >& xScalingX,
-        const com::sun::star::uno::Reference< com::sun::star::chart2::XScaling >& xScalingY,
+        const css::uno::Reference< css::chart2::XScaling >& xScalingX,
+        const css::uno::Reference< css::chart2::XScaling >& xScalingY,
         sal_Bool bMaySkipPointsInCalculation )
-        throw (com::sun::star::lang::IllegalArgumentException,
-               com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::IllegalArgumentException,
+               css::uno::RuntimeException, std::exception) override;
 
     virtual double SAL_CALL getCorrelationCoefficient()
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     virtual OUString SAL_CALL getRepresentation()
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     virtual OUString SAL_CALL getFormattedRepresentation(
-        const com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier >& xNumFmtSupplier,
+        const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumFmtSupplier,
         sal_Int32 nNumberFormatKey )
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx
index 45408c37b676..a00738ad30a9 100644
--- a/chart2/source/inc/RegressionCurveHelper.hxx
+++ b/chart2/source/inc/RegressionCurveHelper.hxx
@@ -73,7 +73,7 @@ namespace RegressionCurveHelper
     /** Returns the first regression curve found that is not of type
         mean-value line
      */
-    OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference<com::sun::star::chart2::XRegressionCurve>
+    OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference<css::chart2::XRegressionCurve>
         getFirstCurveNotMeanValueLine(
             const css::uno::Reference<css::chart2::XRegressionCurveContainer>& xCurveContainer );
 
diff --git a/chart2/source/inc/RelativePositionHelper.hxx b/chart2/source/inc/RelativePositionHelper.hxx
index 4416abc2c114..f97e5eb49d4b 100644
--- a/chart2/source/inc/RelativePositionHelper.hxx
+++ b/chart2/source/inc/RelativePositionHelper.hxx
@@ -41,33 +41,33 @@ public:
         ( e.g. if aAnchor equals BOTTOM_LEFT, aPoint describes the
         coordinates of the bottom left corner of an object with size aObjectSize )
      */
-    static ::com::sun::star::awt::Point
+    static css::awt::Point
         getUpperLeftCornerOfAnchoredObject(
-            ::com::sun::star::awt::Point aPoint,
-            ::com::sun::star::awt::Size aObjectSize,
-            ::com::sun::star::drawing::Alignment aAnchor );
+            css::awt::Point aPoint,
+            css::awt::Size aObjectSize,
+            css::drawing::Alignment aAnchor );
 
     /** returns the center of an object that has size aObjectSize and
         where the point indicated by aAnchor has coordinates indicated by aPoint
         ( e.g. if aAnchor equals BOTTOM_LEFT, aPoint describes the
         coordinates of the bottom left corner of an object with size aObjectSize )
      */
-    static ::com::sun::star::awt::Point
+    static css::awt::Point
         getCenterOfAnchoredObject(
-            ::com::sun::star::awt::Point aPoint,
-            ::com::sun::star::awt::Size aUnrotatedObjectSize,
-            ::com::sun::star::drawing::Alignment aAnchor,
+            css::awt::Point aPoint,
+            css::awt::Size aUnrotatedObjectSize,
+            css::drawing::Alignment aAnchor,
             double fAnglePi );
 
     /** Returns a relative position that is the same point after the anchor has
         been changed to the given one.  The passed object size is taken into
         account for shifting the position.
      */
-    SAL_DLLPRIVATE static ::com::sun::star::chart2::RelativePosition
+    SAL_DLLPRIVATE static css::chart2::RelativePosition
         getReanchoredPosition(
-            const ::com::sun::star::chart2::RelativePosition & rPosition,
-            const ::com::sun::star::chart2::RelativeSize & rObjectSize,
-            ::com::sun::star::drawing::Alignment aNewAnchor );
+            const css::chart2::RelativePosition & rPosition,
+            const css::chart2::RelativeSize & rObjectSize,
+            css::drawing::Alignment aNewAnchor );
 
     /** grows a relative size about the given amount and shifts the given
         position such that the resize is relative to the former rectangle's
@@ -82,8 +82,8 @@ public:
         not change at all.</p>
      */
     static bool centerGrow(
-        ::com::sun::star::chart2::RelativePosition & rInOutPosition,
-        ::com::sun::star::chart2::RelativeSize & rInOutSize,
+        css::chart2::RelativePosition & rInOutPosition,
+        css::chart2::RelativeSize & rInOutSize,
         double fAmountX, double fAmountY );
 
     /** shifts a relative position about the given amount
@@ -96,8 +96,8 @@ public:
         @return </sal_True>, if changes were applied.
      */
     static bool moveObject(
-        ::com::sun::star::chart2::RelativePosition & rInOutPosition,
-        const ::com::sun::star::chart2::RelativeSize & rObjectSize,
+        css::chart2::RelativePosition & rInOutPosition,
+        const css::chart2::RelativeSize & rObjectSize,
         double fAmountX, double fAmountY );
 };
 
diff --git a/chart2/source/inc/RelativeSizeHelper.hxx b/chart2/source/inc/RelativeSizeHelper.hxx
index dfc2df420c10..0bb50bcac168 100644
--- a/chart2/source/inc/RelativeSizeHelper.hxx
+++ b/chart2/source/inc/RelativeSizeHelper.hxx
@@ -31,14 +31,14 @@ class OOO_DLLPUBLIC_CHARTTOOLS RelativeSizeHelper
 public:
     static double calculate(
         double fValue,
-        const ::com::sun::star::awt::Size & rOldReferenceSize,
-        const ::com::sun::star::awt::Size & rNewReferenceSize );
+        const css::awt::Size & rOldReferenceSize,
+        const css::awt::Size & rNewReferenceSize );
 
     static void adaptFontSizes(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet > & xTargetProperties,
-        const ::com::sun::star::awt::Size & rOldReferenceSize,
-        const ::com::sun::star::awt::Size & rNewReferenceSize );
+        const css::uno::Reference<
+            css::beans::XPropertySet > & xTargetProperties,
+        const css::awt::Size & rOldReferenceSize,
+        const css::awt::Size & rNewReferenceSize );
 
 private:
     RelativeSizeHelper() = delete;
diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx
index 17ebec6c14f2..690ac3f6e103 100644
--- a/chart2/source/inc/Scaling.hxx
+++ b/chart2/source/inc/Scaling.hxx
@@ -33,9 +33,9 @@ namespace chart
 
 class LogarithmicScaling :
         public ::cppu::WeakImplHelper<
-        ::com::sun::star::chart2::XScaling,
-        ::com::sun::star::lang::XServiceName,
-        ::com::sun::star::lang::XServiceInfo
+        css::chart2::XScaling,
+        css::lang::XServiceName,
+        css::lang::XServiceInfo
         >
 {
 public:
@@ -57,15 +57,15 @@ public:
 
     // ____ XScaling ____
     virtual double SAL_CALL doScaling( double value )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XScaling > SAL_CALL
-        getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<
+        css::chart2::XScaling > SAL_CALL
+        getInverseScaling() throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XServiceName ____
     virtual OUString SAL_CALL getServiceName()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
 private:
     const double m_fBase;
@@ -74,9 +74,9 @@ private:
 
 class ExponentialScaling :
         public ::cppu::WeakImplHelper<
-        ::com::sun::star::chart2::XScaling,
-        ::com::sun::star::lang::XServiceName,
-        ::com::sun::star::lang::XServiceInfo
+        css::chart2::XScaling,
+        css::lang::XServiceName,
+        css::lang::XServiceInfo
         >
 {
 public:
@@ -97,26 +97,25 @@ public:
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
     // ____ XScaling ____
-        virtual double SAL_CALL
+    virtual double SAL_CALL
     doScaling( double value )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
-        virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XScaling > SAL_CALL
-    getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL
+    getInverseScaling() throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XServiceName ____
     virtual OUString SAL_CALL getServiceName()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
 private:
     const double m_fBase;
 };
 
 class LinearScaling : public ::cppu::WeakImplHelper<
-        ::com::sun::star::chart2::XScaling,
-        ::com::sun::star::lang::XServiceName,
-        ::com::sun::star::lang::XServiceInfo
+        css::chart2::XScaling,
+        css::lang::XServiceName,
+        css::lang::XServiceInfo
         >
 {
 public:
@@ -139,15 +138,14 @@ public:
 
     // ____ XScaling ____
     virtual double SAL_CALL doScaling( double value )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XScaling > SAL_CALL
-        getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL
+        getInverseScaling() throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XServiceName ____
     virtual OUString SAL_CALL getServiceName()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
 private:
     const double m_fSlope;
@@ -155,9 +153,9 @@ private:
 };
 
 class PowerScaling : public ::cppu::WeakImplHelper<
-        ::com::sun::star::chart2::XScaling,
-        ::com::sun::star::lang::XServiceName,
-        ::com::sun::star::lang::XServiceInfo
+        css::chart2::XScaling,
+        css::lang::XServiceName,
+        css::lang::XServiceInfo
         >
 {
 public:
@@ -180,15 +178,14 @@ public:
     // ____ XScaling ____
         virtual double SAL_CALL
     doScaling( double value )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
-        virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XScaling > SAL_CALL
-    getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+     virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL
+    getInverseScaling() throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XServiceName ____
     virtual OUString SAL_CALL getServiceName()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
 private:
     const double m_fExponent;
diff --git a/chart2/source/inc/SceneProperties.hxx b/chart2/source/inc/SceneProperties.hxx
index 982cc06ad521..e1176720364a 100644
--- a/chart2/source/inc/SceneProperties.hxx
+++ b/chart2/source/inc/SceneProperties.hxx
@@ -72,7 +72,7 @@ namespace SceneProperties
     };
 
     OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector(
-        ::std::vector< ::com::sun::star::beans::Property > & rOutProperties );
+        ::std::vector< css::beans::Property > & rOutProperties );
 
     OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap );
 }
diff --git a/chart2/source/inc/StatisticsHelper.hxx b/chart2/source/inc/StatisticsHelper.hxx
index 7d9aeaf7f1f9..675f478f9b02 100644
--- a/chart2/source/inc/StatisticsHelper.hxx
+++ b/chart2/source/inc/StatisticsHelper.hxx
@@ -35,78 +35,63 @@ namespace StatisticsHelper
 
         @see http://mathworld.wolfram.com/Variance.html
      */
-    OOO_DLLPUBLIC_CHARTTOOLS double getVariance( const ::com::sun::star::uno::Sequence< double > & rData );
+    OOO_DLLPUBLIC_CHARTTOOLS double getVariance( const css::uno::Sequence< double > & rData );
 
     // square root of the variance
-    OOO_DLLPUBLIC_CHARTTOOLS double getStandardDeviation( const ::com::sun::star::uno::Sequence< double > & rData );
+    OOO_DLLPUBLIC_CHARTTOOLS double getStandardDeviation( const css::uno::Sequence< double > & rData );
 
     // also called "Standard deviation of the mean (SDOM)"
-    OOO_DLLPUBLIC_CHARTTOOLS double getStandardError( const ::com::sun::star::uno::Sequence< double > & rData );
+    OOO_DLLPUBLIC_CHARTTOOLS double getStandardError( const css::uno::Sequence< double > & rData );
 
-    OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::data::XLabeledDataSequence >
+    OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::chart2::data::XLabeledDataSequence >
         getErrorLabeledDataSequenceFromDataSource(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::data::XDataSource > & xDataSource,
+            const css::uno::Reference< css::chart2::data::XDataSource > & xDataSource,
             bool bPositiveValue,
             bool bYError = true );
 
-    OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::data::XDataSequence >
+    OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::chart2::data::XDataSequence >
         getErrorDataSequenceFromDataSource(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::data::XDataSource > & xDataSource,
+            const css::uno::Reference< css::chart2::data::XDataSource > & xDataSource,
             bool bPositiveValue,
             bool bYError = true );
 
     OOO_DLLPUBLIC_CHARTTOOLS double getErrorFromDataSource(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::data::XDataSource > & xDataSource,
+        const css::uno::Reference< css::chart2::data::XDataSource > & xDataSource,
         sal_Int32 nIndex,
         bool bPositiveValue,
         bool bYError = true );
 
     OOO_DLLPUBLIC_CHARTTOOLS void setErrorDataSequence(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::data::XDataSource > & xDataSource,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::data::XDataProvider > & xDataProvider,
+        const css::uno::Reference< css::chart2::data::XDataSource > & xDataSource,
+        const css::uno::Reference< css::chart2::data::XDataProvider > & xDataProvider,
         const OUString & rNewRange,
         bool bPositiveValue,
         bool bYError = true,
         OUString * pXMLRange = nullptr );
 
     /// @return the newly created or existing error bar object
-    OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet >
+    OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::beans::XPropertySet >
         addErrorBars(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDataSeries > & xDataSeries,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::uno::XComponentContext > & xContext,
+            const css::uno::Reference< css::chart2::XDataSeries > & xDataSeries,
+            const css::uno::Reference< css::uno::XComponentContext > & xContext,
             sal_Int32 nStyle,
             bool bYError = true );
 
-    OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet >
+    OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::beans::XPropertySet >
         getErrorBars(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDataSeries > & xDataSeries,
+            const css::uno::Reference< css::chart2::XDataSeries > & xDataSeries,
             bool bYError = true );
 
     OOO_DLLPUBLIC_CHARTTOOLS bool hasErrorBars(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDataSeries > & xDataSeries,
+        const css::uno::Reference< css::chart2::XDataSeries > & xDataSeries,
         bool bYError = true );
 
     OOO_DLLPUBLIC_CHARTTOOLS void removeErrorBars(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDataSeries > & xDataSeries,
+        const css::uno::Reference< css::chart2::XDataSeries > & xDataSeries,
         bool bYError = true );
 
     OOO_DLLPUBLIC_CHARTTOOLS bool usesErrorBarRanges(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDataSeries > & xDataSeries,
+        const css::uno::Reference< css::chart2::XDataSeries > & xDataSeries,
         bool bYError = true );
 }
 
diff --git a/chart2/source/inc/ThreeDHelper.hxx b/chart2/source/inc/ThreeDHelper.hxx
index 024466cc2083..90ac23a3acfc 100644
--- a/chart2/source/inc/ThreeDHelper.hxx
+++ b/chart2/source/inc/ThreeDHelper.hxx
@@ -58,28 +58,23 @@ public:
         @todo deprecate the hard set camera geometry and use the property
               default
      */
-    static ::com::sun::star::drawing::CameraGeometry getDefaultCameraGeometry( bool bPie=false );
+    static css::drawing::CameraGeometry getDefaultCameraGeometry( bool bPie=false );
 
     static void getRotationAngleFromDiagram(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet >& xSceneProperties
+        const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties
             , double& rfXAngleRad, double& rfYAngleRad, double& rfZAngleRad );
     static void setRotationAngleToDiagram(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet >& xSceneProperties
+        const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties
             , double fXAngleRad, double fYAngleRad, double fZAngleRad );
 
     static void getRotationFromDiagram(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet >& xSceneProperties
+        const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties
             , sal_Int32& rnHorizontalAngleDegree, sal_Int32& rnVerticalAngleDegree );
     static void setRotationToDiagram(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet >& xSceneProperties
+        const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties
             , sal_Int32 nHorizontalAngleDegree, sal_Int32 nVerticalYAngleDegree );
 
-    static void switchRightAngledAxes( const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet >& xSceneProperties
+    static void switchRightAngledAxes( const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties
             , bool bRightAngledAxes );
 
     static void adaptRadAnglesForRightAngledAxes( double& rfXAngleRad, double& rfYAngleRad );
@@ -97,11 +92,9 @@ public:
         , double fXRad, double fYRad, double fZRad );
 
     static double getCameraDistance(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet >& xSceneProperties );
+        const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties );
     static void setCameraDistance(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet >& xSceneProperties
+        const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties
             , double fCameraDistance );
     SAL_DLLPRIVATE static void ensureCameraDistanceRange( double& rfCameraDistance );
     SAL_DLLPRIVATE static void getCameraDistanceRange( double& rfMinimumDistance, double& rfMaximumDistance );
@@ -109,37 +102,29 @@ public:
     static double CameraDistanceToPerspective( double fCameraDistance );
     static double PerspectiveToCameraDistance( double fPerspective );
 
-    static void set3DSettingsToDefault( const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet >& xSceneProperties );
-    static void setDefaultRotation( const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet >& xSceneProperties );
-    static void setDefaultIllumination( const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet >& xSceneProperties );
-
-    static void setDefaultRotation( const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet >& xSceneProperties, bool bPieOrDonut );
-
-    static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardLeftWall( const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet >& xSceneProperties );
-    static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardBackWall(const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet >& xSceneProperties );
-    static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardBottom(const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet >& xSceneProperties );
-
-    static ThreeDLookScheme detectScheme( const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram >& xDiagram );
-    static void setScheme( const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram >& xDiagram
+    static void set3DSettingsToDefault( const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties );
+    static void setDefaultRotation( const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties );
+    static void setDefaultIllumination( const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties );
+
+    static void setDefaultRotation( const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties, bool bPieOrDonut );
+
+    static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardLeftWall( const css::uno::Reference<
+            css::beans::XPropertySet >& xSceneProperties );
+    static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardBackWall(const css::uno::Reference<
+            css::beans::XPropertySet >& xSceneProperties );
+    static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardBottom(const css::uno::Reference<
+            css::beans::XPropertySet >& xSceneProperties );
+
+    static ThreeDLookScheme detectScheme( const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
+    static void setScheme( const css::uno::Reference< css::chart2::XDiagram >& xDiagram
             , ThreeDLookScheme aScheme );
 
     //sal_Int32 nRoundedEdges:  <0 or >100 -> mixed state
     //sal_Int32 nObjectLines:  0->no lines; 1->all lines on; other->mixed state
 
-    static void getRoundedEdgesAndObjectLines( const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram >& xDiagram
+    static void getRoundedEdgesAndObjectLines( const css::uno::Reference< css::chart2::XDiagram >& xDiagram
             , sal_Int32& rnRoundedEdges, sal_Int32& rnObjectLines );
-    static void setRoundedEdgesAndObjectLines( const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram >& xDiagram
+    static void setRoundedEdgesAndObjectLines( const css::uno::Reference< css::chart2::XDiagram >& xDiagram
             , sal_Int32 nRoundedEdges, sal_Int32 nObjectLines );
 };
 
diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx
index b2436733173f..523575244ba8 100644
--- a/chart2/source/inc/TitleHelper.hxx
+++ b/chart2/source/inc/TitleHelper.hxx
@@ -51,50 +51,38 @@ public:
         TITLE_AT_STANDARD_Y_AXIS_POSITION  //equals the X_AXIS_TITLE for barchart
     };
 
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XTitle >
+    static css::uno::Reference< css::chart2::XTitle >
         getTitle( eTitleType nTitleIndex
                     , ChartModel& rModel );
 
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XTitle >
+    static css::uno::Reference< css::chart2::XTitle >
         getTitle( eTitleType nTitleIndex
-                    , const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::frame::XModel >& xModel );
+                    , const css::uno::Reference< css::frame::XModel >& xModel );
 
-    static ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XTitle >
+    static css::uno::Reference<
+            css::chart2::XTitle >
         createTitle(  eTitleType nTitleIndex
                     , const OUString& rTitleText
-                    , const ::com::sun::star::uno::Reference<
-                            ::com::sun::star::frame::XModel >& xModel
-                    , const ::com::sun::star::uno::Reference<
-                            ::com::sun::star::uno::XComponentContext > & xContext
+                    , const css::uno::Reference< css::frame::XModel >& xModel
+                    , const css::uno::Reference< css::uno::XComponentContext > & xContext
                     , ReferenceSizeProvider * pRefSizeProvider = nullptr );
 
     static void removeTitle( eTitleType nTitleIndex
-                    , const ::com::sun::star::uno::Reference<
-                            ::com::sun::star::frame::XModel >& xModel );
+                    , const css::uno::Reference< css::frame::XModel >& xModel );
 
-    static OUString getCompleteString( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XTitle >& xTitle );
+    static OUString getCompleteString( const css::uno::Reference< css::chart2::XTitle >& xTitle );
     static void setCompleteString( const OUString& rNewText
-        , const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XTitle >& xTitle
-        , const ::com::sun::star::uno::Reference<
-            ::com::sun::star::uno::XComponentContext > & xContext
+        , const css::uno::Reference< css::chart2::XTitle >& xTitle
+        , const css::uno::Reference< css::uno::XComponentContext > & xContext
         , float * pDefaultCharHeight = nullptr );
 
     static bool getTitleType( eTitleType& rType
-                    , const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::chart2::XTitle >& xTitle
+                    , const css::uno::Reference< css::chart2::XTitle >& xTitle
                     , ChartModel& rModel);
 
     static bool getTitleType( eTitleType& rType
-                    , const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::chart2::XTitle >& xTitle
-                    , const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::frame::XModel >& xModel );
+                    , const css::uno::Reference< css::chart2::XTitle >& xTitle
+                    , const css::uno::Reference< css::frame::XModel >& xModel );
 };
 
 } //namespace chart
diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx
index f7c649daf418..607a2696725d 100644
--- a/chart2/source/inc/UncachedDataSequence.hxx
+++ b/chart2/source/inc/UncachedDataSequence.hxx
@@ -49,14 +49,14 @@ namespace chart
 namespace impl
 {
 typedef ::cppu::WeakComponentImplHelper<
-    ::com::sun::star::chart2::data::XDataSequence,
-    ::com::sun::star::chart2::data::XNumericalDataSequence,
-    ::com::sun::star::chart2::data::XTextualDataSequence,
-    ::com::sun::star::util::XCloneable,
-    ::com::sun::star::util::XModifiable, // contains util::XModifyBroadcaster
-    ::com::sun::star::container::XIndexReplace,
-    ::com::sun::star::container::XNamed, // for setting a new range representation
-    ::com::sun::star::lang::XServiceInfo >
+    css::chart2::data::XDataSequence,
+    css::chart2::data::XNumericalDataSequence,
+    css::chart2::data::XTextualDataSequence,
+    css::util::XCloneable,
+    css::util::XModifiable, // contains util::XModifyBroadcaster
+    css::container::XIndexReplace,
+    css::container::XNamed, // for setting a new range representation
+    css::lang::XServiceInfo >
     UncachedDataSequence_Base;
 }
 
@@ -81,12 +81,10 @@ public:
         lifetime is at least as long as the one of this object.
      */
     UncachedDataSequence(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XInternalDataProvider > & xIntDataProv,
+        const css::uno::Reference< css::chart2::XInternalDataProvider > & xIntDataProv,
         const OUString & rRangeRepresentation );
     UncachedDataSequence(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XInternalDataProvider > & xIntDataProv,
+        const css::uno::Reference< css::chart2::XInternalDataProvider > & xIntDataProv,
         const OUString & rRangeRepresentation,
         const OUString & rRole );
     UncachedDataSequence( const UncachedDataSequence & rSource );
@@ -110,79 +108,79 @@ public:
 
 protected:
     // ____ XPropertySet ____
-    /// @see ::com::sun::star::beans::XPropertySet
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    /// @see css::beans::XPropertySet
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
+        throw (css::uno::RuntimeException, std::exception) override;
     /// @see ::comphelper::OPropertySetHelper
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
     /// @see ::comphelper::OPropertyArrayUsageHelper
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override;
 
     // ____ XDataSequence ____
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData()
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getSourceRangeRepresentation()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel(
-        ::com::sun::star::chart2::data::LabelOrigin nLabelOrigin )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL generateLabel(
+        css::chart2::data::LabelOrigin nLabelOrigin )
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex )
-        throw (::com::sun::star::lang::IndexOutOfBoundsException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::IndexOutOfBoundsException,
+               css::uno::RuntimeException, std::exception) override;
 
     // ____ XNumericalDataSequence ____
-    /// @see ::com::sun::star::chart::data::XNumericalDataSequence
-    virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    /// @see css::chart::data::XNumericalDataSequence
+    virtual css::uno::Sequence< double > SAL_CALL getNumericalData() throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XTextualDataSequence ____
-    /// @see ::com::sun::star::chart::data::XTextualDataSequence
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    /// @see css::chart::data::XTextualDataSequence
+    virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XIndexReplace ____
-    virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::lang::IndexOutOfBoundsException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element )
+        throw (css::lang::IllegalArgumentException,
+               css::lang::IndexOutOfBoundsException,
+               css::lang::WrappedTargetException,
+               css::uno::RuntimeException, std::exception) override;
 
     // ____ XIndexAccess (base of XIndexReplace) ____
     virtual ::sal_Int32 SAL_CALL getCount()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index )
-        throw (::com::sun::star::lang::IndexOutOfBoundsException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index )
+        throw (css::lang::IndexOutOfBoundsException,
+               css::lang::WrappedTargetException,
+               css::uno::RuntimeException, std::exception) override;
 
     // ____ XElementAccess (base of XIndexAccess) ____
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType()
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL hasElements()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XNamed (for setting a new range representation) ____
     virtual OUString SAL_CALL getName()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setName( const OUString& aName )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XCloneable ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XModifiable ____
     virtual sal_Bool SAL_CALL isModified()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setModified( sal_Bool bModified )
-        throw (::com::sun::star::beans::PropertyVetoException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::beans::PropertyVetoException,
+               css::uno::RuntimeException, std::exception) override;
 
     // ____ XModifyBroadcaster (base of XModifiable) ____
     virtual void SAL_CALL addModifyListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL removeModifyListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     void fireModifyEvent();
 
@@ -198,10 +196,9 @@ protected:
     void registerProperties();
 
 private:
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XInternalDataProvider > m_xDataProvider;
+    css::uno::Reference< css::chart2::XInternalDataProvider > m_xDataProvider;
     OUString                 m_aSourceRepresentation;
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >
+    css::uno::Reference< css::util::XModifyListener >
         m_xModifyEventForwarder;
 };
 
diff --git a/chart2/source/inc/UserDefinedProperties.hxx b/chart2/source/inc/UserDefinedProperties.hxx
index c8ef988b55f8..cb671de2be9c 100644
--- a/chart2/source/inc/UserDefinedProperties.hxx
+++ b/chart2/source/inc/UserDefinedProperties.hxx
@@ -47,7 +47,7 @@ namespace UserDefinedProperties
     };
 
     OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector(
-        ::std::vector< ::com::sun::star::beans::Property > & rOutProperties );
+        ::std::vector< css::beans::Property > & rOutProperties );
 }
 
 } //  namespace chart
diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx
index 4dd09ff8bfcd..4ff2e3e4922c 100644
--- a/chart2/source/inc/WeakListenerAdapter.hxx
+++ b/chart2/source/inc/WeakListenerAdapter.hxx
@@ -46,10 +46,10 @@ template< class Listener >
     ::cppu::WeakImplHelper< Listener >
 {
 public:
-    explicit WeakListenerAdapter( const ::com::sun::star::uno::Reference< Listener > & xListener ) :
+    explicit WeakListenerAdapter( const css::uno::Reference< Listener > & xListener ) :
             m_xListener( xListener )
     {}
-    explicit WeakListenerAdapter( const ::com::sun::star::uno::WeakReference< Listener > & xListener ) :
+    explicit WeakListenerAdapter( const css::uno::WeakReference< Listener > & xListener ) :
             m_xListener( xListener )
     {}
     virtual ~WeakListenerAdapter()
@@ -58,54 +58,51 @@ public:
 protected:
     // ____ XEventListener (base of all listeners) ____
     virtual void SAL_CALL disposing(
-        const ::com::sun::star::lang::EventObject& Source )
-        throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
+        const css::lang::EventObject& Source )
+        throw (css::uno::RuntimeException) SAL_OVERRIDE
     {
-        ::com::sun::star::uno::Reference<
-              ::com::sun::star::lang::XEventListener > xEventListener =
-          ::com::sun::star::uno::Reference<
-              ::com::sun::star::lang::XEventListener >(
-                  ::com::sun::star::uno::Reference< Listener >( m_xListener), ::com::sun::star::uno::UNO_QUERY );
+        css::uno::Reference< css::lang::XEventListener > xEventListener(
+                  css::uno::Reference< Listener >( m_xListener), css::uno::UNO_QUERY );
         if( xEventListener.is())
             xEventListener->disposing( Source );
     }
 
-    ::com::sun::star::uno::Reference< Listener > getListener() const
+    css::uno::Reference< Listener > getListener() const
     {
         return m_xListener;
     }
 
 private:
-    ::com::sun::star::uno::WeakReference< Listener > m_xListener;
+    css::uno::WeakReference< Listener > m_xListener;
 };
 
 class WeakModifyListenerAdapter :
-        public WeakListenerAdapter< ::com::sun::star::util::XModifyListener >
+        public WeakListenerAdapter< css::util::XModifyListener >
 {
 public:
     explicit WeakModifyListenerAdapter(
-        const ::com::sun::star::uno::WeakReference< ::com::sun::star::util::XModifyListener > & xListener );
+        const css::uno::WeakReference< css::util::XModifyListener > & xListener );
     virtual ~WeakModifyListenerAdapter();
 
 protected:
     // ____ XModifyListener ____
-    virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent )
+        throw (css::uno::RuntimeException, std::exception) override;
 };
 
 class WeakSelectionChangeListenerAdapter :
-        public WeakListenerAdapter< ::com::sun::star::view::XSelectionChangeListener >
+        public WeakListenerAdapter< css::view::XSelectionChangeListener >
 {
 public:
     explicit WeakSelectionChangeListenerAdapter(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener );
+        const css::uno::Reference< css::view::XSelectionChangeListener > & xListener );
     virtual ~WeakSelectionChangeListenerAdapter();
 
 protected:
     // ____ XSelectionChangeListener ____
     virtual void SAL_CALL selectionChanged(
-        const ::com::sun::star::lang::EventObject& aEvent )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent )
+        throw (css::uno::RuntimeException, std::exception) override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/inc/WrappedDefaultProperty.hxx b/chart2/source/inc/WrappedDefaultProperty.hxx
index 61d9ce192a79..b9c26cbd7f84 100644
--- a/chart2/source/inc/WrappedDefaultProperty.hxx
+++ b/chart2/source/inc/WrappedDefaultProperty.hxx
@@ -30,26 +30,26 @@ class OOO_DLLPUBLIC_CHARTTOOLS WrappedDefaultProperty : public WrappedProperty
 public:
     explicit WrappedDefaultProperty(
         const OUString& rOuterName, const OUString& rInnerName,
-        const ::com::sun::star::uno::Any& rNewOuterDefault );
+        const css::uno::Any& rNewOuterDefault );
     virtual ~WrappedDefaultProperty();
 
     virtual void setPropertyToDefault(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::uno::RuntimeException) override;
-
-    virtual ::com::sun::star::uno::Any getPropertyDefault(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException) override;
-
-    virtual ::com::sun::star::beans::PropertyState getPropertyState(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::uno::RuntimeException) override;
+        const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
+        throw (css::beans::UnknownPropertyException,
+               css::uno::RuntimeException) override;
+
+    virtual css::uno::Any getPropertyDefault(
+        const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
+        throw (css::beans::UnknownPropertyException,
+               css::lang::WrappedTargetException,
+               css::uno::RuntimeException) override;
+
+    virtual css::beans::PropertyState getPropertyState(
+        const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
+        throw (css::beans::UnknownPropertyException,
+               css::uno::RuntimeException) override;
 private:
-    ::com::sun::star::uno::Any m_aOuterDefaultValue;
+    css::uno::Any m_aOuterDefaultValue;
 };
 
 } //  namespace chart
diff --git a/chart2/source/inc/WrappedDirectStateProperty.hxx b/chart2/source/inc/WrappedDirectStateProperty.hxx
index 6b970195350f..6402afd57b7b 100644
--- a/chart2/source/inc/WrappedDirectStateProperty.hxx
+++ b/chart2/source/inc/WrappedDirectStateProperty.hxx
@@ -33,10 +33,10 @@ public:
         const OUString& rOuterName, const OUString& rInnerName );
     virtual ~WrappedDirectStateProperty();
 
-    virtual ::com::sun::star::beans::PropertyState getPropertyState(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const
-        throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::uno::RuntimeException) override;
+    virtual css::beans::PropertyState getPropertyState(
+        const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
+        throw (css::beans::UnknownPropertyException,
+               css::uno::RuntimeException) override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx
index c530b01557d2..ca6fe26ef6d5 100644
--- a/chart2/source/inc/WrappedIgnoreProperty.hxx
+++ b/chart2/source/inc/WrappedIgnoreProperty.hxx
@@ -30,27 +30,27 @@ namespace chart
 class OOO_DLLPUBLIC_CHARTTOOLS WrappedIgnoreProperty : public WrappedProperty
 {
 public:
-    WrappedIgnoreProperty( const OUString& rOuterName, const ::com::sun::star::uno::Any& rDefaultValue );
+    WrappedIgnoreProperty( const OUString& rOuterName, const css::uno::Any& rDefaultValue );
     virtual ~WrappedIgnoreProperty();
 
-    virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
-                        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) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
+                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
 
-    virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
+                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
 
-SAL_DLLPRIVATE virtual void setPropertyToDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) override;
+SAL_DLLPRIVATE virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
+                        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override;
 
-SAL_DLLPRIVATE virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override;
+SAL_DLLPRIVATE virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
+                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
 
-SAL_DLLPRIVATE virtual ::com::sun::star::beans::PropertyState getPropertyState( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) override;
+SAL_DLLPRIVATE virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
+                        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override;
 
 protected:
-    ::com::sun::star::uno::Any          m_aDefaultValue;
-    mutable ::com::sun::star::uno::Any  m_aCurrentValue;
+    css::uno::Any          m_aDefaultValue;
+    mutable css::uno::Any  m_aCurrentValue;
 };
 
 class OOO_DLLPUBLIC_CHARTTOOLS WrappedIgnoreProperties
diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx
index d5f0bea15eef..062d79566e34 100644
--- a/chart2/source/inc/WrappedProperty.hxx
+++ b/chart2/source/inc/WrappedProperty.hxx
@@ -40,24 +40,24 @@ public:
     const OUString& getOuterName() const { return m_aOuterName;}
     virtual OUString getInnerName() const;
 
-    virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
-                        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);
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
+                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
+                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
 
-    virtual void setPropertyToDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
+                        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
+                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
 
-    virtual ::com::sun::star::beans::PropertyState getPropertyState( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
+                        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
 
 protected:
-    virtual ::com::sun::star::uno::Any convertInnerToOuterValue( const ::com::sun::star::uno::Any& rInnerValue ) const;
-    virtual ::com::sun::star::uno::Any convertOuterToInnerValue( const ::com::sun::star::uno::Any& rOuterValue ) const;
+    virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const;
+    virtual css::uno::Any convertOuterToInnerValue( const css::uno::Any& rOuterValue ) const;
 
 protected:
     OUString             m_aOuterName;
diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx
index c57840b014e6..1815dcf8bb0c 100644
--- a/chart2/source/inc/WrappedPropertySet.hxx
+++ b/chart2/source/inc/WrappedPropertySet.hxx
@@ -39,13 +39,10 @@ namespace chart
 class OOO_DLLPUBLIC_CHARTTOOLS WrappedPropertySet :
                            public MutexContainer
                          , public ::cppu::WeakImplHelper
-                         < ::com::sun::star::beans::XPropertySet
-                         , ::com::sun::star::beans::XMultiPropertySet
-                         , ::com::sun::star::beans::XPropertyState
-                         , ::com::sun::star::beans::XMultiPropertyStates
-                         // ,::com::sun::star::uno::XWeak           // implemented by WeakImplHelper(optional interface)
-                         // ,::com::sun::star::uno::XInterface      // implemented by WeakImplHelper
-                         // ,::com::sun::star::lang::XTypeProvider  // implemented by WeakImplHelper
+                         < css::beans::XPropertySet
+                         , css::beans::XMultiPropertySet
+                         , css::beans::XPropertyState
+                         , css::beans::XMultiPropertyStates
                          >
 {
 public:
@@ -56,40 +53,40 @@ public:
 
 public:
     //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 OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 (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;
-    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;
-    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;
-    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;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, 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 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 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 css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
     //XMultiPropertySet
     //getPropertySetInfo() already declared in XPropertySet
-    virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::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::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
 
     //XPropertyState
-    virtual ::com::sun::star::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;
-    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( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) 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 (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
     //XMultiPropertyStates
     //getPropertyStates() already declared in XPropertyState
-    virtual void SAL_CALL setAllPropertiesToDefault(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setAllPropertiesToDefault(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
 protected: //methods
     /** give all the properties that should be visible to the outer side
     */
-    virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence()=0;
+    virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence()=0;
     /** give a list of all properties that need a special treatment;
     properties that are not in this list will be wrapped identical.
     The base class 'WrappedPropertySet' will take ownership on the contained pointer.
@@ -97,10 +94,8 @@ protected: //methods
     */
     virtual const std::vector< WrappedProperty* > createWrappedProperties()=0;
 
-    virtual ::com::sun::star::uno::Reference<
-                        ::com::sun::star::beans::XPropertySet > getInnerPropertySet() = 0;
-    SAL_DLLPRIVATE ::com::sun::star::uno::Reference<
-                        ::com::sun::star::beans::XPropertyState > getInnerPropertyState();
+    virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() = 0;
+    SAL_DLLPRIVATE css::uno::Reference< css::beans::XPropertyState > getInnerPropertyState();
 
     ::cppu::IPropertyArrayHelper&   getInfoHelper();
     SAL_DLLPRIVATE tWrappedPropertyMap&            getWrappedPropertyMap();
@@ -109,8 +104,7 @@ protected: //methods
     const WrappedProperty*          getWrappedProperty( sal_Int32 nHandle );
 
 protected: //member
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySetInfo >     m_xInfo;//outer PropertySetInfo
+    css::uno::Reference< css::beans::XPropertySetInfo >     m_xInfo;//outer PropertySetInfo
 
     ::cppu::OPropertyArrayHelper*                       m_pPropertyArrayHelper;//holds all possible outer properties
 
diff --git a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx
index 05b9d2a1ff49..33127431092e 100644
--- a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx
+++ b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx
@@ -34,12 +34,10 @@ namespace chart
 class OOO_DLLPUBLIC_CHARTVIEW DataPointSymbolSupplier
 {
 public:
-    static ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >
-        create2DSymbolList( ::com::sun::star::uno::Reference<
-                ::com::sun::star::lang::XMultiServiceFactory > xShapeFactory
-            , const ::com::sun::star::uno::Reference<
-                ::com::sun::star::drawing::XShapes >& xTarget
-            , const ::com::sun::star::drawing::Direction3D& rSize );
+    static css::uno::Reference< css::drawing::XShapes >
+        create2DSymbolList( css::uno::Reference< css::lang::XMultiServiceFactory > xShapeFactory
+            , const css::uno::Reference< css::drawing::XShapes >& xTarget
+            , const css::drawing::Direction3D& rSize );
 };
 
 } //namespace chart
diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx
index 2f43bd5938ff..71dafdd54fc0 100644
--- a/chart2/source/inc/chartview/DrawModelWrapper.hxx
+++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx
@@ -36,8 +36,8 @@ class OOO_DLLPUBLIC_CHARTVIEW DrawModelWrapper : private SdrModel
 private:
     SfxItemPool* m_pChartItemPool;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > m_xMainDrawPage;
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > m_xHiddenDrawPage;
+    css::uno::Reference< css::drawing::XDrawPage > m_xMainDrawPage;
+    css::uno::Reference< css::drawing::XDrawPage > m_xHiddenDrawPage;
 
     VclPtr<OutputDevice> m_pRefDevice;
 
@@ -46,21 +46,20 @@ private:
 
 public:
     SAL_DLLPRIVATE DrawModelWrapper(
-        const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xContext );
+        const css::uno::Reference<css::uno::XComponentContext>& xContext );
     SAL_DLLPRIVATE virtual ~DrawModelWrapper();
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getShapeFactory();
+    css::uno::Reference< css::lang::XMultiServiceFactory > getShapeFactory();
 
     // the main page will contain the normal view objects
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > getMainDrawPage();
+    css::uno::Reference< css::drawing::XDrawPage > getMainDrawPage();
     SAL_DLLPRIVATE void clearMainDrawPage();
 
     // the extra page is not visible, but contains some extras like the symbols for data points
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > getHiddenDrawPage();
+    css::uno::Reference< css::drawing::XDrawPage > getHiddenDrawPage();
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >
-         getChartRootShape( const ::com::sun::star::uno::Reference<
-            ::com::sun::star::drawing::XDrawPage>& xPage );
+    static css::uno::Reference< css::drawing::XShapes >
+         getChartRootShape( const css::uno::Reference< css::drawing::XDrawPage>& xPage );
 
     SAL_DLLPRIVATE void lockControllers();
     SAL_DLLPRIVATE void unlockControllers();
@@ -69,9 +68,9 @@ public:
 
     SfxItemPool&            GetItemPool();
 
-    SAL_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
+    SAL_DLLPRIVATE virtual css::uno::Reference< css::uno::XInterface >
         createUnoModel() override;
-    SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
+    SAL_DLLPRIVATE css::uno::Reference< css::frame::XModel >
         getUnoModel();
     SdrModel& getSdrModel();
 
@@ -85,8 +84,7 @@ public:
     SdrObject* getNamedSdrObject( const OUString& rName );
     static SdrObject* getNamedSdrObject( const OUString& rName, SdrObjList* pObjList );
 
-    static bool removeShape( const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::drawing::XShape >& xShape );
+    static bool removeShape( const css::uno::Reference< css::drawing::XShape >& xShape );
 };
 } //namespace chart
 #endif
diff --git a/chart2/source/inc/chartview/ExplicitScaleValues.hxx b/chart2/source/inc/chartview/ExplicitScaleValues.hxx
index 4eea76d68c5a..9cf0e28dfd3d 100644
--- a/chart2/source/inc/chartview/ExplicitScaleValues.hxx
+++ b/chart2/source/inc/chartview/ExplicitScaleValues.hxx
@@ -31,7 +31,7 @@ namespace chart
 {
 
 /** This structure contains the explicit values for a scale like Minimum and Maximum.
-    See also ::com::sun::star::chart2::ScaleData.
+    See also css::chart2::ScaleData.
 */
 struct OOO_DLLPUBLIC_CHARTVIEW ExplicitScaleData
 {
@@ -41,13 +41,13 @@ struct OOO_DLLPUBLIC_CHARTVIEW ExplicitScaleData
     double Maximum;
     double Origin;
 
-    ::com::sun::star::chart2::AxisOrientation     Orientation;
+    css::chart2::AxisOrientation     Orientation;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > Scaling;
+    css::uno::Reference< css::chart2::XScaling > Scaling;
 
-    sal_Int32   AxisType;//see ::com::sun::star::chart2::AxisType
+    sal_Int32   AxisType;//see css::chart2::AxisType
     bool        ShiftedCategoryPosition;
-    sal_Int32   TimeResolution; //constant of type <type>::com::sun::star::chart::TimeUnit</type>
+    sal_Int32   TimeResolution; //constant of type <type>css::chart::TimeUnit</type>
     Date        NullDate;
 };
 
@@ -77,8 +77,8 @@ struct OOO_DLLPUBLIC_CHARTVIEW ExplicitIncrementData
 
     /** the following two members are only for date-time axis
     */
-    ::com::sun::star::chart::TimeInterval   MajorTimeInterval;
-    ::com::sun::star::chart::TimeInterval   MinorTimeInterval;
+    css::chart::TimeInterval   MajorTimeInterval;
+    css::chart::TimeInterval   MinorTimeInterval;
 
     /** the other members are for *not* date-time axis
     */
diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
index 897f639d53a9..db1f4671dbfc 100644
--- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx
+++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
@@ -49,54 +49,52 @@ public:
         If the given Axis could not be found or for another reason no correct output can be given false is returned.
      */
     virtual bool getExplicitValuesForAxis(
-        ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > xAxis
+        css::uno::Reference< css::chart2::XAxis > xAxis
         , ExplicitScaleData&  rExplicitScale
         , ExplicitIncrementData& rExplicitIncrement )=0;
 
     /** for rotated objects the shape size and position differs from the visible rectangle
         if bSnapRect is set to true you get the resulting visible position (left-top) and size
     */
-    virtual ::com::sun::star::awt::Rectangle
+    virtual css::awt::Rectangle
         getRectangleOfObject( const OUString& rObjectCID, bool bSnapRect=false )=0;
 
-    virtual ::com::sun::star::awt::Rectangle getDiagramRectangleExcludingAxes()=0;
+    virtual css::awt::Rectangle getDiagramRectangleExcludingAxes()=0;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+    virtual css::uno::Reference< css::drawing::XShape >
         getShapeForCID( const OUString& rObjectCID )=0;
 
     virtual std::shared_ptr< DrawModelWrapper > getDrawModelWrapper() = 0;
 
-    static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
-    static ExplicitValueProvider* getExplicitValueProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xChartView );
+    static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
+    static ExplicitValueProvider* getExplicitValueProvider( const css::uno::Reference< css::uno::XInterface >& xChartView );
 
-    static ::com::sun::star::awt::Rectangle
+    static css::awt::Rectangle
         addAxisTitleSizes(
                 ChartModel& rModel
-            , const ::com::sun::star::uno::Reference<
-                ::com::sun::star::uno::XInterface >& xChartView
-            , const ::com::sun::star::awt::Rectangle& rExcludingPositionAndSize );
+            , const css::uno::Reference< css::uno::XInterface >& xChartView
+            , const css::awt::Rectangle& rExcludingPositionAndSize );
 
-    static ::com::sun::star::awt::Rectangle
+    static css::awt::Rectangle
         substractAxisTitleSizes(
                 ChartModel& rModel
-            , const ::com::sun::star::uno::Reference<
-                ::com::sun::star::uno::XInterface >& xChartView
-            , const ::com::sun::star::awt::Rectangle& rPositionAndSizeIncludingTitles );
+            , const css::uno::Reference< css::uno::XInterface >& xChartView
+            , const css::awt::Rectangle& rPositionAndSizeIncludingTitles );
 
     static sal_Int32 getExplicitNumberFormatKeyForAxis(
-              const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis
-            , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem
-            , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument>& xChartDoc);
+              const css::uno::Reference< css::chart2::XAxis >& xAxis
+            , const css::uno::Reference< css::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem
+            , const css::uno::Reference< css::chart2::XChartDocument>& xChartDoc);
 
     static sal_Int32 getExplicitNumberFormatKeyForDataLabel(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesOrPointProp
-            , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries
+            const css::uno::Reference< css::beans::XPropertySet >& xSeriesOrPointProp
+            , const css::uno::Reference< css::chart2::XDataSeries >& xSeries
             , sal_Int32 nPointIndex /*-1 for whole series*/
-            , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram );
+            , const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
 
     static sal_Int32 getExplicitPercentageNumberFormatKeyForDataLabel(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesOrPointProp
-            , const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier );
+            const css::uno::Reference< css::beans::XPropertySet >& xSeriesOrPointProp
+            , const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier );
 
 protected:
     ~ExplicitValueProvider() {}