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>

55 files changed, 105 insertions, 323 deletions

diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
index a0ea50f677e6..ebaeca27cddc 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
@@ -28,10 +28,7 @@
 
 #include <memory>
 
-namespace chart
-{
-
-namespace wrapper
+namespace chart::wrapper
 {
 
 class Chart2ModelContact;
@@ -79,8 +76,7 @@ private:
     ::comphelper::OInterfaceContainerHelper2      m_aEventListenerContainer;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_AREAWRAPPER_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
index b6770a5a2489..6d3fe9016f7a 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
@@ -33,9 +33,7 @@
 
 namespace com::sun::star::chart2 { class XAxis; }
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 class Chart2ModelContact;
 
@@ -121,8 +119,7 @@ private: //member
     css::uno::Reference< css::beans::XPropertySet >   m_xMinorGrid;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_AXISWRAPPER_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
index 55bb8c63b3e8..d524ea191ccc 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
@@ -30,9 +30,7 @@
 
 #include <memory>
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class Chart2ModelContact;
@@ -116,8 +114,7 @@ private:
     ::comphelper::OInterfaceContainerHelper2      m_aEventListenerContainer;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_CHARTDATAWRAPPER_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
index 98317470c1ea..a5c5818ba8eb 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
@@ -32,10 +32,7 @@
 
 namespace com::sun::star::chart2 { class XDataSeries; }
 
-namespace chart
-{
-
-namespace wrapper
+namespace chart::wrapper
 {
 
 class Chart2ModelContact;
@@ -122,8 +119,7 @@ private:
     css::uno::Reference< css::chart2::XDataSeries >     m_xDataSeries;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_DATASERIESPOINTWRAPPER_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
index ca7d8ca89acc..4f4d4ae9f9a7 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
@@ -41,9 +41,7 @@
 namespace com::sun::star::chart2 { class XDiagram; }
 namespace com::sun::star::lang { class XEventListener; }
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class Chart2ModelContact;
@@ -215,8 +213,7 @@ private:
         css::beans::XPropertySet > m_xDownBarWrapper;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_DIAGRAMWRAPPER_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
index 275d28279d0f..2ec99b560bf6 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
@@ -27,9 +27,7 @@
 
 #include <memory>
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class Chart2ModelContact;
@@ -79,8 +77,7 @@ private:
     tGridType           m_eType;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_GRIDWRAPPER_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
index b614b55cae5a..b0c0b9660d03 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
@@ -29,10 +29,7 @@
 
 #include <memory>
 
-namespace chart
-{
-
-namespace wrapper
+namespace chart::wrapper
 {
 
 class Chart2ModelContact;
@@ -86,8 +83,7 @@ private:
     ::comphelper::OInterfaceContainerHelper2      m_aEventListenerContainer;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_LEGENDWRAPPER_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
index 72966ee04a8f..ed2d40e9e9c4 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
@@ -33,10 +33,7 @@
 
 #include <memory>
 
-namespace chart
-{
-
-namespace wrapper
+namespace chart::wrapper
 {
 
 class Chart2ModelContact;
@@ -103,8 +100,7 @@ private: //member
     WrappedIgnoreProperty               m_aWrappedLineJointProperty;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_MINMAXLINEWRAPPER_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx b/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx
index 432f3123c5b8..84b389bcc9ac 100644
--- a/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx
+++ b/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx
@@ -21,9 +21,7 @@
 
 #include <com/sun/star/awt/Size.hpp>
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 class ReferenceSizePropertyProvider
 {
@@ -36,8 +34,7 @@ protected:
     ~ReferenceSizePropertyProvider() {}
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_REFERENCESIZEPROPERTYPROVIDER_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
index e1e7282af13c..7eb732d3243e 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
@@ -33,9 +33,7 @@
 namespace chart::wrapper { class Chart2ModelContact; }
 namespace com::sun::star::chart2 { class XTitle; }
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class TitleWrapper final : public ::cppu::ImplInheritanceHelper<
@@ -108,8 +106,7 @@ private:
     ::chart::TitleHelper::eTitleType        m_eTitleType;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_TITLEWRAPPER_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
index a1b455bcc888..e08b1cd909b7 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
@@ -32,10 +32,7 @@
 
 #include <memory>
 
-namespace chart
-{
-
-namespace wrapper
+namespace chart::wrapper
 {
 
 class Chart2ModelContact;
@@ -104,8 +101,7 @@ private: //member
     OUString       m_aPropertySetName;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_UPDOWNBARWRAPPER_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
index 2a79c211ea42..61b1a295fde0 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
@@ -27,10 +27,7 @@
 
 #include <memory>
 
-namespace chart
-{
-
-namespace wrapper
+namespace chart::wrapper
 {
 
 class Chart2ModelContact;
@@ -68,8 +65,7 @@ private:
     bool m_bWall;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WALLFLOORWRAPPER_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx
index 0cf59813467b..bcd9b00d0611 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx
@@ -23,9 +23,7 @@
 
 namespace chart::wrapper { class ChartDocumentWrapper; }
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class WrappedAddInProperty : public WrappedProperty
@@ -84,9 +82,8 @@ private:
     ChartDocumentWrapper& m_rChartDocumentWrapper;
 };
 
-} //namespace wrapper
 
-} //namespace chart
+} //namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDADDINPROPERTY_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx
index 35a00856c0df..6fa1ef54c17c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx
@@ -27,9 +27,7 @@
 namespace chart { class WrappedProperty; }
 namespace com::sun::star::beans { struct Property; }
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class WrappedAutomaticPositionProperties
@@ -39,8 +37,7 @@ public:
     static void addWrappedProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList );
 };
 
-} //namespace wrapper
-} //namespace chart
+} //namespace chart::wrapper
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx
index cfc6273454ef..6de57c652862 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx
@@ -26,9 +26,7 @@
 namespace chart { class WrappedProperty; }
 namespace chart::wrapper { class Chart2ModelContact; }
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class WrappedAxisAndGridExistenceProperties
@@ -52,8 +50,7 @@ public:
        , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact );
 };
 
-} //namespace wrapper
-} //namespace chart
+} //namespace chart::wrapper
 
 #endif // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDAXISANDGRIDEXISTENCEPROPERTIES_HXX
 
diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx
index 5e43b37aee17..457906d497f6 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx
@@ -23,9 +23,7 @@
 
 #include <vector>
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class ReferenceSizePropertyProvider;
@@ -75,8 +73,7 @@ public:
     virtual ~WrappedComplexCharacterHeightProperty() override;
 };
 
-} //namespace wrapper
-} //namespace chart
+} //namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDCHARACTERHEIGHTPROPERTY_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx
index 7180f7e19a43..9e77750e41e4 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx
@@ -27,9 +27,7 @@ namespace chart { class WrappedProperty; }
 namespace chart::wrapper { class Chart2ModelContact; }
 namespace com::sun::star::beans { struct Property; }
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class WrappedDataCaptionProperties
@@ -42,8 +40,7 @@ public:
                                     , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact );
 };
 
-} //namespace wrapper
-} //namespace chart
+} //namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDDATACAPTIONPROPERTIES_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
index a20a4bbc32b0..be5ed7440a62 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
@@ -25,9 +25,7 @@
 
 namespace chart::wrapper { class Chart2ModelContact; }
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class WrappedBarPositionProperty_Base : public WrappedDefaultProperty
@@ -71,8 +69,7 @@ public:
     virtual ~WrappedBarOverlapProperty() override;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDGAPWIDTHPROPERTY_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
index 59bb1f3b1dcb..24ed85bc2e53 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
@@ -25,9 +25,7 @@
 
 namespace chart::wrapper { class Chart2ModelContact; }
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 
@@ -62,8 +60,7 @@ public:
 
 };
 
-} //namespace wrapper
-} //namespace chart
+} //namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDNUMBERFORMATPROPERTY_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
index e62b5f7021f8..f4f37cfb71a3 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
@@ -26,9 +26,7 @@
 
 namespace chart::wrapper { class Chart2ModelContact; }
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class WrappedScaleProperty final : public WrappedProperty
@@ -81,8 +79,7 @@ private:
     mutable css::uno::Any m_aOuterValue;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSCALEPROPERTY_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx
index 85748851a651..958b5f55daab 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx
@@ -27,9 +27,7 @@ namespace chart { class WrappedProperty; }
 namespace chart::wrapper { class Chart2ModelContact; }
 namespace com::sun::star::beans { struct Property; }
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class WrappedScaleTextProperties
@@ -40,7 +38,6 @@ public:
                     , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact );
 };
 
-} //namespace wrapper
-} //namespace chart
+} //namespace chart::wrapper
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx
index 6b7ae6416d81..64832312af4c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx
@@ -26,9 +26,7 @@
 
 namespace chart::wrapper { class Chart2ModelContact; }
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class WrappedSceneProperty
@@ -53,8 +51,7 @@ private:
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
 };
 
-} //namespace wrapper
-} //namespace chart
+} //namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSCENEPROPERTY_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx
index 2c3eff9da827..712a8d6b330a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx
@@ -21,9 +21,7 @@
 
 #include <WrappedProperty.hxx>
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class DataSeriesPointWrapper;
@@ -43,8 +41,7 @@ private:
     OUString m_aInnerLineTypeName;
 };
 
-} //namespace wrapper
-} //namespace chart
+} //namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSERIESAREAORLINEPROPERTY_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
index 26c260ffc0b3..3de21616b6f9 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
@@ -28,9 +28,7 @@
 
 namespace com::sun::star::chart2 { class XDataSeries; }
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 enum tSeriesOrDiagramPropertyType
@@ -164,8 +162,7 @@ protected:
     tSeriesOrDiagramPropertyType               m_ePropertyType;
 };
 
-} //namespace wrapper
-} //namespace chart
+} //namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSERIESORDIAGRAMPROPERTY_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx
index d52c102c0fca..caebba0758c2 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx
@@ -27,9 +27,7 @@ namespace chart { class WrappedProperty; }
 namespace chart::wrapper { class Chart2ModelContact; }
 namespace com::sun::star::beans { struct Property; }
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class WrappedSplineProperties
@@ -40,8 +38,7 @@ public:
                                     , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact );
 };
 
-} //namespace wrapper
-} //namespace chart
+} //namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSPLINEPROPERTIES_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx
index 774d7a6da31b..c5e85100080c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx
@@ -27,9 +27,7 @@ namespace chart { class WrappedProperty; }
 namespace chart::wrapper { class Chart2ModelContact; }
 namespace com::sun::star::beans { struct Property; }
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class WrappedStatisticProperties
@@ -42,8 +40,7 @@ public:
                     , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact );
 };
 
-} //namespace wrapper
-} //namespace chart
+} //namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSTATISTICPROPERTIES_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx
index 1cc9d579bc1d..19fcf8dafebe 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx
@@ -27,9 +27,7 @@ namespace chart { class WrappedProperty; }
 namespace chart::wrapper { class Chart2ModelContact; }
 namespace com::sun::star::beans { struct Property; }
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class WrappedStockProperties
@@ -40,8 +38,7 @@ public:
             , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact );
 };
 
-} //namespace wrapper
-} //namespace chart
+} //namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSTOCKPROPERTIES_HXX
 #endif
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx
index d8eca1a938f6..0584d094fca5 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx
@@ -27,9 +27,7 @@ namespace chart { class WrappedProperty; }
 namespace chart::wrapper { class Chart2ModelContact; }
 namespace com::sun::star::beans { struct Property; }
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class WrappedSymbolProperties
@@ -42,8 +40,7 @@ public:
                     , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact );
 };
 
-} //namespace wrapper
-} //namespace chart
+} //namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSYMBOLPROPERTIES_HXX
 #endif
diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
index 9f36c42b3a2f..56a05056c1fa 100644
--- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx
+++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
@@ -33,10 +33,7 @@
 namespace com::sun::star::uno { class XComponentContext; }
 namespace com::sun::star::util { class XRefreshable; }
 
-namespace chart
-{
-
-namespace wrapper
+namespace chart::wrapper
 {
 
 class Chart2ModelContact;
@@ -167,8 +164,7 @@ private: //member
     bool                                          m_bIsDisposed;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // CHART_CHARTDOCUMENT_HXX
 #endif
diff --git a/chart2/source/controller/inc/ConfigurationAccess.hxx b/chart2/source/controller/inc/ConfigurationAccess.hxx
index 416ae72fe832..404e3ea6723c 100644
--- a/chart2/source/controller/inc/ConfigurationAccess.hxx
+++ b/chart2/source/controller/inc/ConfigurationAccess.hxx
@@ -22,10 +22,7 @@
 
 #include <tools/fldunit.hxx>
 
-namespace chart
-{
-
-namespace ConfigurationAccess
+namespace chart::ConfigurationAccess
 {
     /** @descr Retrieve the FieldUnit to be used for the UI.  This unit is retrieved
     from the registry settings of the Calc application.
@@ -36,7 +33,6 @@ namespace ConfigurationAccess
     @return the FieldUnit enum.  See <vcl/fldunit.hxx> for definition
     */
     FieldUnit getFieldUnit();
-}
 
 } //namespace chart
 #endif
diff --git a/chart2/source/controller/inc/ErrorBarItemConverter.hxx b/chart2/source/controller/inc/ErrorBarItemConverter.hxx
index 691ca508a172..aea992e5da6b 100644
--- a/chart2/source/controller/inc/ErrorBarItemConverter.hxx
+++ b/chart2/source/controller/inc/ErrorBarItemConverter.hxx
@@ -27,9 +27,7 @@ namespace com::sun::star::lang { class XMultiServiceFactory; }
 
 class SdrModel;
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class ErrorBarItemConverter : public ItemConverter
@@ -58,8 +56,7 @@ private:
     css::uno::Reference< css::frame::XModel >  m_xModel;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 #endif // INCLUDED_CHART2_SOURCE_CONTROLLER_INC_ERRORBARITEMCONVERTER_HXX
 
diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
index 1fcc4f2244ce..55f2f023bcf6 100644
--- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
@@ -25,9 +25,7 @@ namespace com::sun::star::lang { class XMultiServiceFactory; }
 
 class SdrModel;
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 enum class GraphicObjectType
@@ -62,8 +60,7 @@ private:
     css::uno::Reference< css::lang::XMultiServiceFactory >  m_xNamedPropertyTableFactory;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_INC_GRAPHICPROPERTYITEMCONVERTER_HXX
 #endif
diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx
index 74de6cd62cc5..03b92587e90a 100644
--- a/chart2/source/controller/inc/LegendItemConverter.hxx
+++ b/chart2/source/controller/inc/LegendItemConverter.hxx
@@ -28,9 +28,7 @@ namespace com::sun::star::lang { class XMultiServiceFactory; }
 
 class SdrModel;
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class LegendItemConverter : public ItemConverter
@@ -59,8 +57,7 @@ private:
     std::vector< std::unique_ptr<ItemConverter> >    m_aConverters;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_INC_LEGENDITEMCONVERTER_HXX
 #endif
diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
index 73e67900ec8d..3331cc78ea13 100644
--- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
@@ -26,9 +26,7 @@ namespace com::sun::star::lang { class XMultiServiceFactory; }
 
 class SdrModel;
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class RegressionCurveItemConverter : public ItemConverter
@@ -57,8 +55,7 @@ private:
     css::uno::Reference< css::chart2::XRegressionCurveContainer >  m_xCurveContainer;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_INC_REGRESSIONCURVEITEMCONVERTER_HXX
 #endif
diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
index 2be1490ee997..18a0060dcf00 100644
--- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
+++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
@@ -26,9 +26,7 @@ namespace com::sun::star::chart2 { class XCoordinateSystem; }
 namespace com::sun::star::frame { class XModel; }
 namespace com::sun::star::uno { class XComponentContext; }
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class SeriesOptionsItemConverter : public ItemConverter
@@ -78,8 +76,7 @@ private:
     bool m_bHideLegendEntry;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_INC_SERIESOPTIONSITEMCONVERTER_HXX
 #endif
diff --git a/chart2/source/controller/inc/StatisticsItemConverter.hxx b/chart2/source/controller/inc/StatisticsItemConverter.hxx
index 00760488fa25..9cb3af86cb55 100644
--- a/chart2/source/controller/inc/StatisticsItemConverter.hxx
+++ b/chart2/source/controller/inc/StatisticsItemConverter.hxx
@@ -23,9 +23,7 @@
 
 namespace com::sun::star::frame { class XModel; }
 
-namespace chart
-{
-namespace wrapper
+namespace chart::wrapper
 {
 
 class StatisticsItemConverter : public ItemConverter
@@ -48,8 +46,7 @@ private:
     css::uno::Reference< css::frame::XModel >  m_xModel;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} //  namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_INC_STATISTICSITEMCONVERTER_HXX
 #endif
diff --git a/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx b/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx
index 9efe382e2761..c22f9d3e6987 100644
--- a/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx
+++ b/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx
@@ -13,8 +13,7 @@
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <cppuhelper/implbase.hxx>
 
-namespace chart {
-namespace sidebar {
+namespace chart::sidebar {
 
 class ChartSidebarModifyListenerParent
 {
@@ -41,7 +40,7 @@ private:
     ChartSidebarModifyListenerParent* mpParent;
 };
 
-} }
+}
 
 #endif
 
diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx
index 84efd0323fc5..29741f6a26c0 100644
--- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx
+++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx
@@ -17,8 +17,7 @@
 
 #include <vector>
 
-namespace chart {
-namespace sidebar {
+namespace chart::sidebar {
 
 class ChartSidebarSelectionListenerParent
 {
@@ -50,7 +49,7 @@ private:
     std::vector<ObjectType> maTypes;
 };
 
-} }
+}
 
 #endif
 
diff --git a/chart2/source/controller/sidebar/ChartTypePanel.hxx b/chart2/source/controller/sidebar/ChartTypePanel.hxx
index 0186cf6419b9..6e0903f334fb 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.hxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.hxx
@@ -28,19 +28,10 @@
 #include <ChartTypeTemplateProvider.hxx>
 #include <TimerTriggeredControllerLock.hxx>
 
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace util
+namespace com::sun::star::util
 {
 class XModifyListener;
 }
-}
-}
-}
 
 namespace weld
 {
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
diff --git a/chart2/source/model/main/DataSeriesProperties.hxx b/chart2/source/model/main/DataSeriesProperties.hxx
index 331396b49f60..e20602baf45f 100644
--- a/chart2/source/model/main/DataSeriesProperties.hxx
+++ b/chart2/source/model/main/DataSeriesProperties.hxx
@@ -26,10 +26,7 @@
 
 namespace com::sun::star::beans { struct Property; }
 
-namespace chart
-{
-
-namespace DataSeriesProperties
+namespace chart::DataSeriesProperties
 {
     enum
     {
@@ -45,7 +42,6 @@ namespace DataSeriesProperties
         std::vector< css::beans::Property > & rOutProperties );
 
     void AddDefaultsToMap( tPropertyValueMap & rOutMap );
-}
 
 } //  namespace chart
 
diff --git a/chart2/source/tools/ImplOPropertySet.hxx b/chart2/source/tools/ImplOPropertySet.hxx
index 98dc53b008b0..d2aef768a480 100644
--- a/chart2/source/tools/ImplOPropertySet.hxx
+++ b/chart2/source/tools/ImplOPropertySet.hxx
@@ -28,9 +28,7 @@
 
 namespace com::sun::star::style { class XStyle; }
 
-namespace property
-{
-namespace impl
+namespace property::impl
 {
 
 class ImplOPropertySet
@@ -80,8 +78,7 @@ private:
         m_xStyle;
 };
 
-} //  namespace impl
-} //  namespace chart
+} //  namespace chart::impl
 
 // INCLUDED_CHART2_SOURCE_TOOLS_IMPLOPROPERTYSET_HXX
 #endif
diff --git a/chart2/source/view/inc/ConfigAccess.hxx b/chart2/source/view/inc/ConfigAccess.hxx
index 556b371f1d81..41701d8ef2b0 100644
--- a/chart2/source/view/inc/ConfigAccess.hxx
+++ b/chart2/source/view/inc/ConfigAccess.hxx
@@ -20,9 +20,7 @@
 #ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_CONFIGACCESS_HXX
 #define INCLUDED_CHART2_SOURCE_VIEW_INC_CONFIGACCESS_HXX
 
-namespace chart
-{
-namespace ConfigAccess
+namespace chart::ConfigAccess
 {
 /** @descr Retrieve the setting for showing errors in charts from the registry
     settings of the Calc application.
@@ -32,9 +30,8 @@ namespace ConfigAccess
     @return boolean UseErrorRectangle.
     */
 bool getUseErrorRectangle();
-}
 
-} //namespace chart
+} //namespace chart::ConfigAccess
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/VLegendSymbolFactory.hxx b/chart2/source/view/inc/VLegendSymbolFactory.hxx
index 96eb58782ec9..370ca9477861 100644
--- a/chart2/source/view/inc/VLegendSymbolFactory.hxx
+++ b/chart2/source/view/inc/VLegendSymbolFactory.hxx
@@ -29,10 +29,7 @@ namespace com::sun::star::drawing { class XShapes; }
 namespace com::sun::star::lang { class XMultiServiceFactory; }
 namespace com::sun::star::uno { class Any; }
 
-namespace chart
-{
-
-namespace VLegendSymbolFactory
+namespace chart::VLegendSymbolFactory
 {
     enum class PropertyType
     {
@@ -50,7 +47,6 @@ namespace VLegendSymbolFactory
             const css::uno::Reference< css::beans::XPropertySet > & xLegendEntryProperties,
             PropertyType ePropertyType,
             const css::uno::Any& rExplicitSymbol /*should contain a css::chart2::Symbol without automatic symbol if the charttype does support symbols else empty*/);
-}
 
 } //  namespace chart