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

Change-Id: I04320d32d6d5c54e461cfabef58645f8b772bc69

30 files changed, 241 insertions, 261 deletions

diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index ac9018ed5c55..03c1620faeba 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -359,7 +359,7 @@ Reference< XAxis > AxisHelper::createAxis(
 
         if( nAxisIndex>0 )//when inserting secondary axes copy some things from the main axis
         {
-            ::com::sun::star::chart::ChartAxisPosition eNewAxisPos( ::com::sun::star::chart::ChartAxisPosition_END );
+            css::chart::ChartAxisPosition eNewAxisPos( css::chart::ChartAxisPosition_END );
 
             Reference< XAxis > xMainAxis( xCooSys->getAxisByDimension( nDimensionIndex, 0 ) );
             if( xMainAxis.is() )
@@ -378,10 +378,10 @@ Reference< XAxis > AxisHelper::createAxis(
                 Reference< beans::XPropertySet > xMainProp( xMainAxis, uno::UNO_QUERY );
                 if( xMainProp.is() )
                 {
-                    ::com::sun::star::chart::ChartAxisPosition eMainAxisPos( ::com::sun::star::chart::ChartAxisPosition_ZERO );
+                    css::chart::ChartAxisPosition eMainAxisPos( css::chart::ChartAxisPosition_ZERO );
                     xMainProp->getPropertyValue("CrossoverPosition") >>= eMainAxisPos;
-                    if( ::com::sun::star::chart::ChartAxisPosition_END == eMainAxisPos )
-                        eNewAxisPos = ::com::sun::star::chart::ChartAxisPosition_START;
+                    if( css::chart::ChartAxisPosition_END == eMainAxisPos )
+                        eNewAxisPos = css::chart::ChartAxisPosition_START;
                 }
             }
 
@@ -561,7 +561,7 @@ void AxisHelper::makeGridInvisible( const Reference< beans::XPropertySet >& xGri
 }
 
 bool AxisHelper::isGridShown( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid
-                , const Reference< ::com::sun::star::chart2::XDiagram >& xDiagram )
+                , const Reference< css::chart2::XDiagram >& xDiagram )
 {
     bool bRet = false;
 
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index b5a8799a9a92..2e1cf9367e4a 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -380,7 +380,7 @@ void CharacterProperties::AddPropertiesToVector(
     rOutProperties.push_back(
         Property( "WritingMode",
                   PROP_WRITING_MODE,
-                  cppu::UnoType<sal_Int16>::get(), /*com::sun::star::text::WritingMode2*/
+                  cppu::UnoType<sal_Int16>::get(), /*css::text::WritingMode2*/
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
@@ -461,7 +461,7 @@ void CharacterProperties::AddDefaultsToMap(
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_CHAR_SET, sal_Int16(aFontCTL.GetCharSet()) );
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_FONT_PITCH, sal_Int16(aFontCTL.GetPitch()) );
 
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_WRITING_MODE, sal_Int16( com::sun::star::text::WritingMode2::PAGE ) );
+    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_WRITING_MODE, sal_Int16( css::text::WritingMode2::PAGE ) );
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_PARA_IS_CHARACTER_DISTANCE, sal_True );
 }
 
diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx
index 5ef5adcfb0d1..d33f5f9fccf4 100644
--- a/chart2/source/tools/ChartModelHelper.cxx
+++ b/chart2/source/tools/ChartModelHelper.cxx
@@ -49,7 +49,7 @@ uno::Reference< chart2::data::XRangeHighlighter > ChartModelHelper::createRangeH
 }
 
 uno::Reference< chart2::data::XDataProvider > ChartModelHelper::createInternalDataProvider(
-    const uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc, bool bConnectToModel )
+    const uno::Reference< css::chart2::XChartDocument >& xChartDoc, bool bConnectToModel )
 {
     bool bDefaultDataInColumns(true);
 
@@ -57,23 +57,23 @@ uno::Reference< chart2::data::XDataProvider > ChartModelHelper::createInternalDa
     // chart data and use it as default for creating a new InternalDataProvider
     if(xChartDoc.is())
     {
-        ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDocument > xDoc(xChartDoc, uno::UNO_QUERY);
+        css::uno::Reference< css::chart::XChartDocument > xDoc(xChartDoc, uno::UNO_QUERY);
 
         if(xDoc.is())
         {
-            ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > aDiagram = xDoc->getDiagram();
+            css::uno::Reference< css::chart::XDiagram > aDiagram = xDoc->getDiagram();
 
             if(aDiagram.is())
             {
-                ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xProp(aDiagram, uno::UNO_QUERY);
+                css::uno::Reference< css::beans::XPropertySet > xProp(aDiagram, uno::UNO_QUERY);
 
                 if(xProp.is())
                 {
-                    ::com::sun::star::chart::ChartDataRowSource aDataRowSource(::com::sun::star::chart::ChartDataRowSource_COLUMNS);
+                    css::chart::ChartDataRowSource aDataRowSource(css::chart::ChartDataRowSource_COLUMNS);
 
                     xProp->getPropertyValue( "DataRowSource" ) >>= aDataRowSource;
 
-                    bDefaultDataInColumns = (::com::sun::star::chart::ChartDataRowSource_COLUMNS == aDataRowSource);
+                    bDefaultDataInColumns = (css::chart::ChartDataRowSource_COLUMNS == aDataRowSource);
                 }
             }
         }
diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx
index a65bb0d3d8eb..a1cf6222c88b 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -257,16 +257,16 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const
         {
             aRet.realloc(4);
             sal_Int32* pSeq = aRet.getArray();
-            *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::AVOID_OVERLAP;
-            *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::OUTSIDE;
-            *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::INSIDE;
-            *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::CENTER;
+            *pSeq++ = css::chart::DataLabelPlacement::AVOID_OVERLAP;
+            *pSeq++ = css::chart::DataLabelPlacement::OUTSIDE;
+            *pSeq++ = css::chart::DataLabelPlacement::INSIDE;
+            *pSeq++ = css::chart::DataLabelPlacement::CENTER;
         }
         else
         {
             aRet.realloc(1);
             sal_Int32* pSeq = aRet.getArray();
-            *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::CENTER;
+            *pSeq++ = css::chart::DataLabelPlacement::CENTER;
         }
     }
     else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER)
@@ -276,11 +276,11 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const
     {
         aRet.realloc(5);
         sal_Int32* pSeq = aRet.getArray();
-        *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::TOP;
-        *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::BOTTOM;
-        *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::LEFT;
-        *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::RIGHT;
-        *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::CENTER;
+        *pSeq++ = css::chart::DataLabelPlacement::TOP;
+        *pSeq++ = css::chart::DataLabelPlacement::BOTTOM;
+        *pSeq++ = css::chart::DataLabelPlacement::LEFT;
+        *pSeq++ = css::chart::DataLabelPlacement::RIGHT;
+        *pSeq++ = css::chart::DataLabelPlacement::CENTER;
     }
     else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN)
         || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) )
@@ -300,49 +300,49 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const
         {
             if(bSwapXAndY)
             {
-                *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::RIGHT;
-                *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::LEFT;
+                *pSeq++ = css::chart::DataLabelPlacement::RIGHT;
+                *pSeq++ = css::chart::DataLabelPlacement::LEFT;
             }
             else
             {
-                *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::TOP;
-                *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::BOTTOM;
+                *pSeq++ = css::chart::DataLabelPlacement::TOP;
+                *pSeq++ = css::chart::DataLabelPlacement::BOTTOM;
             }
         }
-        *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::CENTER;
+        *pSeq++ = css::chart::DataLabelPlacement::CENTER;
         if(!bStacked)
-            *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::OUTSIDE;
-        *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::INSIDE;
-        *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::NEAR_ORIGIN;
+            *pSeq++ = css::chart::DataLabelPlacement::OUTSIDE;
+        *pSeq++ = css::chart::DataLabelPlacement::INSIDE;
+        *pSeq++ = css::chart::DataLabelPlacement::NEAR_ORIGIN;
     }
     else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_AREA) )
     {
         aRet.realloc(1);
         sal_Int32* pSeq = aRet.getArray();
-        *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::TOP;
+        *pSeq++ = css::chart::DataLabelPlacement::TOP;
     }
     else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) )
     {
         aRet.realloc(6);
         sal_Int32* pSeq = aRet.getArray();
-        *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::OUTSIDE;
-        *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::TOP;
-        *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::BOTTOM;
-        *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::LEFT;
-        *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::RIGHT;
-        *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::CENTER;
+        *pSeq++ = css::chart::DataLabelPlacement::OUTSIDE;
+        *pSeq++ = css::chart::DataLabelPlacement::TOP;
+        *pSeq++ = css::chart::DataLabelPlacement::BOTTOM;
+        *pSeq++ = css::chart::DataLabelPlacement::LEFT;
+        *pSeq++ = css::chart::DataLabelPlacement::RIGHT;
+        *pSeq++ = css::chart::DataLabelPlacement::CENTER;
     }
     else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET) )
     {
         aRet.realloc(1);
         sal_Int32* pSeq = aRet.getArray();
-        *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::OUTSIDE;
+        *pSeq++ = css::chart::DataLabelPlacement::OUTSIDE;
     }
     else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) )
     {
         aRet.realloc( 1 );
         sal_Int32* pSeq = aRet.getArray();
-        *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::OUTSIDE;
+        *pSeq++ = css::chart::DataLabelPlacement::OUTSIDE;
     }
     else
     {
@@ -516,7 +516,7 @@ drawing::Direction3D ChartTypeHelper::getDefaultRealisticLightDirection( const u
 sal_Int32 ChartTypeHelper::getAxisType( const uno::Reference<
             XChartType >& xChartType, sal_Int32 nDimensionIndex )
 {
-    //retruned is a constant from constant group ::com::sun::star::chart2::AxisType
+    //retruned is a constant from constant group css::chart2::AxisType
 
     //@todo ask charttype itself --> need model change first
     if(!xChartType.is())
@@ -583,16 +583,16 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedMissingValueTreatments(
     {
         aRet.realloc( 2 );
         sal_Int32* pSeq = aRet.getArray();
-        *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP;
-        *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::USE_ZERO;
+        *pSeq++ = css::chart::MissingValueTreatment::LEAVE_GAP;
+        *pSeq++ = css::chart::MissingValueTreatment::USE_ZERO;
     }
     else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_AREA) )
     {
         aRet.realloc( bStacked ? 1 : 2 );
         sal_Int32* pSeq = aRet.getArray();
-        *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::USE_ZERO;
+        *pSeq++ = css::chart::MissingValueTreatment::USE_ZERO;
         if( !bStacked )
-            *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::CONTINUE;
+            *pSeq++ = css::chart::MissingValueTreatment::CONTINUE;
     }
     else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_LINE) ||
         aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) ||
@@ -600,18 +600,18 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedMissingValueTreatments(
     {
         aRet.realloc( bStacked ? 2 : 3 );
         sal_Int32* pSeq = aRet.getArray();
-        *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP;
-        *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::USE_ZERO;
+        *pSeq++ = css::chart::MissingValueTreatment::LEAVE_GAP;
+        *pSeq++ = css::chart::MissingValueTreatment::USE_ZERO;
         if( !bStacked )
-            *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::CONTINUE;
+            *pSeq++ = css::chart::MissingValueTreatment::CONTINUE;
     }
     else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) )
     {
         aRet.realloc( 3 );
         sal_Int32* pSeq = aRet.getArray();
-        *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::CONTINUE;
-        *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP;
-        *pSeq++ = ::com::sun::star::chart::MissingValueTreatment::USE_ZERO;
+        *pSeq++ = css::chart::MissingValueTreatment::CONTINUE;
+        *pSeq++ = css::chart::MissingValueTreatment::LEAVE_GAP;
+        *pSeq++ = css::chart::MissingValueTreatment::USE_ZERO;
     }
     else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ||
         aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) )
diff --git a/chart2/source/tools/ColorPerPointHelper.cxx b/chart2/source/tools/ColorPerPointHelper.cxx
index 65e72233c11f..985f46035cbe 100644
--- a/chart2/source/tools/ColorPerPointHelper.cxx
+++ b/chart2/source/tools/ColorPerPointHelper.cxx
@@ -30,11 +30,9 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
 bool ColorPerPointHelper::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
          )
 {
     if( !xDataSeriesProperties.is() )
@@ -59,8 +57,7 @@ bool ColorPerPointHelper::hasPointOwnColor(
 }
 
 bool ColorPerPointHelper::hasPointOwnProperties(
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >& xSeriesProperties
+    const css::uno::Reference< css::beans::XPropertySet >& xSeriesProperties
     , sal_Int32 nPointIndex )
 {
     if( xSeriesProperties.is() )
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index 3d90fa97d338..6528d78e382c 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -87,9 +87,9 @@ void lcl_addErrorBarRanges(
         if( ( xSeriesProp->getPropertyValue( CHART_UNONAME_ERRORBAR_Y) >>= xErrorBarProp ) &&
             xErrorBarProp.is())
         {
-            sal_Int32 eStyle = ::com::sun::star::chart::ErrorBarStyle::NONE;
+            sal_Int32 eStyle = css::chart::ErrorBarStyle::NONE;
             if( ( xErrorBarProp->getPropertyValue( "ErrorBarStyle") >>= eStyle ) &&
-                eStyle == ::com::sun::star::chart::ErrorBarStyle::FROM_DATA )
+                eStyle == css::chart::ErrorBarStyle::FROM_DATA )
             {
                 uno::Reference< data::XDataSource > xErrorBarDataSource( xErrorBarProp, uno::UNO_QUERY );
                 if( xErrorBarDataSource.is() )
@@ -99,9 +99,9 @@ void lcl_addErrorBarRanges(
 
         if( ( xSeriesProp->getPropertyValue(CHART_UNONAME_ERRORBAR_X) >>= xErrorBarProp ) && xErrorBarProp.is())
         {
-            sal_Int32 eStyle = ::com::sun::star::chart::ErrorBarStyle::NONE;
+            sal_Int32 eStyle = css::chart::ErrorBarStyle::NONE;
             if( ( xErrorBarProp->getPropertyValue("ErrorBarStyle") >>= eStyle ) &&
-                eStyle == ::com::sun::star::chart::ErrorBarStyle::FROM_DATA )
+                eStyle == css::chart::ErrorBarStyle::FROM_DATA )
             {
                 uno::Reference< data::XDataSource > xErrorBarDataSource( xErrorBarProp, uno::UNO_QUERY );
                 if( xErrorBarDataSource.is() )
@@ -154,9 +154,9 @@ Reference< chart2::data::XLabeledDataSequence > DataSourceHelper::createLabeledD
 uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments(
                                             bool bUseColumns, bool bFirstCellAsLabel, bool bHasCategories )
 {
-    ::com::sun::star::chart::ChartDataRowSource eRowSource = ::com::sun::star::chart::ChartDataRowSource_ROWS;
+    css::chart::ChartDataRowSource eRowSource = css::chart::ChartDataRowSource_ROWS;
     if( bUseColumns )
-        eRowSource = ::com::sun::star::chart::ChartDataRowSource_COLUMNS;
+        eRowSource = css::chart::ChartDataRowSource_COLUMNS;
 
     uno::Sequence< beans::PropertyValue > aArguments(3);
     aArguments[0] = beans::PropertyValue( "DataRowSource"
@@ -204,9 +204,9 @@ void DataSourceHelper::readArguments( const uno::Sequence< beans::PropertyValue
         const beans::PropertyValue& aProperty = *pArguments;
         if ( aProperty.Name == "DataRowSource" )
         {
-            ::com::sun::star::chart::ChartDataRowSource eRowSource;
+            css::chart::ChartDataRowSource eRowSource;
             if( aProperty.Value >>= eRowSource )
-                bUseColumns = (eRowSource==::com::sun::star::chart::ChartDataRowSource_COLUMNS);
+                bUseColumns = (eRowSource==css::chart::ChartDataRowSource_COLUMNS);
         }
         else if ( aProperty.Name == "FirstCellAsLabel" )
         {
@@ -353,7 +353,7 @@ bool DataSourceHelper::detectRangeSegmentation(
     const uno::Reference<
         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 )
@@ -408,7 +408,7 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected(
             {
                 bHasDataRowSource =
                     (aProperty.Value.hasValue() && aProperty.Value.isExtractableTo(
-                        cppu::UnoType<com::sun::star::chart::ChartDataRowSource>::get()));
+                        cppu::UnoType<css::chart::ChartDataRowSource>::get()));
             }
             else if ( aProperty.Name == "FirstCellAsLabel" )
             {
@@ -433,7 +433,7 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected(
 
 void DataSourceHelper::setRangeSegmentation(
             const uno::Reference< frame::XModel >& xChartModel
-            , const ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping
+            , const css::uno::Sequence< sal_Int32 >& rSequenceMapping
             , bool bUseColumns , bool bFirstCellAsLabel, bool bUseCategories )
 {
     uno::Reference< XChartDocument > xChartDocument( xChartModel, uno::UNO_QUERY );
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 820209b25170..706ee385a4b2 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -1486,8 +1486,7 @@ bool DiagramHelper::isSupportingFloorAndWall( const Reference<
     return true;
 }
 
-bool DiagramHelper::isPieOrDonutChart( const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDiagram >& xDiagram )
+bool DiagramHelper::isPieOrDonutChart( const css::uno::Reference< css::chart2::XDiagram >& xDiagram )
 {
     uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex(
         xDiagram, 0 ) );
@@ -1566,7 +1565,7 @@ sal_Int32 DiagramHelper::getCorrectedMissingValueTreatment(
             const Reference< chart2::XDiagram > & xDiagram,
             const Reference< chart2::XChartType >& xChartType )
 {
-    sal_Int32 nResult = ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP;
+    sal_Int32 nResult = css::chart::MissingValueTreatment::LEAVE_GAP;
     uno::Sequence < sal_Int32 > aAvailableMissingValueTreatments(
                 ChartTypeHelper::getSupportedMissingValueTreatments( xChartType ) );
 
@@ -1702,7 +1701,7 @@ bool DiagramHelper::switchDiagramPositioningToExcludingPositioning(
     const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( SvtSaveOptions().GetODFDefaultVersion() );
     if( nCurrentODFVersion > SvtSaveOptions::ODFVER_012 )
     {
-        uno::Reference< ::com::sun::star::chart::XDiagramPositioning > xDiagramPositioning( rModel.getFirstDiagram(), uno::UNO_QUERY );
+        uno::Reference< css::chart::XDiagramPositioning > xDiagramPositioning( rModel.getFirstDiagram(), uno::UNO_QUERY );
         if( xDiagramPositioning.is() && ( bConvertAlsoFromAutoPositioning || !xDiagramPositioning->isAutomaticDiagramPositioning() )
                 && !xDiagramPositioning->isExcludingDiagramPositioning() )
         {
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 29b866f8eeef..d35c6fa53bce 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -65,12 +65,12 @@ const SfxItemPropertySet* GetErrorBarPropertySet()
         {OUString("ErrorBarRangePositive"),6,cppu::UnoType<OUString>::get(),0,0}, // read-only for export
         {OUString("ErrorBarRangeNegative"),7,cppu::UnoType<OUString>::get(),0,0}, // read-only for export
         {OUString("Weight"),8,cppu::UnoType<double>::get(),0,0},
-        {OUString("LineStyle"),9,cppu::UnoType<com::sun::star::drawing::LineStyle>::get(),0,0},
+        {OUString("LineStyle"),9,cppu::UnoType<css::drawing::LineStyle>::get(),0,0},
         {OUString("LineDash"),10,cppu::UnoType<drawing::LineDash>::get(),0,0},
         {OUString("LineWidth"),11,cppu::UnoType<sal_Int32>::get(),0,0},
-        {OUString("LineColor"),12,cppu::UnoType<com::sun::star::util::Color>::get(),0,0},
+        {OUString("LineColor"),12,cppu::UnoType<css::util::Color>::get(),0,0},
         {OUString("LineTransparence"),13,cppu::UnoType<sal_Int16>::get(),0,0},
-        {OUString("LineJoint"),14,cppu::UnoType<com::sun::star::drawing::LineJoint>::get(),0,0},
+        {OUString("LineJoint"),14,cppu::UnoType<css::drawing::LineJoint>::get(),0,0},
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
     static SfxItemPropertySet aPropSet( aErrorBarPropertyMap_Impl );
@@ -95,7 +95,7 @@ ErrorBar::ErrorBar(
     mfPositiveError(0),
     mfNegativeError(0),
     mfWeight(1),
-    meStyle(com::sun::star::chart::ErrorBarStyle::NONE),
+    meStyle(css::chart::ErrorBarStyle::NONE),
     m_xContext( xContext ),
     m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
 {}
@@ -237,7 +237,7 @@ uno::Any ErrorBar::getPropertyValue(const OUString& rPropName)
     else if(rPropName == "ErrorBarRangePositive")
     {
         OUString aRange;
-        if(meStyle == com::sun::star::chart::ErrorBarStyle::FROM_DATA)
+        if(meStyle == css::chart::ErrorBarStyle::FROM_DATA)
         {
             uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > aSequences =
                 getDataSequences();
@@ -250,7 +250,7 @@ uno::Any ErrorBar::getPropertyValue(const OUString& rPropName)
     else if(rPropName == "ErrorBarRangeNegative")
     {
         OUString aRange;
-        if(meStyle == com::sun::star::chart::ErrorBarStyle::FROM_DATA)
+        if(meStyle == css::chart::ErrorBarStyle::FROM_DATA)
         {
             uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > aSequences =
                 getDataSequences();
@@ -268,11 +268,11 @@ uno::Any ErrorBar::getPropertyValue(const OUString& rPropName)
 }
 
 beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName )
-        throw (com::sun::star::beans::UnknownPropertyException, std::exception)
+        throw (css::beans::UnknownPropertyException, std::exception)
 {
     if(rPropName == "ErrorBarStyle")
     {
-        if(meStyle == com::sun::star::chart::ErrorBarStyle::NONE)
+        if(meStyle == css::chart::ErrorBarStyle::NONE)
             return beans::PropertyState_DEFAULT_VALUE;
         return beans::PropertyState_DIRECT_VALUE;
     }
@@ -282,8 +282,8 @@ beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName )
         {
             switch(meStyle)
             {
-                case com::sun::star::chart::ErrorBarStyle::ABSOLUTE:
-                case com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN:
+                case css::chart::ErrorBarStyle::ABSOLUTE:
+                case css::chart::ErrorBarStyle::ERROR_MARGIN:
                     return beans::PropertyState_DIRECT_VALUE;
                 default:
                     break;
@@ -297,8 +297,8 @@ beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName )
         {
             switch(meStyle)
             {
-                case com::sun::star::chart::ErrorBarStyle::ABSOLUTE:
-                case com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN:
+                case css::chart::ErrorBarStyle::ABSOLUTE:
+                case css::chart::ErrorBarStyle::ERROR_MARGIN:
                     return beans::PropertyState_DIRECT_VALUE;
                 default:
                     break;
@@ -308,7 +308,7 @@ beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName )
     }
     else if(rPropName == "PercentageError")
     {
-        if(meStyle != com::sun::star::chart::ErrorBarStyle::RELATIVE)
+        if(meStyle != css::chart::ErrorBarStyle::RELATIVE)
             return beans::PropertyState_DEFAULT_VALUE;
         return beans::PropertyState_DIRECT_VALUE;
     }
@@ -324,13 +324,13 @@ beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName )
     }
     else if(rPropName == "ErrorBarRangePositive")
     {
-        if(meStyle == com::sun::star::chart::ErrorBarStyle::FROM_DATA && mbShowPositiveError)
+        if(meStyle == css::chart::ErrorBarStyle::FROM_DATA && mbShowPositiveError)
             return beans::PropertyState_DIRECT_VALUE;
         return beans::PropertyState_DEFAULT_VALUE;
     }
     else if(rPropName == "ErrorBarRangeNegative")
     {
-        if(meStyle == com::sun::star::chart::ErrorBarStyle::FROM_DATA && mbShowNegativeError)
+        if(meStyle == css::chart::ErrorBarStyle::FROM_DATA && mbShowNegativeError)
             return beans::PropertyState_DIRECT_VALUE;
         return beans::PropertyState_DEFAULT_VALUE;
     }
@@ -339,7 +339,7 @@ beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName )
 }
 
 uno::Sequence< beans::PropertyState > ErrorBar::getPropertyStates( const uno::Sequence< OUString >& rPropNames )
-        throw (com::sun::star::beans::UnknownPropertyException, std::exception)
+        throw (css::beans::UnknownPropertyException, std::exception)
 {
     uno::Sequence< beans::PropertyState > aRet( rPropNames.getLength() );
     for(sal_Int32 i = 0; i < rPropNames.getLength(); ++i)
@@ -362,23 +362,23 @@ uno::Any ErrorBar::getPropertyDefault( const OUString& )
     return uno::Any();
 }
 
-void ErrorBar::addPropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& )
-    throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
+void ErrorBar::addPropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& )
+    throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
 }
 
-void ErrorBar::removePropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& )
-    throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
+void ErrorBar::removePropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& )
+    throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
 }
 
-void ErrorBar::addVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& )
-    throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
+void ErrorBar::addVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& )
+    throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
 }
 
-void ErrorBar::removeVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& )
-    throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
+void ErrorBar::removeVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& )
+    throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
 }
 
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 2d1802cec97d..ca9475ba444b 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -221,9 +221,8 @@ class SplitCategoriesProvider_ForLabeledDataSequences : public SplitCategoriesPr
 public:
 
     explicit SplitCategoriesProvider_ForLabeledDataSequences(
-        const ::com::sun::star::uno::Sequence<
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::data::XLabeledDataSequence> >& rSplitCategoriesList
+        const css::uno::Sequence<
+            css::uno::Reference< css::chart2::data::XLabeledDataSequence> >& rSplitCategoriesList
         , ChartModel& rModel )
         : m_rSplitCategoriesList( rSplitCategoriesList )
         , mrModel( rModel )
@@ -235,8 +234,8 @@ public:
     virtual uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const override;
 
 private:
-    const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::data::XLabeledDataSequence> >& m_rSplitCategoriesList;
+    const css::uno::Sequence< css::uno::Reference<
+        css::chart2::data::XLabeledDataSequence> >& m_rSplitCategoriesList;
 
     ChartModel& mrModel;
 };
diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx
index 5316984b10fc..064136093a9a 100644
--- a/chart2/source/tools/FillProperties.cxx
+++ b/chart2/source/tools/FillProperties.cxx
@@ -34,7 +34,7 @@ namespace chart
 namespace
 {
 
-void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties )
+void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< css::beans::Property > & rOutProperties )
 {
     rOutProperties.push_back(
         Property( "FillStyle",
@@ -99,7 +99,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
-void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties )
+void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< css::beans::Property > & rOutProperties )
 {
     rOutProperties.push_back(
         Property( "FillBitmapName",
diff --git a/chart2/source/tools/ImplOPropertySet.hxx b/chart2/source/tools/ImplOPropertySet.hxx
index 2c3c80e68663..2bc7e6fe6895 100644
--- a/chart2/source/tools/ImplOPropertySet.hxx
+++ b/chart2/source/tools/ImplOPropertySet.hxx
@@ -39,10 +39,10 @@ public:
 
     /** supports states DIRECT_VALUE and DEFAULT_VALUE
      */
-    ::com::sun::star::beans::PropertyState
+    css::beans::PropertyState
         GetPropertyStateByHandle( sal_Int32 nHandle ) const;
 
-    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState >
+    css::uno::Sequence< css::beans::PropertyState >
         GetPropertyStatesByHandle( const ::std::vector< sal_Int32 > & aHandles ) const;
 
     void SetPropertyToDefault( sal_Int32 nHandle );
@@ -58,25 +58,25 @@ public:
         @return false if the property is default, true otherwise.
      */
     bool GetPropertyValueByHandle(
-        ::com::sun::star::uno::Any & rValue,
+        css::uno::Any & rValue,
         sal_Int32 nHandle ) const;
 
     void SetPropertyValueByHandle( sal_Int32 nHandle,
-                                   const ::com::sun::star::uno::Any & rValue );
+                                   const css::uno::Any & rValue );
 
-    bool SetStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > & xStyle );
-    ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >
+    bool SetStyle( const css::uno::Reference< css::style::XStyle > & xStyle );
+    css::uno::Reference< css::style::XStyle >
         GetStyle() const { return m_xStyle;}
 
     typedef
-        ::std::map< sal_Int32, ::com::sun::star::uno::Any >
+        ::std::map< sal_Int32, css::uno::Any >
         tPropertyMap;
 
 private:
     void cloneInterfaceProperties();
 
     tPropertyMap    m_aProperties;
-    ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >
+    css::uno::Reference< css::style::XStyle >
         m_xStyle;
 };
 
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 6511a2893e84..efafdbd2e653 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -788,8 +788,8 @@ Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments(
     aArguments[1] = beans::PropertyValue(
         "DataRowSource", -1, uno::makeAny(
             m_bDataInColumns
-            ? ::com::sun::star::chart::ChartDataRowSource_COLUMNS
-            : ::com::sun::star::chart::ChartDataRowSource_ROWS ),
+            ? css::chart::ChartDataRowSource_COLUMNS
+            : css::chart::ChartDataRowSource_ROWS ),
         beans::PropertyState_DIRECT_VALUE );
     // internal data always contains labels and categories
     aArguments[2] = beans::PropertyValue(
@@ -1506,13 +1506,13 @@ Sequence< OUString > SAL_CALL InternalDataProvider::getColumnDescriptions()
 
 // ____ XChartData (base of XChartDataArray) ____
 void SAL_CALL InternalDataProvider::addChartDataChangeEventListener(
-    const Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& )
+    const Reference< css::chart::XChartDataChangeEventListener >& )
     throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL InternalDataProvider::removeChartDataChangeEventListener(
-    const Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& )
+    const Reference< css::chart::XChartDataChangeEventListener >& )
     throw (uno::RuntimeException, std::exception)
 {
 }
diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx
index 6ca8e3f43de1..c174e398ac40 100644
--- a/chart2/source/tools/LegendHelper.cxx
+++ b/chart2/source/tools/LegendHelper.cxx
@@ -48,11 +48,11 @@ Reference< chart2::XLegend > LegendHelper::showLegend( ChartModel& rModel
             if( !(xProp->getPropertyValue( "AnchorPosition") >>= ePos ) )
                 xProp->setPropertyValue( "AnchorPosition", uno::makeAny( ePos ));
 
-            ::com::sun::star::chart::ChartLegendExpansion eExpansion =
+            css::chart::ChartLegendExpansion eExpansion =
                     ( ePos == chart2::LegendPosition_LINE_END ||
                       ePos == chart2::LegendPosition_LINE_START )
-                    ? ::com::sun::star::chart::ChartLegendExpansion_HIGH
-                    : ::com::sun::star::chart::ChartLegendExpansion_WIDE;
+                    ? css::chart::ChartLegendExpansion_HIGH
+                    : css::chart::ChartLegendExpansion_WIDE;
             if( !(xProp->getPropertyValue( "Expansion") >>= eExpansion ) )
                 xProp->setPropertyValue( "Expansion", uno::makeAny( eExpansion ));
 
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index 840692b0d533..2378ad06c24d 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -161,8 +161,8 @@ bool LifeTimeManager::dispose()
     //--release all resources and references after calling this method successful
 }
 
-CloseableLifeTimeManager::CloseableLifeTimeManager( ::com::sun::star::util::XCloseable* pCloseable
-        , ::com::sun::star::lang::XComponent* pComponent
+CloseableLifeTimeManager::CloseableLifeTimeManager( css::util::XCloseable* pCloseable
+        , css::lang::XComponent* pComponent
         , bool bLongLastingCallsCancelable )
         : LifeTimeManager( pComponent, bLongLastingCallsCancelable )
         , m_pCloseable(pCloseable)
diff --git a/chart2/source/tools/LinePropertiesHelper.cxx b/chart2/source/tools/LinePropertiesHelper.cxx
index 41aa01d6bf68..e5e29145a43a 100644
--- a/chart2/source/tools/LinePropertiesHelper.cxx
+++ b/chart2/source/tools/LinePropertiesHelper.cxx
@@ -97,8 +97,8 @@ void LinePropertiesHelper::AddDefaultsToMap(
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINE_JOINT, drawing::LineJoint_ROUND );
 }
 
-bool LinePropertiesHelper::IsLineVisible( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >& xLineProperties )
+bool LinePropertiesHelper::IsLineVisible( const css::uno::Reference<
+        css::beans::XPropertySet >& xLineProperties )
 {
     bool bRet = false;
     try
@@ -125,8 +125,8 @@ bool LinePropertiesHelper::IsLineVisible( const ::com::sun::star::uno::Reference
     return bRet;
 }
 
-void LinePropertiesHelper::SetLineVisible( const ::com::sun::star::uno::Reference<
-    ::com::sun::star::beans::XPropertySet >& xLineProperties )
+void LinePropertiesHelper::SetLineVisible( const css::uno::Reference<
+    css::beans::XPropertySet >& xLineProperties )
 {
     try
     {
@@ -149,8 +149,8 @@ void LinePropertiesHelper::SetLineVisible( const ::com::sun::star::uno::Referenc
     }
 }
 
-void LinePropertiesHelper::SetLineInvisible( const ::com::sun::star::uno::Reference<
-    ::com::sun::star::beans::XPropertySet >& xLineProperties )
+void LinePropertiesHelper::SetLineInvisible( const css::uno::Reference<
+    css::beans::XPropertySet >& xLineProperties )
 {
     try
     {
@@ -168,8 +168,8 @@ void LinePropertiesHelper::SetLineInvisible( const ::com::sun::star::uno::Refere
     }
 }
 
-void LinePropertiesHelper::SetLineColor( const ::com::sun::star::uno::Reference<
-     ::com::sun::star::beans::XPropertySet >& xLineProperties, sal_Int32 nColor  )
+void LinePropertiesHelper::SetLineColor( const css::uno::Reference<
+     css::beans::XPropertySet >& xLineProperties, sal_Int32 nColor  )
 {
     try
     {
diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx
index 062c5f466164..9951b1336194 100644
--- a/chart2/source/tools/MediaDescriptorHelper.cxx
+++ b/chart2/source/tools/MediaDescriptorHelper.cxx
@@ -137,11 +137,11 @@ void MediaDescriptorHelper::impl_init()
     ISSET_CharacterSet = false;
     ISSET_Comment = false;
 
-//  ::com::sun::star::uno::Any  ComponentData;
+//  css::uno::Any  ComponentData;
     ISSET_ComponentData = false;
     ISSET_FileName = false;
 
-//  ::com::sun::star::uno::Any  FilterData;
+//  css::uno::Any  FilterData;
     ISSET_FilterData = false;
     ISSET_FilterName = false;
     ISSET_FilterFlags = false;
@@ -163,10 +163,10 @@ void MediaDescriptorHelper::impl_init()
     ISSET_Overwrite = false;
     ISSET_Password = false;
 
-//  ::com::sun::star::awt::Rectangle PosSize;
+//  css::awt::Rectangle PosSize;
     ISSET_PosSize = false;
 
-//  ::com::sun::star::uno::Sequence< sal_Int8 > PostData;
+//  css::uno::Sequence< sal_Int8 > PostData;
     ISSET_PostData = false;
     ISSET_PostString = false;
     Preview = false;
@@ -185,7 +185,7 @@ void MediaDescriptorHelper::impl_init()
     Version = 0;
     ISSET_Version = false;
 
-//  ::com::sun::star::uno::Any ViewData;
+//  css::uno::Any ViewData;
     ISSET_ViewData = false;
     ViewId = 0;
     ISSET_ViewId = false;
diff --git a/chart2/source/tools/ModifyListenerCallBack.cxx b/chart2/source/tools/ModifyListenerCallBack.cxx
index 622825462357..0ac16b840aca 100644
--- a/chart2/source/tools/ModifyListenerCallBack.cxx
+++ b/chart2/source/tools/ModifyListenerCallBack.cxx
@@ -26,8 +26,7 @@ using ::com::sun::star::uno::Reference;
 
 namespace chart {
 
-typedef ::cppu::WeakComponentImplHelper<
-        ::com::sun::star::util::XModifyListener >
+typedef ::cppu::WeakComponentImplHelper< css::util::XModifyListener >
     ModifyListenerCallBack_Base;
 
 class ModifyListenerCallBack_impl
diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx
index b6d093e8d362..02b3e6a5a505 100644
--- a/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/chart2/source/tools/ModifyListenerHelper.cxx
@@ -62,8 +62,8 @@ void lcl_fireModifyEvent(
 
 struct lcl_weakReferenceToSame : public ::std::unary_function<
         ::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 > >,
         bool >
 {
     explicit lcl_weakReferenceToSame( const Reference< util::XModifyListener > & xModListener ) :
@@ -96,8 +96,8 @@ uno::Reference< util::XModifyListener > createModifyEventForwarder()
 
 ModifyEventForwarder::ModifyEventForwarder() :
         ::cppu::WeakComponentImplHelper<
-        ::com::sun::star::util::XModifyBroadcaster,
-        ::com::sun::star::util::XModifyListener >( m_aMutex ),
+        css::util::XModifyBroadcaster,
+        css::util::XModifyListener >( m_aMutex ),
         m_aModifyListeners( m_aMutex )
 {
 }
diff --git a/chart2/source/tools/NameContainer.cxx b/chart2/source/tools/NameContainer.cxx
index 107b289c83d9..c3d14ce56073 100644
--- a/chart2/source/tools/NameContainer.cxx
+++ b/chart2/source/tools/NameContainer.cxx
@@ -30,12 +30,12 @@ namespace chart
 {
 
 uno::Reference< container::XNameContainer > createNameContainer(
-        const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName )
+        const css::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName )
 {
     return new NameContainer( rType, rServicename, rImplementationName );
 }
 
-NameContainer::NameContainer( const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName )
+NameContainer::NameContainer( const css::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName )
     : m_aType( rType )
     , m_aServicename( rServicename )
     , m_aImplementationName( rImplementationName )
@@ -59,19 +59,19 @@ NameContainer::~NameContainer()
 
 //XServiceInfo
 OUString SAL_CALL NameContainer::getImplementationName()
-    throw( ::com::sun::star::uno::RuntimeException, std::exception )
+    throw( css::uno::RuntimeException, std::exception )
 {
     return m_aImplementationName;
 }
 
 sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName )
-    throw( ::com::sun::star::uno::RuntimeException, std::exception )
+    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL NameContainer::getSupportedServiceNames()
-    throw( ::com::sun::star::uno::RuntimeException, std::exception )
+    throw( css::uno::RuntimeException, std::exception )
 {
     Sequence<OUString> aSNS { m_aServicename };
     return aSNS;
diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx
index de4ea2803dee..121a25ac61dc 100644
--- a/chart2/source/tools/PropertyHelper.cxx
+++ b/chart2/source/tools/PropertyHelper.cxx
@@ -274,7 +274,7 @@ void setPropertyValueAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key,
 }
 
 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 )
 {
     setPropertyValueAny( rOutMap, key, rAny );
 }
@@ -286,7 +286,7 @@ void setPropertyValueDefaultAny( tPropertyValueMap & rOutMap, tPropertyValueMapK
 }
 
 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 )
 {
     setPropertyValueDefaultAny( rOutMap, key, rAny );
 }
diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx
index 654f30a84c24..749bf64a1e9c 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -224,11 +224,11 @@ void RangeHighlighter::fillRangesForErrorBars(
     bool bUsesRangesAsErrorBars = false;
     try
     {
-        sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE;
+        sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE;
         bUsesRangesAsErrorBars =
             ( xErrorBar.is() &&
               (xErrorBar->getPropertyValue( "ErrorBarStyle") >>= nStyle) &&
-              nStyle == ::com::sun::star::chart::ErrorBarStyle::FROM_DATA );
+              nStyle == css::chart::ErrorBarStyle::FROM_DATA );
     }
     catch( const uno::Exception & ex )
     {
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index 62489feeec99..04e3160aed18 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -149,7 +149,7 @@ struct StaticRegressionCurveInfoHelper_Initializer
 private:
     static uno::Sequence< Property > lcl_GetPropertySequence()
     {
-        ::std::vector< ::com::sun::star::beans::Property > aProperties;
+        ::std::vector< css::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
         ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
 
diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx
index f09aecd4eddc..5b03c5eaad57 100644
--- a/chart2/source/tools/RegressionCurveModel.hxx
+++ b/chart2/source/tools/RegressionCurveModel.hxx
@@ -39,12 +39,12 @@ namespace chart
 namespace impl
 {
 typedef ::cppu::WeakImplHelper<
-        ::com::sun::star::lang::XServiceInfo,
-        ::com::sun::star::lang::XServiceName,
-        ::com::sun::star::chart2::XRegressionCurve,
-        ::com::sun::star::util::XCloneable,
-        ::com::sun::star::util::XModifyBroadcaster,
-        ::com::sun::star::util::XModifyListener >
+        css::lang::XServiceInfo,
+        css::lang::XServiceName,
+        css::chart2::XRegressionCurve,
+        css::util::XCloneable,
+        css::util::XModifyBroadcaster,
+        css::util::XModifyListener >
     RegressionCurveModel_Base;
 }
 
@@ -65,8 +65,7 @@ public:
         CURVE_TYPE_MOVING_AVERAGE
     };
 
-    RegressionCurveModel( ::com::sun::star::uno::Reference<
-                              ::com::sun::star::uno::XComponentContext > const & xContext,
+    RegressionCurveModel( css::uno::Reference< css::uno::XComponentContext > const & xContext,
                           tCurveType eCurveType );
     RegressionCurveModel( const RegressionCurveModel & rOther );
     virtual ~RegressionCurveModel();
@@ -78,48 +77,47 @@ public:
 
 protected:
     // ____ OPropertySet ____
-    virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(::com::sun::star::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
+        throw(css::beans::UnknownPropertyException) override;
 
     // ____ OPropertySet ____
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
         getPropertySetInfo()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XRegressionCurve ____
-    virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getEquationProperties()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator()
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getEquationProperties()
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setEquationProperties(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xEquationProperties )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertySet >& xEquationProperties )
+        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;
 
     // ____ 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;
 
     using ::cppu::OPropertySetHelper::disposing;
 
@@ -129,14 +127,13 @@ protected:
     void fireModifyEvent();
 
 private:
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::uno::XComponentContext >
+    css::uno::Reference< css::uno::XComponentContext >
                         m_xContext;
 
     const tCurveType    m_eRegressionCurveType;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder;
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xEquationProperties;
+    css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
+    css::uno::Reference< css::beans::XPropertySet > m_xEquationProperties;
 };
 
 // implementations for factory instantiation
@@ -145,15 +142,14 @@ class MeanValueRegressionCurve : public RegressionCurveModel
 {
 public:
     explicit MeanValueRegressionCurve(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::uno::XComponentContext > & xContext );
+        const css::uno::Reference< css::uno::XComponentContext > & xContext );
     explicit MeanValueRegressionCurve(
         const MeanValueRegressionCurve & rOther );
     virtual ~MeanValueRegressionCurve();
 
     // ____ 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;
 
     /// XServiceInfo declarations
     virtual OUString SAL_CALL getImplementationName()
@@ -171,15 +167,15 @@ class LinearRegressionCurve : public RegressionCurveModel
 {
 public:
     explicit LinearRegressionCurve(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::uno::XComponentContext > & xContext );
+        const css::uno::Reference<
+        css::uno::XComponentContext > & xContext );
     explicit LinearRegressionCurve(
         const LinearRegressionCurve & rOther );
     virtual ~LinearRegressionCurve();
 
     // ____ 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;
 
     /// XServiceInfo declarations
     virtual OUString SAL_CALL getImplementationName()
@@ -197,15 +193,15 @@ class LogarithmicRegressionCurve : public RegressionCurveModel
 {
 public:
     explicit LogarithmicRegressionCurve(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::uno::XComponentContext > & xContext );
+        const css::uno::Reference<
+        css::uno::XComponentContext > & xContext );
     explicit LogarithmicRegressionCurve(
         const LogarithmicRegressionCurve & rOther );
     virtual ~LogarithmicRegressionCurve();
 
     // ____ 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;
 
     /// XServiceInfo declarations
     virtual OUString SAL_CALL getImplementationName()
@@ -223,15 +219,14 @@ class ExponentialRegressionCurve : public RegressionCurveModel
 {
 public:
     explicit ExponentialRegressionCurve(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::uno::XComponentContext > & xContext );
+        const css::uno::Reference< css::uno::XComponentContext > & xContext );
     explicit ExponentialRegressionCurve(
         const ExponentialRegressionCurve & rOther );
     virtual ~ExponentialRegressionCurve();
 
     // ____ 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;
 
     /// XServiceInfo declarations
     virtual OUString SAL_CALL getImplementationName()
@@ -249,15 +244,15 @@ class PotentialRegressionCurve : public RegressionCurveModel
 {
 public:
     explicit PotentialRegressionCurve(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::uno::XComponentContext > & xContext );
+        const css::uno::Reference<
+        css::uno::XComponentContext > & xContext );
     explicit PotentialRegressionCurve(
         const PotentialRegressionCurve & rOther );
     virtual ~PotentialRegressionCurve();
 
     // ____ 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;
 
     /// XServiceInfo declarations
     virtual OUString SAL_CALL getImplementationName()
@@ -275,15 +270,14 @@ class PolynomialRegressionCurve : public RegressionCurveModel
 {
 public:
     explicit PolynomialRegressionCurve(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::uno::XComponentContext > & xContext );
+        const css::uno::Reference< css::uno::XComponentContext > & xContext );
     explicit PolynomialRegressionCurve(
         const PolynomialRegressionCurve & rOther );
     virtual ~PolynomialRegressionCurve();
 
     // ____ 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;
 
     /// XServiceInfo declarations
     virtual OUString SAL_CALL getImplementationName()
@@ -301,15 +295,14 @@ class MovingAverageRegressionCurve : public RegressionCurveModel
 {
 public:
     explicit MovingAverageRegressionCurve(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::uno::XComponentContext > & xContext );
+        const css::uno::Reference< css::uno::XComponentContext > & xContext );
     explicit MovingAverageRegressionCurve(
         const MovingAverageRegressionCurve & rOther );
     virtual ~MovingAverageRegressionCurve();
 
     // ____ 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;
 
     /// XServiceInfo declarations
     virtual OUString SAL_CALL getImplementationName()
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index 4804c0c36390..a544fe2a504b 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -142,7 +142,7 @@ struct StaticRegressionEquationInfoHelper_Initializer
 private:
     static uno::Sequence< Property > lcl_GetPropertySequence()
     {
-        ::std::vector< ::com::sun::star::beans::Property > aProperties;
+        ::std::vector< css::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
         ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx
index d996f24f4d7b..b05aa1f4ac94 100644
--- a/chart2/source/tools/RegressionEquation.hxx
+++ b/chart2/source/tools/RegressionEquation.hxx
@@ -40,10 +40,10 @@ namespace impl
 {
 typedef ::cppu::WeakImplHelper<
         css::lang::XServiceInfo,
-        ::com::sun::star::util::XCloneable,
-        ::com::sun::star::util::XModifyBroadcaster,
-        ::com::sun::star::util::XModifyListener,
-        ::com::sun::star::chart2::XTitle >
+        css::util::XCloneable,
+        css::util::XModifyBroadcaster,
+        css::util::XModifyListener,
+        css::chart2::XTitle >
     RegressionEquation_Base;
 }
 
@@ -58,18 +58,18 @@ public:
 
     virtual OUString SAL_CALL
         getImplementationName()
-            throw( ::com::sun::star::uno::RuntimeException, std::exception )
+            throw( css::uno::RuntimeException, std::exception )
         override;
     virtual sal_Bool SAL_CALL
         supportsService( const OUString& ServiceName )
-            throw( ::com::sun::star::uno::RuntimeException, std::exception )
+            throw( css::uno::RuntimeException, std::exception )
         override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
+    virtual css::uno::Sequence< OUString > SAL_CALL
         getSupportedServiceNames()
-            throw( ::com::sun::star::uno::RuntimeException, std::exception )
+            throw( css::uno::RuntimeException, std::exception )
         override;
     static OUString getImplementationName_Static();
-    static ::com::sun::star::uno::Sequence< OUString >
+    static css::uno::Sequence< OUString >
         getSupportedServiceNames_Static();
 
     /// merge XInterface implementations
@@ -79,48 +79,47 @@ protected:
     explicit RegressionEquation( const RegressionEquation & rOther );
 
     // ____ OPropertySet ____
-    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) override;
 
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
         getPropertySetInfo()
-        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;
 
     // ____ 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;
 
     // ____ XTitle ____
-    virtual ::com::sun::star::uno::Sequence<
-        ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XFormattedString > > SAL_CALL getText()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setText( const ::com::sun::star::uno::Sequence<
-                                   ::com::sun::star::uno::Reference<
-                                   ::com::sun::star::chart2::XFormattedString > >& Strings )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<
+        css::uno::Reference< css::chart2::XFormattedString > > SAL_CALL getText()
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setText( const css::uno::Sequence<
+                                   css::uno::Reference<
+                                   css::chart2::XFormattedString > >& Strings )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     using ::cppu::OPropertySetHelper::disposing;
 
@@ -130,11 +129,9 @@ protected:
     void fireModifyEvent();
 
 private:
-    ::com::sun::star::uno::Sequence<
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XFormattedString > > m_aStrings;
+    css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > > m_aStrings;
 
-    ::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/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx
index b25d16594dc0..5ea07e40e925 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -345,11 +345,11 @@ bool StatisticsHelper::hasErrorBars(
     bool bYError /* = true */ )
 {
     Reference< beans::XPropertySet > xErrorBar( getErrorBars( xDataSeries, bYError ));
-    sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE;
+    sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE;
 
     return ( xErrorBar.is() &&
              ( xErrorBar->getPropertyValue( "ErrorBarStyle") >>= nStyle ) &&
-             nStyle != ::com::sun::star::chart::ErrorBarStyle::NONE );
+             nStyle != css::chart::ErrorBarStyle::NONE );
 }
 
 void StatisticsHelper::removeErrorBars(
@@ -359,7 +359,7 @@ void StatisticsHelper::removeErrorBars(
     Reference< beans::XPropertySet > xErrorBar( getErrorBars( xDataSeries, bYError ));
     if ( xErrorBar.is())
         xErrorBar->setPropertyValue( "ErrorBarStyle", uno::makeAny(
-                                         ::com::sun::star::chart::ErrorBarStyle::NONE ));
+                                         css::chart::ErrorBarStyle::NONE ));
 }
 
 bool StatisticsHelper::usesErrorBarRanges(
@@ -367,11 +367,11 @@ bool StatisticsHelper::usesErrorBarRanges(
     bool bYError /* = true */ )
 {
     Reference< beans::XPropertySet > xErrorBar( getErrorBars( xDataSeries, bYError ));
-    sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE;
+    sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE;
 
     return ( xErrorBar.is() &&
              ( xErrorBar->getPropertyValue( "ErrorBarStyle") >>= nStyle ) &&
-             nStyle == ::com::sun::star::chart::ErrorBarStyle::FROM_DATA );
+             nStyle == css::chart::ErrorBarStyle::FROM_DATA );
 }
 
 } //  namespace chart
diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx
index 86efbac5db51..a76f27626ca6 100644
--- a/chart2/source/tools/TitleHelper.cxx
+++ b/chart2/source/tools/TitleHelper.cxx
@@ -364,8 +364,7 @@ void TitleHelper::setCompleteString( const OUString& rNewText
 }
 
 void TitleHelper::removeTitle( TitleHelper::eTitleType nTitleIndex
-                    , const ::com::sun::star::uno::Reference<
-                            ::com::sun::star::frame::XModel >& xModel )
+                    , const css::uno::Reference< css::frame::XModel >& xModel )
 {
     uno::Reference< XTitled > xTitled( lcl_getTitleParent( nTitleIndex, xModel ) );
     if( xTitled.is())
@@ -375,8 +374,7 @@ void TitleHelper::removeTitle( TitleHelper::eTitleType nTitleIndex
 }
 
 bool TitleHelper::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 )
 {
     if( !xTitle.is() )
@@ -397,10 +395,8 @@ bool TitleHelper::getTitleType( eTitleType& rType
 }
 
 bool TitleHelper::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 )
 {
     if( !xTitle.is() || !xModel.is() )
         return false;
diff --git a/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx
index 3a19c1807a99..c6a10ca84620 100644
--- a/chart2/source/tools/WeakListenerAdapter.cxx
+++ b/chart2/source/tools/WeakListenerAdapter.cxx
@@ -29,7 +29,7 @@ namespace chart
 
 WeakModifyListenerAdapter::WeakModifyListenerAdapter(
     const uno::WeakReference< util::XModifyListener > & xListener ) :
-        WeakListenerAdapter< ::com::sun::star::util::XModifyListener >( xListener )
+        WeakListenerAdapter< css::util::XModifyListener >( xListener )
 {}
 
 WeakModifyListenerAdapter::~WeakModifyListenerAdapter()
@@ -45,7 +45,7 @@ void SAL_CALL WeakModifyListenerAdapter::modified( const lang::EventObject& aEve
 
 WeakSelectionChangeListenerAdapter::WeakSelectionChangeListenerAdapter(
     const Reference< view::XSelectionChangeListener > & xListener ) :
-        WeakListenerAdapter< ::com::sun::star::view::XSelectionChangeListener >( xListener )
+        WeakListenerAdapter< css::view::XSelectionChangeListener >( xListener )
 {}
 
 WeakSelectionChangeListenerAdapter::~WeakSelectionChangeListenerAdapter()
diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx
index 19f31c4be9c3..6ac89266bd20 100644
--- a/chart2/source/tools/WrappedIgnoreProperty.cxx
+++ b/chart2/source/tools/WrappedIgnoreProperty.cxx
@@ -58,7 +58,7 @@ Any WrappedIgnoreProperty::getPropertyValue( const Reference< beans::XPropertySe
 }
 
 void WrappedIgnoreProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const
-                        throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)
+                        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
 {
     m_aCurrentValue = m_aDefaultValue;
 }
diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx
index 1aa4f324f483..c664a6ae92ea 100644
--- a/chart2/source/tools/WrappedProperty.cxx
+++ b/chart2/source/tools/WrappedProperty.cxx
@@ -71,7 +71,7 @@ Any WrappedProperty::getPropertyValue( const Reference< beans::XPropertySet >& x
 }
 
 void WrappedProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)
+                        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
 {
     if( xInnerPropertyState.is() && !this->getInnerName().isEmpty() )
         xInnerPropertyState->setPropertyToDefault(this->getInnerName());