compact namespace in canvas..cui

Change-Id: I7bd0c2a55b936896fcfe7e1a374871008a18618f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93706
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

canvas/inc/verifyinput.hxx

@@ -24,7 +24,7 @@
 
 #include <canvas/canvastoolsdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace geometry
+namespace com::sun::star::geometry
 {
     struct RealPoint2D;
     struct RealSize2D;
@@ -35,9 +35,9 @@ namespace com { namespace sun { namespace star { namespace geometry
     struct IntegerPoint2D;
     struct IntegerSize2D;
     struct IntegerRectangle2D;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
 {
     struct RenderState;
     struct StrokeAttributes;
@@ -45,7 +45,7 @@ namespace com { namespace sun { namespace star { namespace rendering
     struct ViewState;
     struct IntegerBitmapLayout;
     struct FontRequest;
-} } } }
+}
 
 namespace com::sun::star::uno { template <class E> class Sequence; }
 

canvas/source/directx/dx_impltools.hxx

@@ -40,18 +40,18 @@ namespace basegfx
     class B2DPolyPolygon;
 };
 
-namespace com { namespace sun { namespace star { namespace geometry
+namespace com::sun::star::geometry
 {
     struct IntegerRectangle2D;
     struct RealPoint2D;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
 {
     class  XBitmap;
     class  XPolyPolygon2D;
     class  XCanvasFont;
-} } } }
+}
 
 
 namespace dxcanvas

canvas/source/directx/dx_textlayout_drawhelper.hxx

@@ -31,9 +31,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/vector/b2isize.hxx>
 
-namespace com { namespace sun { namespace star { namespace rendering {
-    class XCanvasFont;
-} } } }
+namespace com::sun::star::rendering { class XCanvasFont; }
 
 namespace Gdiplus { class Graphics; }
 

canvas/source/opengl/ogl_canvastools.hxx

@@ -15,9 +15,9 @@
 
 #include <epoxy/gl.h>
 
-namespace com { namespace sun { namespace star { namespace rendering {
+namespace com::sun::star::rendering {
     struct ARGBColor;
-}}}}
+}
 namespace basegfx {
     class B2DPolyPolygon;
     class B2DHomMatrix;

canvas/source/opengl/ogl_spritedevicehelper.hxx

@@ -23,10 +23,10 @@
 namespace vcl { class Window; }
 class SystemChildWindow;
 namespace basegfx{ class B2IVector; class B2DHomMatrix; }
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { struct Rectangle; }
     namespace geometry { struct AffineMatrix2D; }
-}}}
+}
 
 namespace oglcanvas
 {

canvas/source/opengl/ogl_texturecache.hxx

@@ -13,9 +13,9 @@
 #include <sal/types.h>
 #include <unordered_map>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace geometry { struct IntegerSize2D; }
-}}}
+}
 
 namespace oglcanvas
 {

canvas/source/vcl/impltools.hxx

@@ -44,31 +44,31 @@ namespace basegfx
     }
 }
 
-namespace com { namespace sun { namespace star { namespace awt
+namespace com::sun::star::awt
 {
     struct Point;
     struct Size;
     struct Rectangle;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace drawing
+namespace com::sun::star::drawing
 {
     struct HomogenMatrix3;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace geometry
+namespace com::sun::star::geometry
 {
     struct RealPoint2D;
     struct RealSize2D;
     struct RealRectangle2D;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
 {
     struct RenderState;
     struct ViewState;
     class  XBitmap;
-} } } }
+}
 
 
 namespace vclcanvas

chart2/inc/ChartModel.hxx

@@ -55,14 +55,14 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace awt { class XRequestCallback; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { class XChartTypeTemplate; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataProvider; } } } } }
-namespace com { namespace sun { namespace star { namespace document { class XFilter; } } } }
-namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XAggregation; } } } }
+namespace com::sun::star::awt { class XRequestCallback; }
+namespace com::sun::star::chart2 { class XChartTypeTemplate; }
+namespace com::sun::star::chart2::data { class XDataProvider; }
+namespace com::sun::star::document { class XFilter; }
+namespace com::sun::star::embed { class XStorage; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::uno { class XAggregation; }
 
 class SvNumberFormatter;
 

chart2/inc/ChartView.hxx

@@ -40,11 +40,11 @@
 
 #include <vcl/timer.hxx>
 
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XUpdatable2; } } } }
+namespace com::sun::star::drawing { class XDrawPage; }
+namespace com::sun::star::drawing { class XShapes; }
+namespace com::sun::star::io { class XOutputStream; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::util { class XUpdatable2; }
 
 class SdrPage;
 

chart2/qa/extras/charttest.hxx

@@ -61,10 +61,10 @@
 using namespace css;
 using namespace css::uno;
 
-namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } }
-namespace com { namespace sun { namespace star { namespace table { class XTableCharts; } } } }
-namespace com { namespace sun { namespace star { namespace table { class XTablePivotCharts; } } } }
+namespace com::sun::star::chart2 { class XDataSeries; }
+namespace com::sun::star::chart2 { class XDiagram; }
+namespace com::sun::star::table { class XTableCharts; }
+namespace com::sun::star::table { class XTablePivotCharts; }
 
 class ChartTest : public test::BootstrapFixture, public unotest::MacrosTest
 {

chart2/source/controller/accessibility/AccessibleChartElement.hxx

@@ -22,9 +22,9 @@
 #include <AccessibleBase.hxx>
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
 
-namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } }
-namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleContext; } } } }
-namespace com { namespace sun { namespace star { namespace awt { class XFont; } } } }
+namespace com::sun::star::accessibility { class XAccessible; }
+namespace com::sun::star::accessibility { class XAccessibleContext; }
+namespace com::sun::star::awt { class XFont; }
 
 namespace chart
 {

chart2/source/controller/chartapiwrapper/AxisWrapper.hxx

@@ -31,7 +31,7 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace chart2 { class XAxis; } } } }
+namespace com::sun::star::chart2 { class XAxis; }
 
 namespace chart
 {

chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx

@@ -28,16 +28,16 @@
 
 namespace chart { struct ExplicitIncrementData; }
 namespace chart { struct ExplicitScaleData; }
-namespace com { namespace sun { namespace star { namespace chart2 { class XAxis; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { class XTitle; } } } }
-namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XUnoTunnel; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::chart2 { class XAxis; }
+namespace com::sun::star::chart2 { class XChartDocument; }
+namespace com::sun::star::chart2 { class XDataSeries; }
+namespace com::sun::star::chart2 { class XDiagram; }
+namespace com::sun::star::chart2 { class XTitle; }
+namespace com::sun::star::container { class XNameContainer; }
+namespace com::sun::star::drawing { class XDrawPage; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::lang { class XUnoTunnel; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 
 namespace chart

chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx

@@ -30,7 +30,7 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } }
+namespace com::sun::star::chart2 { class XDataSeries; }
 
 namespace chart
 {

chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx

@@ -38,8 +38,8 @@
 #include <com/sun/star/chart/X3DDefaultSetter.hpp>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XEventListener; } } } }
+namespace com::sun::star::chart2 { class XDiagram; }
+namespace com::sun::star::lang { class XEventListener; }
 
 namespace chart
 {

chart2/source/controller/chartapiwrapper/TitleWrapper.hxx

@@ -30,8 +30,8 @@
 
 #include <memory>
 
-namespace chart { namespace wrapper { class Chart2ModelContact; } }
-namespace com { namespace sun { namespace star { namespace chart2 { class XTitle; } } } }
+namespace chart::wrapper { class Chart2ModelContact; }
+namespace com::sun::star::chart2 { class XTitle; }
 
 namespace chart
 {

chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx

@@ -21,7 +21,7 @@
 
 #include <WrappedProperty.hxx>
 
-namespace chart { namespace wrapper { class ChartDocumentWrapper; } }
+namespace chart::wrapper { class ChartDocumentWrapper; }
 
 namespace chart
 {

chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx

@@ -25,7 +25,7 @@
 #include <vector>
 
 namespace chart { class WrappedProperty; }
-namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } }
+namespace com::sun::star::beans { struct Property; }
 
 namespace chart
 {

chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx

@@ -24,7 +24,7 @@
 #include <vector>
 
 namespace chart { class WrappedProperty; }
-namespace chart { namespace wrapper { class Chart2ModelContact; } }
+namespace chart::wrapper { class Chart2ModelContact; }
 
 namespace chart
 {

chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx

@@ -24,8 +24,8 @@
 #include <vector>
 
 namespace chart { class WrappedProperty; }
-namespace chart { namespace wrapper { class Chart2ModelContact; } }
-namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } }
+namespace chart::wrapper { class Chart2ModelContact; }
+namespace com::sun::star::beans { struct Property; }
 
 namespace chart
 {

chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx

@@ -23,7 +23,7 @@
 
 #include <memory>
 
-namespace chart { namespace wrapper { class Chart2ModelContact; } }
+namespace chart::wrapper { class Chart2ModelContact; }
 
 namespace chart
 {

chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx

@@ -23,7 +23,7 @@
 
 #include <memory>
 
-namespace chart { namespace wrapper { class Chart2ModelContact; } }
+namespace chart::wrapper { class Chart2ModelContact; }
 
 namespace chart
 {

chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx

@@ -24,7 +24,7 @@
 #include <memory>
 #include <vector>
 
-namespace chart { namespace wrapper { class Chart2ModelContact; } }
+namespace chart::wrapper { class Chart2ModelContact; }
 
 namespace chart
 {

chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx

@@ -24,8 +24,8 @@
 #include <vector>
 
 namespace chart { class WrappedProperty; }
-namespace chart { namespace wrapper { class Chart2ModelContact; } }
-namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } }
+namespace chart::wrapper { class Chart2ModelContact; }
+namespace com::sun::star::beans { struct Property; }
 
 namespace chart
 {

chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx

@@ -24,7 +24,7 @@
 #include <memory>
 #include <vector>
 
-namespace chart { namespace wrapper { class Chart2ModelContact; } }
+namespace chart::wrapper { class Chart2ModelContact; }
 
 namespace chart
 {

chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx

@@ -26,7 +26,7 @@
 #include <memory>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } }
+namespace com::sun::star::chart2 { class XDataSeries; }
 
 namespace chart
 {

chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx

@@ -24,8 +24,8 @@
 #include <vector>
 
 namespace chart { class WrappedProperty; }
-namespace chart { namespace wrapper { class Chart2ModelContact; } }
-namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } }
+namespace chart::wrapper { class Chart2ModelContact; }
+namespace com::sun::star::beans { struct Property; }
 
 namespace chart
 {

chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx

@@ -24,8 +24,8 @@
 #include <vector>
 
 namespace chart { class WrappedProperty; }
-namespace chart { namespace wrapper { class Chart2ModelContact; } }
-namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } }
+namespace chart::wrapper { class Chart2ModelContact; }
+namespace com::sun::star::beans { struct Property; }
 
 namespace chart
 {

chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx

@@ -24,8 +24,8 @@
 #include <vector>
 
 namespace chart { class WrappedProperty; }
-namespace chart { namespace wrapper { class Chart2ModelContact; } }
-namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } }
+namespace chart::wrapper { class Chart2ModelContact; }
+namespace com::sun::star::beans { struct Property; }
 
 namespace chart
 {

chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx

@@ -24,8 +24,8 @@
 #include <vector>
 
 namespace chart { class WrappedProperty; }
-namespace chart { namespace wrapper { class Chart2ModelContact; } }
-namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } }
+namespace chart::wrapper { class Chart2ModelContact; }
+namespace com::sun::star::beans { struct Property; }
 
 namespace chart
 {

chart2/source/controller/dialogs/DataBrowser.hxx

@@ -27,16 +27,16 @@
 #include <memory>
 #include <vector>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt {
         class XWindow;
     }
     namespace chart2 {
         class XChartDocument;
     }
-}}}
+}
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
 class OutputDevice;
 

chart2/source/controller/dialogs/DataBrowserModel.hxx

@@ -24,13 +24,13 @@
 #include <memory>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::chart2 { class XChartDocument; }
+namespace com::sun::star::uno { class XComponentContext; }
 
-namespace com { namespace sun { namespace star { namespace chart2 {
+namespace com::sun::star::chart2 {
     class XDataSeries;
     class XChartType;
-}}}}
+}
 
 namespace chart
 {

chart2/source/controller/dialogs/DialogModel.hxx

@@ -27,13 +27,13 @@
 #include <vector>
 
 namespace chart { class ChartModel; }
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::chart2 { class XChartDocument; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::uno { template <class E> class Sequence; }
 
-namespace com { namespace sun { namespace star { namespace chart2 {
+namespace com::sun::star::chart2 {
     class XDataSeriesContainer;
     class XDataSeries;
     class XChartType;
@@ -43,7 +43,7 @@ namespace com { namespace sun { namespace star { namespace chart2 {
         class XDataProvider;
         class XLabeledDataSequence;
     }
-}}}}
+}
 
 namespace chart
 {

chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx

@@ -22,7 +22,7 @@
 #include <vcl/weld.hxx>
 
 namespace chart { class ControllerLockHelper; }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::frame { class XModel; }
 
 namespace chart
 {

chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx

@@ -22,7 +22,7 @@
 #include <vcl/timer.hxx>
 #include <vcl/weld.hxx>
 
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com::sun::star::beans { class XPropertySet; }
 namespace chart { class ControllerLockHelper; }
 
 namespace chart

chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx

@@ -23,7 +23,7 @@
 #include <vcl/weld.hxx>
 #include <svx/dlgctl3d.hxx>
 
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com::sun::star::beans { class XPropertySet; }
 
 class ColorListBox;
 class LightButton;

chart2/source/controller/dialogs/tp_ChartType.hxx

@@ -28,7 +28,7 @@
 
 #include <vcl/wizardmachine.hxx>
 
-namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
+namespace com::sun::star::chart2 { class XChartDocument; }
 namespace weld { class CustomWeld; }
 
 class ValueSet;

chart2/source/controller/dialogs/tp_DataSource.hxx

@@ -23,8 +23,8 @@
 
 #include <RangeSelectionListener.hxx>
 
-namespace com { namespace sun { namespace star { namespace chart2 { class XChartType; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } }
+namespace com::sun::star::chart2 { class XChartType; }
+namespace com::sun::star::chart2 { class XDataSeries; }
 
 namespace chart { class TabPageNotifiable; }
 

chart2/source/controller/dialogs/tp_RangeChooser.hxx

@@ -25,7 +25,7 @@
 #include <vcl/wizardmachine.hxx>
 
 namespace chart { class TabPageNotifiable; }
-namespace com { namespace sun { namespace star { namespace chart2 { class XChartTypeTemplate; } } } }
+namespace com::sun::star::chart2 { class XChartTypeTemplate; }
 
 namespace chart
 {

chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx

@@ -28,8 +28,8 @@
 
 namespace chart { class LegendPositionResources; }
 namespace chart { class TitleResources; }
-namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::chart2 { class XChartDocument; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace chart
 {

chart2/source/controller/inc/AccessibleBase.hxx

@@ -38,9 +38,9 @@
 
 #include <MutexContainer.hxx>
 
-namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
-namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } }
+namespace com::sun::star::awt { class XWindow; }
+namespace com::sun::star::chart2 { class XChartDocument; }
+namespace com::sun::star::view { class XSelectionSupplier; }
 namespace utl { class AccessibleStateSetHelper; }
 
 

chart2/source/controller/inc/AccessibleChartView.hxx

@@ -27,10 +27,10 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } }
-namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } }
+namespace com::sun::star::accessibility { class XAccessible; }
+namespace com::sun::star::awt { class XWindow; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::view { class XSelectionSupplier; }
 
 namespace accessibility
 {

chart2/source/controller/inc/AxisItemConverter.hxx

@@ -23,16 +23,16 @@
 
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { class XAxis; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
+namespace com::sun::star::awt { struct Size; }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::chart2 { class XAxis; }
+namespace com::sun::star::chart2 { class XChartDocument; }
 namespace chart { struct ExplicitIncrementData; }
 namespace chart { struct ExplicitScaleData; }
 
 class SdrModel;
 
-namespace chart { namespace wrapper {
+namespace chart::wrapper {
 
 class AxisItemConverter : public ItemConverter
 {
@@ -69,7 +69,7 @@ private:
     std::unique_ptr<ExplicitIncrementData>  m_pExplicitIncrement;
 };
 
-}}
+}
 
 #endif
 

chart2/source/controller/inc/CharacterPropertyItemConverter.hxx

@@ -24,7 +24,7 @@
 
 #include <optional>
 
-namespace chart { namespace wrapper {
+namespace chart::wrapper {
 
 class CharacterPropertyItemConverter final : public ItemConverter
 {
@@ -55,7 +55,7 @@ private:
     std::optional<css::awt::Size> m_pRefSize;
 };
 
-}}
+}
 
 #endif
 

chart2/source/controller/inc/ChartController.hxx

@@ -42,23 +42,23 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } }
-namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleContext; } } } }
-namespace com { namespace sun { namespace star { namespace awt { class XFocusListener; } } } }
-namespace com { namespace sun { namespace star { namespace awt { class XKeyListener; } } } }
-namespace com { namespace sun { namespace star { namespace awt { class XMouseListener; } } } }
-namespace com { namespace sun { namespace star { namespace awt { class XMouseMotionListener; } } } }
-namespace com { namespace sun { namespace star { namespace awt { class XPaintListener; } } } }
-namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
-namespace com { namespace sun { namespace star { namespace awt { class XWindowListener; } } } }
-namespace com { namespace sun { namespace star { namespace awt { struct Point; } } } }
-namespace com { namespace sun { namespace star { namespace document { class XUndoManager; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XDispatch; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XLayoutManagerEventBroadcaster; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XInitialization; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XCloseable; } } } }
-namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } }
+namespace com::sun::star::accessibility { class XAccessible; }
+namespace com::sun::star::accessibility { class XAccessibleContext; }
+namespace com::sun::star::awt { class XFocusListener; }
+namespace com::sun::star::awt { class XKeyListener; }
+namespace com::sun::star::awt { class XMouseListener; }
+namespace com::sun::star::awt { class XMouseMotionListener; }
+namespace com::sun::star::awt { class XPaintListener; }
+namespace com::sun::star::awt { class XWindow; }
+namespace com::sun::star::awt { class XWindowListener; }
+namespace com::sun::star::awt { struct Point; }
+namespace com::sun::star::document { class XUndoManager; }
+namespace com::sun::star::frame { class XDispatch; }
+namespace com::sun::star::frame { class XLayoutManagerEventBroadcaster; }
+namespace com::sun::star::lang { class XInitialization; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::util { class XCloseable; }
+namespace com::sun::star::view { class XSelectionSupplier; }
 
 
 class SdrModel;
@@ -68,17 +68,17 @@ namespace svt
     class AcceleratorExecute;
 }
 
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
     class SelectionChangeHandler;
-}}
+}
 
 class DropTargetHelper;
 
-namespace com { namespace sun { namespace star {
-namespace graphic {
-    class XGraphic;
+namespace com::sun::star {
+    namespace graphic {
+        class XGraphic;
+    }
 }
-}}}
 
 namespace chart
 {

chart2/source/controller/inc/ChartDocumentWrapper.hxx

@@ -30,8 +30,8 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XRefreshable; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::util { class XRefreshable; }
 
 namespace chart
 {

chart2/source/controller/inc/ChartToolbarController.hxx

@@ -19,8 +19,8 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XFramesSupplier; } } } }
+namespace com::sun::star::awt { class XWindow; }
+namespace com::sun::star::frame { class XFramesSupplier; }
 
 namespace chart {
 

chart2/source/controller/inc/CommandDispatchContainer.hxx

@@ -25,12 +25,12 @@
 #include <map>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XDispatch; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace frame { struct DispatchDescriptor; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace util { struct URL; } } } }
+namespace com::sun::star::frame { class XController; }
+namespace com::sun::star::frame { class XDispatch; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::frame { struct DispatchDescriptor; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::util { struct URL; }
 
 namespace chart
 {

chart2/source/controller/inc/DataPointItemConverter.hxx

@@ -27,14 +27,14 @@
 
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::awt { struct Size; }
+namespace com::sun::star::chart2 { class XDataSeries; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 class SdrModel;
 
-namespace chart { namespace wrapper {
+namespace chart::wrapper {
 
 class DataPointItemConverter : public ItemConverter
 {
@@ -84,7 +84,7 @@ private:
     css::uno::Reference<css::chart2::XDataSeries> m_xSeries;
 };
 
-}}
+}
 
 #endif
 

chart2/source/controller/inc/DrawViewWrapper.hxx

@@ -22,8 +22,8 @@
 #include <memory>
 #include <svx/view3d.hxx>
 
-namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::drawing { class XShape; }
+namespace com::sun::star::frame { class XModel; }
 
 class SdrModel;
 

chart2/source/controller/inc/ErrorBarItemConverter.hxx

@@ -22,8 +22,8 @@
 
 #include "ItemConverter.hxx"
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
 
 class SdrModel;
 

chart2/source/controller/inc/GraphicPropertyItemConverter.hxx

@@ -21,7 +21,7 @@
 
 #include "ItemConverter.hxx"
 
-namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
 
 class SdrModel;
 

chart2/source/controller/inc/ItemConverter.hxx

@@ -24,10 +24,10 @@
 
 #include <utility>
 
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::beans { class XPropertySetInfo; }
 
-namespace chart { namespace wrapper {
+namespace chart::wrapper {
 
 
 /** This class serves for conversion between properties of an XPropertySet and
@@ -190,7 +190,7 @@ private:
     SfxItemPool&                                    m_rItemPool;
 };
 
-}}
+}
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_INC_ITEMCONVERTER_HXX
 #endif

chart2/source/controller/inc/ItemPropertyMap.hxx

@@ -25,12 +25,12 @@
 
 #include <map>
 
-namespace chart { namespace wrapper {
+namespace chart::wrapper {
 
 typedef std::map< ItemConverter::tWhichIdType, std::pair< ItemConverter::tPropertyNameType, ItemConverter::tMemberIdType > >
     ItemPropertyMapType;
 
-}}
+}
 
 #endif
 

chart2/source/controller/inc/LegendItemConverter.hxx

@@ -23,8 +23,8 @@
 
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+namespace com::sun::star::awt { struct Size; }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
 
 class SdrModel;
 

chart2/source/controller/inc/MultipleChartConverters.hxx

@@ -21,13 +21,13 @@
 
 #include "MultipleItemConverter.hxx"
 
-namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+namespace com::sun::star::awt { struct Size; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
 
 class SdrModel;
 
-namespace chart { namespace wrapper {
+namespace chart::wrapper {
 
 class AllAxisItemConverter : public MultipleItemConverter
 {
@@ -98,8 +98,7 @@ protected:
     virtual const sal_uInt16 * GetWhichPairs() const override;
 };
 
-} //  namespace wrapper
-} //  namespace chart
+} // namespace chart::wrapper
 
 // INCLUDED_CHART2_SOURCE_CONTROLLER_INC_MULTIPLECHARTCONVERTERS_HXX
 #endif

chart2/source/controller/inc/MultipleItemConverter.hxx

@@ -23,7 +23,7 @@
 
 #include <vector>
 
-namespace chart { namespace wrapper {
+namespace chart::wrapper {
 
 /** Note: virtual const sal_uInt16 * GetWhichPairs() const; is still pure virtual
  */
@@ -44,6 +44,6 @@ protected:
     std::vector< std::unique_ptr<ItemConverter> >  m_aConverters;
 };
 
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

chart2/source/controller/inc/ObjectHierarchy.hxx

@@ -21,8 +21,8 @@
 
 #include <ObjectIdentifier.hxx>
 
-namespace com { namespace sun { namespace star { namespace awt { struct KeyEvent; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
+namespace com::sun::star::awt { struct KeyEvent; }
+namespace com::sun::star::chart2 { class XChartDocument; }
 
 #include <memory>
 #include <vector>

chart2/source/controller/inc/ObjectNameProvider.hxx

@@ -23,8 +23,8 @@
 #include <ObjectIdentifier.hxx>
 #include <TitleHelper.hxx>
 
-namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::chart2 { class XChartDocument; }
+namespace com::sun::star::frame { class XModel; }
 
 namespace chart
 {

chart2/source/controller/inc/PositionAndSizeHelper.hxx

@@ -22,8 +22,8 @@
 
 #include <ObjectIdentifier.hxx>
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace awt { struct Rectangle; } } } }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::awt { struct Rectangle; }
 
 namespace chart
 {

chart2/source/controller/inc/RangeSelectionHelper.hxx

@@ -23,15 +23,15 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::chart2 { class XChartDocument; }
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace sheet{
         class XRangeSelection;
         class XRangeSelectionListener;
     }
-}}}
+}
 
 namespace chart
 {

chart2/source/controller/inc/RangeSelectionListener.hxx

@@ -23,7 +23,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/sheet/XRangeSelectionListener.hpp>
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::frame { class XModel; }
 
 namespace chart
 {

chart2/source/controller/inc/RegressionCurveItemConverter.hxx

@@ -21,8 +21,8 @@
 
 #include "ItemConverter.hxx"
 
-namespace com { namespace sun { namespace star { namespace chart2 { class XRegressionCurveContainer; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+namespace com::sun::star::chart2 { class XRegressionCurveContainer; }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
 
 class SdrModel;
 

chart2/source/controller/inc/RegressionEquationItemConverter.hxx

@@ -23,13 +23,13 @@
 
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+namespace com::sun::star::awt { struct Size; }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
 
 class SdrModel;
 
-namespace chart { namespace wrapper {
+namespace chart::wrapper {
 
 class RegressionEquationItemConverter : public ItemConverter
 {
@@ -57,7 +57,7 @@ private:
     std::vector< std::unique_ptr<ItemConverter> > m_aConverters;
 };
 
-}}
+}
 
 #endif
 

chart2/source/controller/inc/SelectionHelper.hxx

@@ -24,7 +24,7 @@
 
 class SdrObject;
 
-namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com::sun::star::drawing { class XShape; }
 
 namespace chart
 {

chart2/source/controller/inc/SeriesOptionsItemConverter.hxx

@@ -22,9 +22,9 @@
 #include "ItemConverter.hxx"
 #include <com/sun/star/uno/Sequence.h>
 
-namespace com { namespace sun { namespace star { namespace chart2 { class XCoordinateSystem; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::chart2 { class XCoordinateSystem; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace chart
 {

chart2/source/controller/inc/StatisticsItemConverter.hxx

@@ -21,7 +21,7 @@
 
 #include "ItemConverter.hxx"
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::frame { class XModel; }
 
 namespace chart
 {

chart2/source/controller/inc/TextLabelItemConverter.hxx

@@ -25,11 +25,11 @@
 
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::awt { struct Size; }
+namespace com::sun::star::chart2 { class XDataSeries; }
+namespace com::sun::star::frame { class XModel; }
 
-namespace chart { namespace wrapper {
+namespace chart::wrapper {
 
 class TextLabelItemConverter : public ItemConverter
 {
@@ -66,7 +66,7 @@ private:
     bool mbForbidPercentValue:1;
 };
 
-}}
+}
 
 #endif
 

chart2/source/controller/inc/TimerTriggeredControllerLock.hxx

@@ -24,7 +24,7 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::frame { class XModel; }
 namespace chart { class ControllerLockGuardUNO; }
 
 namespace chart

chart2/source/controller/inc/TitleDialogData.hxx

@@ -23,8 +23,8 @@
 #include <memory>
 #include <com/sun/star/uno/Sequence.hxx>
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace chart
 {

chart2/source/controller/inc/TitleItemConverter.hxx

@@ -23,12 +23,12 @@
 
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+namespace com::sun::star::awt { struct Size; }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
 
 class SdrModel;
 
-namespace chart { namespace wrapper {
+namespace chart::wrapper {
 
 class TitleItemConverter : public ItemConverter
 {
@@ -55,7 +55,7 @@ private:
     std::vector< std::unique_ptr<ItemConverter> >    m_aConverters;
 };
 
-}}
+}
 
 #endif
 

chart2/source/controller/inc/dlg_ChartType.hxx

@@ -21,7 +21,7 @@
 
 #include <vcl/weld.hxx>
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::frame { class XModel; }
 
 namespace chart
 {

chart2/source/controller/inc/dlg_ChartType_UNO.hxx

@@ -23,8 +23,8 @@
 #include <comphelper/proparrhlp.hxx>
 #include <svtools/genericunodialog.hxx>
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::beans { class XPropertySetInfo; }
 
 namespace chart
 {

chart2/source/controller/inc/dlg_CreationWizard.hxx

@@ -27,8 +27,8 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::chart2 { class XChartDocument; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 using vcl::WizardTypes::WizardState;
 using vcl::WizardTypes::CommitPageReason;

chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx

@@ -30,9 +30,9 @@
 
 #include "dlg_CreationWizard.hxx"
 
-namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::awt { class XWindow; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 class VclWindowEvent;
 

chart2/source/controller/inc/dlg_DataEditor.hxx

@@ -22,14 +22,14 @@
 
 #include <vcl/weld.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
 namespace comphelper { template <class Tp, class Arg> class mem_fun1_t; }
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace chart2 {
         class XChartDocument;
     }
-}}}
+}
 
 namespace chart
 {

chart2/source/controller/inc/dlg_DataSource.hxx

@@ -23,8 +23,8 @@
 
 #include "TabPageNotifiable.hxx"
 
-namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::chart2 { class XChartDocument; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 #include <memory>
 

chart2/source/controller/inc/dlg_InsertErrorBars.hxx

@@ -25,7 +25,7 @@
 
 #include "res_ErrorBar.hxx"
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::frame { class XModel; }
 
 namespace chart
 {

chart2/source/controller/inc/dlg_InsertLegend.hxx

@@ -25,8 +25,8 @@
 
 #include "res_LegendPosition.hxx"
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace chart
 {

chart2/source/controller/inc/dlg_ObjectProperties.hxx

@@ -22,7 +22,7 @@
 #include <ObjectIdentifier.hxx>
 #include <sfx2/tabdlg.hxx>
 
-namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
+namespace com::sun::star::util { class XNumberFormatsSupplier; }
 class Graphic;
 
 namespace chart

chart2/source/controller/inc/dlg_View3D.hxx

@@ -22,7 +22,7 @@
 #include <vcl/weld.hxx>
 #include <ControllerLockGuard.hxx>
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::frame { class XModel; }
 
 namespace chart
 {

chart2/source/controller/inc/res_ErrorBar.hxx

@@ -25,7 +25,7 @@
 #include <svx/chrtitem.hxx>
 #include "RangeSelectionListener.hxx"
 
-namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
+namespace com::sun::star::chart2 { class XChartDocument; }
 namespace weld { class Builder; }
 namespace weld { class Button; }
 namespace weld { class CheckButton; }

chart2/source/controller/inc/res_LegendPosition.hxx

@@ -22,8 +22,8 @@
 #include <svl/itemset.hxx>
 #include <tools/link.hxx>
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::uno { class XComponentContext; }
 namespace weld { class Builder; }
 namespace weld { class CheckButton; }
 namespace weld { class RadioButton; }

chart2/source/controller/main/ChartDropTargetHelper.hxx

@@ -21,11 +21,11 @@
 
 #include <vcl/transfer.hxx>
 
-namespace com { namespace sun { namespace star {
-namespace chart2 {
-    class XChartDocument;
+namespace com::sun::star {
+    namespace chart2 {
+        class XChartDocument;
+    }
 }
-}}}
 
 namespace chart
 {

chart2/source/controller/main/ChartFrameloader.hxx

@@ -24,7 +24,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace chart
 {

chart2/source/controller/main/ChartModelClone.hxx

@@ -23,8 +23,8 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.h>
 
-namespace com { namespace sun { namespace star { namespace chart2 { class XInternalDataProvider; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::chart2 { class XInternalDataProvider; }
+namespace com::sun::star::frame { class XModel; }
 
 namespace chart
 {

chart2/source/controller/main/ChartTransferable.hxx

@@ -21,11 +21,11 @@
 
 #include <vcl/transfer.hxx>
 
-namespace com { namespace sun { namespace star {
-namespace graphic {
-    class XGraphic;
+namespace com::sun::star {
+    namespace graphic {
+        class XGraphic;
+    }
 }
-}}}
 
 class SdrModel;
 class SdrObject;

chart2/source/controller/main/CommandDispatch.hxx

@@ -27,8 +27,8 @@
 
 #include <map>
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XURLTransformer; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::util { class XURLTransformer; }
 
 namespace chart
 {

chart2/source/controller/main/ControllerCommandDispatch.hxx

@@ -26,7 +26,7 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } }
+namespace com::sun::star::view { class XSelectionSupplier; }
 
 namespace chart
 {

chart2/source/controller/main/DragMethod_Base.hxx

@@ -24,7 +24,7 @@
 #include <cppuhelper/weakref.hxx>
 
 namespace chart { class DrawViewWrapper; }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::frame { class XModel; }
 
 namespace chart
 {

chart2/source/controller/main/StatusBarCommandDispatch.hxx

@@ -24,9 +24,9 @@
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XModifiable; } } } }
-namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::util { class XModifiable; }
+namespace com::sun::star::view { class XSelectionSupplier; }
 
 namespace chart
 {

chart2/source/controller/main/UndoActions.hxx

@@ -27,7 +27,7 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::frame { class XModel; }
 
 class SdrUndoAction;
 

chart2/source/controller/main/UndoCommandDispatch.hxx

@@ -21,8 +21,8 @@
 
 #include "CommandDispatch.hxx"
 
-namespace com { namespace sun { namespace star { namespace document { class XUndoManager; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::document { class XUndoManager; }
+namespace com::sun::star::frame { class XModel; }
 
 namespace chart
 {

chart2/source/controller/main/UndoGuard.hxx

@@ -25,8 +25,8 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace document { class XUndoManager; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::document { class XUndoManager; }
+namespace com::sun::star::frame { class XModel; }
 
 namespace chart
 {

chart2/source/controller/sidebar/Chart2PanelFactory.hxx

@@ -25,7 +25,7 @@
 #include <com/sun/star/ui/XUIElementFactory.hpp>
 
 
-namespace chart { namespace sidebar {
+namespace chart::sidebar {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::ui::XUIElementFactory, css::lang::XServiceInfo
@@ -54,7 +54,7 @@ public:
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
-} } // end of namespace sc::sidebar
+} // end of namespace chart::sidebar
 
 #endif
 

chart2/source/controller/sidebar/ChartAxisPanel.hxx

@@ -19,8 +19,8 @@
 #include "ChartSidebarModifyListener.hxx"
 #include "ChartSidebarSelectionListener.hxx"
 
-namespace com { namespace sun { namespace star { namespace util { class XModifyListener; } } } }
-namespace com { namespace sun { namespace star { namespace view { class XSelectionChangeListener; } } } }
+namespace com::sun::star::util { class XModifyListener; }
+namespace com::sun::star::view { class XSelectionChangeListener; }
 
 class Edit;
 class ListBox;

chart2/source/controller/sidebar/ChartColorWrapper.hxx

@@ -13,12 +13,12 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <svx/Palette.hxx>
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::frame { class XModel; }
 
 class SvxColorToolBoxControl;
 class SvxLineStyleToolBoxControl;
 
-namespace chart { namespace sidebar {
+namespace chart::sidebar {
 
 class ChartColorWrapper
 {
@@ -61,7 +61,7 @@ private:
     SvxLineStyleToolBoxControl* mpControl;
 };
 
-} }
+}
 
 #endif
 

chart2/source/controller/sidebar/ChartElementsPanel.hxx

@@ -26,7 +26,7 @@
 #include "ChartSidebarModifyListener.hxx"
 #include <TitleHelper.hxx>
 
-namespace com { namespace sun { namespace star { namespace util { class XModifyListener; } } } }
+namespace com::sun::star::util { class XModifyListener; }
 
 namespace chart {
 

chart2/source/controller/sidebar/ChartErrorBarPanel.hxx

@@ -18,7 +18,7 @@
 
 #include "ChartSidebarModifyListener.hxx"
 
-namespace com { namespace sun { namespace star { namespace util { class XModifyListener; } } } }
+namespace com::sun::star::util { class XModifyListener; }
 
 namespace chart {
 

chart2/source/controller/sidebar/ChartSeriesPanel.hxx

@@ -27,8 +27,8 @@
 #include "ChartSidebarModifyListener.hxx"
 #include "ChartSidebarSelectionListener.hxx"
 
-namespace com { namespace sun { namespace star { namespace util { class XModifyListener; } } } }
-namespace com { namespace sun { namespace star { namespace view { class XSelectionChangeListener; } } } }
+namespace com::sun::star::util { class XModifyListener; }
+namespace com::sun::star::view { class XSelectionChangeListener; }
 
 namespace chart {