From 5755203865f5b42c9d43b6a1d441709319fcb7a5 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 16 Jul 2020 14:06:05 +0200
Subject: compact namespace: chart2

Change-Id: I3c9f42b2fc40d65e573a668ed7c4eb88dc64d22b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98904
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 chart2/source/inc/BaseGFXHelper.hxx               |  7 ++--
 chart2/source/inc/ChartTypeDialogController.hxx   | 44 +++--------------------
 chart2/source/inc/ChartTypeTemplateProvider.hxx   | 11 +-----
 chart2/source/inc/CloneHelper.hxx                 |  7 ++--
 chart2/source/inc/CommonFunctors.hxx              |  7 ++--
 chart2/source/inc/DataSeriesHelper.hxx            |  8 ++---
 chart2/source/inc/DisposeHelper.hxx               |  6 ++--
 chart2/source/inc/ModifyListenerHelper.hxx        |  7 ++--
 chart2/source/inc/RegressionCalculationHelper.hxx |  7 ++--
 chart2/source/inc/RegressionCurveHelper.hxx       |  6 +---
 chart2/source/inc/StatisticsHelper.hxx            |  6 +---
 chart2/source/inc/XMLRangeHelper.hxx              |  7 ++--
 12 files changed, 23 insertions(+), 100 deletions(-)

(limited to 'chart2/source/inc')

diff --git a/chart2/source/inc/BaseGFXHelper.hxx b/chart2/source/inc/BaseGFXHelper.hxx
index 014371bfa20e..56713266b2bb 100644
--- a/chart2/source/inc/BaseGFXHelper.hxx
+++ b/chart2/source/inc/BaseGFXHelper.hxx
@@ -34,9 +34,7 @@
 namespace com::sun::star::awt { struct Rectangle; }
 namespace com::sun::star::drawing { struct PolyPolygonShape3D; }
 
-namespace chart
-{
-namespace BaseGFXHelper
+namespace chart::BaseGFXHelper
 {
 
 OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DRange getBoundVolume( const css::drawing::PolyPolygonShape3D& rPolyPoly );
@@ -80,8 +78,7 @@ OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DTuple GetScaleFromMatrix(
 
 void ReduceToRotationMatrix( ::basegfx::B3DHomMatrix & rB3DMatrix );
 
-} //  namespace BaseGFXHelper
-} //  namespace chart
+} //  namespace chart::BaseGFXHelper
 
 // INCLUDED_CHART2_SOURCE_INC_BASEGFXHELPER_HXX
 #endif
diff --git a/chart2/source/inc/ChartTypeDialogController.hxx b/chart2/source/inc/ChartTypeDialogController.hxx
index f65ce90a5008..018e6cfc8b0a 100644
--- a/chart2/source/inc/ChartTypeDialogController.hxx
+++ b/chart2/source/inc/ChartTypeDialogController.hxx
@@ -30,58 +30,22 @@
 #include <com/sun/star/chart2/CurveStyle.hpp>
 #include <vcl/weld.hxx>
 
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace beans
+namespace com::sun::star::beans
 {
 class XPropertySet;
 }
-}
-}
-}
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace chart2
+namespace com::sun::star::chart2
 {
 class XChartDocument;
 }
-}
-}
-}
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace chart2
+namespace com::sun::star::chart2
 {
 class XChartTypeTemplate;
 }
-}
-}
-}
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace lang
+namespace com::sun::star::lang
 {
 class XMultiServiceFactory;
 }
-}
-}
-}
 
 class ValueSet;
 
diff --git a/chart2/source/inc/ChartTypeTemplateProvider.hxx b/chart2/source/inc/ChartTypeTemplateProvider.hxx
index fc4517d1bc4e..0d57cbed9de8 100644
--- a/chart2/source/inc/ChartTypeTemplateProvider.hxx
+++ b/chart2/source/inc/ChartTypeTemplateProvider.hxx
@@ -22,19 +22,10 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace chart2
+namespace com::sun::star::chart2
 {
 class XChartTypeTemplate;
 }
-}
-}
-}
 
 namespace chart
 {
diff --git a/chart2/source/inc/CloneHelper.hxx b/chart2/source/inc/CloneHelper.hxx
index da697e05ece4..13b8e9650388 100644
--- a/chart2/source/inc/CloneHelper.hxx
+++ b/chart2/source/inc/CloneHelper.hxx
@@ -25,9 +25,7 @@
 #include <iterator>
 #include <vector>
 
-namespace chart
-{
-namespace CloneHelper
+namespace chart::CloneHelper
 {
 
 /// functor that clones a UNO-Reference
@@ -69,8 +67,7 @@ template< class Interface >
                       CreateRefClone< Interface >());
 }
 
-} //  namespace CloneHelper
-} //  namespace chart
+} //  namespace chart::CloneHelper
 
 // INCLUDED_CHART2_SOURCE_INC_CLONEHELPER_HXX
 #endif
diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx
index 10d32f5bf0e1..ccdfd1a4ee98 100644
--- a/chart2/source/inc/CommonFunctors.hxx
+++ b/chart2/source/inc/CommonFunctors.hxx
@@ -25,9 +25,7 @@
 #include <rtl/ustring.hxx>
 #include "charttoolsdllapi.hxx"
 
-namespace chart
-{
-namespace CommonFunctors
+namespace chart::CommonFunctors
 {
 
 /** unary function to convert any type T into a css::uno::Any.
@@ -124,8 +122,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS DoubleToOUString
     }
 };
 
-} //  namespace CommonFunctors
-} //  namespace chart
+} //  namespace chart::CommonFunctors
 
 // INCLUDED_CHART2_SOURCE_INC_COMMONFUNCTORS_HXX
 #endif
diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx
index c6fba94de6c7..06462d81461b 100644
--- a/chart2/source/inc/DataSeriesHelper.hxx
+++ b/chart2/source/inc/DataSeriesHelper.hxx
@@ -37,10 +37,7 @@ namespace com::sun::star::chart2::data { class XLabeledDataSequence; }
 namespace com::sun::star::uno { class Any; }
 namespace com::sun::star::uno { template <class E> class Sequence; }
 
-namespace chart
-{
-
-namespace DataSeriesHelper
+namespace chart::DataSeriesHelper
 {
 
 OOO_DLLPUBLIC_CHARTTOOLS OUString
@@ -175,8 +172,7 @@ OOO_DLLPUBLIC_CHARTTOOLS void deleteDataLabelsFromSeriesAndAllPoints( const css:
 
 OOO_DLLPUBLIC_CHARTTOOLS void deleteDataLabelsFromPoint( const css::uno::Reference< css::beans::XPropertySet >& xPointPropertySet );
 
-} //  namespace DataSeriesHelper
-} //  namespace chart
+} //  namespace chart::DataSeriesHelper
 
 // INCLUDED_CHART2_SOURCE_INC_DATASERIESHELPER_HXX
 #endif
diff --git a/chart2/source/inc/DisposeHelper.hxx b/chart2/source/inc/DisposeHelper.hxx
index 9f02ca3f8ab4..03ee77c7d0c5 100644
--- a/chart2/source/inc/DisposeHelper.hxx
+++ b/chart2/source/inc/DisposeHelper.hxx
@@ -22,9 +22,7 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/lang/XComponent.hpp>
 
-namespace chart
-{
-namespace DisposeHelper
+namespace chart::DisposeHelper
 {
 
 template<class T>
@@ -51,7 +49,7 @@ void DisposeAllElements(Container & rContainer)
     }
 }
 
-}} //  namespace chart::DisposeHelper
+} //  namespace chart::DisposeHelper
 
 #endif // INCLUDED_CHART2_SOURCE_INC_DISPOSEHELPER_HXX
 
diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx
index 29c4106f538f..49b51b0d466d 100644
--- a/chart2/source/inc/ModifyListenerHelper.hxx
+++ b/chart2/source/inc/ModifyListenerHelper.hxx
@@ -32,9 +32,7 @@
 namespace com::sun::star::uno { class XWeak; }
 namespace com::sun::star::uno { template <class interface_type> class WeakReference; }
 
-namespace chart
-{
-namespace ModifyListenerHelper
+namespace chart::ModifyListenerHelper
 {
 
 css::uno::Reference< css::util::XModifyListener > createModifyEventForwarder();
@@ -257,8 +255,7 @@ void removeListenerFromAllSequenceElements(
                          impl::removeListenerFunctor< T >( xListener ));
 }
 
-} //  namespace ModifyListenerHelper
-} //  namespace chart
+} //  namespace chart::ModifyListenerHelper
 
 // INCLUDED_CHART2_SOURCE_INC_MODIFYLISTENERHELPER_HXX
 #endif
diff --git a/chart2/source/inc/RegressionCalculationHelper.hxx b/chart2/source/inc/RegressionCalculationHelper.hxx
index a5b2b3b16975..0060fc6f6732 100644
--- a/chart2/source/inc/RegressionCalculationHelper.hxx
+++ b/chart2/source/inc/RegressionCalculationHelper.hxx
@@ -26,9 +26,7 @@
 #include <utility>
 #include <vector>
 
-namespace chart
-{
-namespace RegressionCalculationHelper
+namespace chart::RegressionCalculationHelper
 {
 
 typedef std::pair< std::vector< double >, std::vector< double > > tDoubleVectorPair;
@@ -133,8 +131,7 @@ public:
     }
 };
 
-} //  namespace RegressionCalculationHelper
-} //  namespace chart
+} //  namespace chart::RegressionCalculationHelper
 
 // INCLUDED_CHART2_SOURCE_INC_REGRESSIONCALCULATIONHELPER_HXX
 #endif
diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx
index 8fa4071471d0..532322b5b103 100644
--- a/chart2/source/inc/RegressionCurveHelper.hxx
+++ b/chart2/source/inc/RegressionCurveHelper.hxx
@@ -33,10 +33,7 @@ namespace com::sun::star::chart2 { class XRegressionCurveContainer; }
 namespace com::sun::star::chart2::data { class XDataSource; }
 namespace com::sun::star::frame { class XModel; }
 
-namespace chart
-{
-
-namespace RegressionCurveHelper
+namespace chart::RegressionCurveHelper
 {
     /// returns a model mean-value line
     css::uno::Reference<css::chart2::XRegressionCurve> createMeanValueLine();
@@ -175,7 +172,6 @@ namespace RegressionCurveHelper
         const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve );
 
     OOO_DLLPUBLIC_CHARTTOOLS bool hasEquation(const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve );
-}
 
 } //  namespace chart
 
diff --git a/chart2/source/inc/StatisticsHelper.hxx b/chart2/source/inc/StatisticsHelper.hxx
index d9793456917f..3e6b84a5997f 100644
--- a/chart2/source/inc/StatisticsHelper.hxx
+++ b/chart2/source/inc/StatisticsHelper.hxx
@@ -31,10 +31,7 @@ namespace com::sun::star::chart2::data { class XDataSource; }
 namespace com::sun::star::chart2::data { class XLabeledDataSequence; }
 namespace com::sun::star::uno { template <typename > class Sequence; }
 
-namespace chart
-{
-
-namespace StatisticsHelper
+namespace chart::StatisticsHelper
 {
     /** Calculates 1/n * sum (x_i - x_mean)^2.
 
@@ -97,7 +94,6 @@ namespace StatisticsHelper
     OOO_DLLPUBLIC_CHARTTOOLS bool usesErrorBarRanges(
         const css::uno::Reference< css::chart2::XDataSeries > & xDataSeries,
         bool bYError = true );
-}
 
 } //  namespace chart
 
diff --git a/chart2/source/inc/XMLRangeHelper.hxx b/chart2/source/inc/XMLRangeHelper.hxx
index 207770dbbed9..d17dc76cce3f 100644
--- a/chart2/source/inc/XMLRangeHelper.hxx
+++ b/chart2/source/inc/XMLRangeHelper.hxx
@@ -23,9 +23,7 @@
 #include <rtl/ustring.hxx>
 #include "charttoolsdllapi.hxx"
 
-namespace chart
-{
-namespace XMLRangeHelper
+namespace chart::XMLRangeHelper
 {
 
 struct OOO_DLLPUBLIC_CHARTTOOLS Cell
@@ -58,8 +56,7 @@ CellRange getCellRangeFromXMLString( const OUString & rXMLString );
 
 OUString getXMLStringFromCellRange( const CellRange & rRange );
 
-} //  namespace XMLRangeHelper
-} //  namespace chart
+} //  namespace chart::XMLRangeHelper
 
 // INCLUDED_CHART2_SOURCE_INC_XMLRANGEHELPER_HXX
 #endif
-- 
cgit