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>

28 files changed, 56 insertions, 146 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