compact namespace: svx

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

76 files changed, 222 insertions, 489 deletions

diff --git a/svx/inc/sdr/attribute/sdreffectstextattribute.hxx b/svx/inc/sdr/attribute/sdreffectstextattribute.hxx
index 7a209c739199..e1826552dc76 100644
--- a/svx/inc/sdr/attribute/sdreffectstextattribute.hxx
+++ b/svx/inc/sdr/attribute/sdreffectstextattribute.hxx
@@ -24,9 +24,7 @@
 #include <drawinglayer/attribute/sdrglowattribute.hxx>
 
 
-namespace drawinglayer
-{
-    namespace attribute
+namespace drawinglayer::attribute
     {
         class SdrEffectsTextAttribute
         {
@@ -62,8 +60,8 @@ namespace drawinglayer
             const SdrGlowAttribute& getGlow() const { return maGlow; }
             sal_Int32 getSoftEdgeRadius() const { return mnSoftEdgeRadius; }
         };
-    } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace drawinglayer::attribute
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/attribute/sdrfilltextattribute.hxx b/svx/inc/sdr/attribute/sdrfilltextattribute.hxx
index bef9d543021e..3bb66c809f41 100644
--- a/svx/inc/sdr/attribute/sdrfilltextattribute.hxx
+++ b/svx/inc/sdr/attribute/sdrfilltextattribute.hxx
@@ -25,9 +25,7 @@
 #include <sdr/attribute/sdrtextattribute.hxx>
 
 
-namespace drawinglayer
-{
-    namespace attribute
+namespace drawinglayer::attribute
     {
         class SdrFillTextAttribute
         {
@@ -53,8 +51,8 @@ namespace drawinglayer
             const FillGradientAttribute& getFillFloatTransGradient() const { return maFillFloatTransGradient; }
             const SdrTextAttribute& getText() const { return maTextAttribute; }
         };
-    } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace drawinglayer::attribute
 
 
 #endif // INCLUDED_SVX_INC_SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX
diff --git a/svx/inc/sdr/attribute/sdrformtextattribute.hxx b/svx/inc/sdr/attribute/sdrformtextattribute.hxx
index 06b0fd363741..7167bf615253 100644
--- a/svx/inc/sdr/attribute/sdrformtextattribute.hxx
+++ b/svx/inc/sdr/attribute/sdrformtextattribute.hxx
@@ -34,9 +34,7 @@ namespace drawinglayer::attribute {
 }
 
 
-namespace drawinglayer
-{
-    namespace attribute
+namespace drawinglayer::attribute
     {
         class SdrFormTextAttribute
         {
@@ -76,8 +74,8 @@ namespace drawinglayer
             bool getFormTextMirror() const;
             bool getFormTextOutline() const;
         };
-    } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace drawinglayer::attribute
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx b/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx
index 826475ed98a8..34086c2c8f5e 100644
--- a/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx
+++ b/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx
@@ -32,9 +32,7 @@ namespace drawinglayer::attribute {
 }
 
 
-namespace drawinglayer
-{
-    namespace attribute
+namespace drawinglayer::attribute
     {
         class SdrFormTextOutlineAttribute
         {
@@ -67,8 +65,8 @@ namespace drawinglayer
             const StrokeAttribute& getStrokeAttribute() const;
             sal_uInt8 getTransparence() const;
         };
-    } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace drawinglayer::attribute
 
 
 #endif // INCLUDED_SVX_INC_SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX
diff --git a/svx/inc/sdr/attribute/sdrlineeffectstextattribute.hxx b/svx/inc/sdr/attribute/sdrlineeffectstextattribute.hxx
index c53650bfcff2..1e7f694c761a 100644
--- a/svx/inc/sdr/attribute/sdrlineeffectstextattribute.hxx
+++ b/svx/inc/sdr/attribute/sdrlineeffectstextattribute.hxx
@@ -25,9 +25,7 @@
 #include <drawinglayer/attribute/sdrlinestartendattribute.hxx>
 
 
-namespace drawinglayer
-{
-    namespace attribute
+namespace drawinglayer::attribute
     {
         class SdrLineEffectsTextAttribute : public SdrEffectsTextAttribute
         {
@@ -57,8 +55,8 @@ namespace drawinglayer
             const SdrLineAttribute& getLine() const { return maLine; }
             const SdrLineStartEndAttribute& getLineStartEnd() const { return maLineStartEnd; }
         };
-    } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace drawinglayer::attribute
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/attribute/sdrlinefilleffectstextattribute.hxx b/svx/inc/sdr/attribute/sdrlinefilleffectstextattribute.hxx
index 7fb25a4f5936..7bb85e897dc0 100644
--- a/svx/inc/sdr/attribute/sdrlinefilleffectstextattribute.hxx
+++ b/svx/inc/sdr/attribute/sdrlinefilleffectstextattribute.hxx
@@ -24,9 +24,7 @@
 #include <drawinglayer/attribute/fillgradientattribute.hxx>
 
 
-namespace drawinglayer
-{
-    namespace attribute
+namespace drawinglayer::attribute
     {
         class SdrLineFillEffectsTextAttribute : public SdrLineEffectsTextAttribute
         {
@@ -58,8 +56,8 @@ namespace drawinglayer
             const SdrFillAttribute& getFill() const { return maFill; }
             const FillGradientAttribute& getFillFloatTransGradient() const { return maFillFloatTransGradient; }
         };
-    } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace drawinglayer::attribute
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/attribute/sdrtextattribute.hxx b/svx/inc/sdr/attribute/sdrtextattribute.hxx
index 5cb40ebb0714..19b52d61126e 100644
--- a/svx/inc/sdr/attribute/sdrtextattribute.hxx
+++ b/svx/inc/sdr/attribute/sdrtextattribute.hxx
@@ -33,9 +33,7 @@ namespace drawinglayer::attribute { class SdrFormTextAttribute; }
 namespace drawinglayer::attribute { class ImpSdrTextAttribute; }
 
 
-namespace drawinglayer
-{
-    namespace attribute
+namespace drawinglayer::attribute
     {
         class SdrTextAttribute
         {
@@ -111,8 +109,8 @@ namespace drawinglayer
                 double fFrameLength,
                 double fTextLength) const;
         };
-    } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace drawinglayer::attribute
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofe3dcube.hxx b/svx/inc/sdr/contact/viewcontactofe3dcube.hxx
index 933bc8d14d57..5f9a6e4a1d91 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dcube.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dcube.hxx
@@ -23,9 +23,7 @@
 #include <sdr/contact/viewcontactofe3d.hxx>
 #include <svx/cube3d.hxx>
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewContactOfE3dCube final : public ViewContactOfE3d
         {
@@ -45,8 +43,8 @@ namespace sdr
             // stored in the local primitive list. Default creates a yellow replacement rectangle.
             virtual drawinglayer::primitive3d::Primitive3DContainer createViewIndependentPrimitive3DContainer() const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+
+} // end of namespace sdr::contact
 
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX
diff --git a/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx b/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx
index 0d96fb989050..c31accc2d58d 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx
@@ -24,9 +24,7 @@
 #include <extrud3d.hxx>
 
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewContactOfE3dExtrude final : public ViewContactOfE3d
         {
@@ -46,8 +44,8 @@ namespace sdr
             // stored in the local primitive list. Default creates a yellow replacement rectangle.
             virtual drawinglayer::primitive3d::Primitive3DContainer createViewIndependentPrimitive3DContainer() const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+
+} // end of namespace sdr::contact
 
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX
diff --git a/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx b/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx
index 00e42754f226..d90b33dae37f 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx
@@ -24,9 +24,7 @@
 #include <svx/lathe3d.hxx>
 
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewContactOfE3dLathe final : public ViewContactOfE3d
         {
@@ -46,8 +44,8 @@ namespace sdr
             // stored in the local primitive list. Default creates a yellow replacement rectangle.
             virtual drawinglayer::primitive3d::Primitive3DContainer createViewIndependentPrimitive3DContainer() const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+
+} // end of namespace sdr::contact
 
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX
diff --git a/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx b/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx
index 16116cc19af7..bc907451c3c5 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx
@@ -23,9 +23,7 @@
 #include <sdr/contact/viewcontactofe3d.hxx>
 #include <polygn3d.hxx>
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewContactOfE3dPolygon final : public ViewContactOfE3d
         {
@@ -44,8 +42,8 @@ namespace sdr
             // stored in the local primitive list. Default creates a yellow replacement rectangle.
             virtual drawinglayer::primitive3d::Primitive3DContainer createViewIndependentPrimitive3DContainer() const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+
+} // end of namespace sdr::contact
 
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX
diff --git a/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx b/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx
index 78d9a7ca7826..3bd58dcce9f2 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx
@@ -24,9 +24,7 @@
 #include <svx/sphere3d.hxx>
 
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewContactOfE3dSphere final : public ViewContactOfE3d
         {
@@ -46,8 +44,8 @@ namespace sdr
             // stored in the local primitive list. Default creates a yellow replacement rectangle.
             virtual drawinglayer::primitive3d::Primitive3DContainer createViewIndependentPrimitive3DContainer() const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+
+} // end of namespace sdr::contact
 
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX
diff --git a/svx/inc/sdr/contact/viewcontactofgraphic.hxx b/svx/inc/sdr/contact/viewcontactofgraphic.hxx
index fa2138adb03f..0c554ec9100a 100644
--- a/svx/inc/sdr/contact/viewcontactofgraphic.hxx
+++ b/svx/inc/sdr/contact/viewcontactofgraphic.hxx
@@ -26,9 +26,7 @@
 namespace drawinglayer::attribute { class SdrLineFillEffectsTextAttribute; }
 class GraphicAttr;
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewContactOfGraphic final : public ViewContactOfTextObj
         {
@@ -69,8 +67,7 @@ namespace sdr
             // ONLY based on model data
             virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX
 
diff --git a/svx/inc/sdr/contact/viewcontactofgroup.hxx b/svx/inc/sdr/contact/viewcontactofgroup.hxx
index 2e952d3bb1ed..21900c906f71 100644
--- a/svx/inc/sdr/contact/viewcontactofgroup.hxx
+++ b/svx/inc/sdr/contact/viewcontactofgroup.hxx
@@ -24,9 +24,7 @@
 #include <svx/svdogrp.hxx>
 
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewContactOfGroup final : public ViewContactOfSdrObj
         {
@@ -51,8 +49,7 @@ namespace sdr
             // ONLY based on model data
             virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFGROUP_HXX
diff --git a/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx
index 5b3823508543..a807829007f7 100644
--- a/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx
+++ b/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx
@@ -28,9 +28,7 @@ class SfxItemSet;
 class Bitmap;
 class MapMode;
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewContactOfMasterPageDescriptor final : public ViewContact
         {
@@ -62,8 +60,8 @@ namespace sdr
             virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const override;
             virtual ViewContact* GetParentContact() const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+
+} // end of namespace sdr::contact
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX
 
diff --git a/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx
index 6e2f07b5a1df..230c6d4c4b9b 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx
@@ -24,9 +24,7 @@
 #include <svx/svdocapt.hxx>
 
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewContactOfSdrCaptionObj final : public ViewContactOfSdrRectObj
         {
@@ -40,8 +38,7 @@ namespace sdr
             // ONLY based on model data
             virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX
diff --git a/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx
index 64972ebee3ff..1a88e55de13d 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx
@@ -24,9 +24,7 @@
 #include <svx/svdocirc.hxx>
 
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewContactOfSdrCircObj final : public ViewContactOfSdrRectObj
         {
@@ -46,8 +44,7 @@ namespace sdr
             // ONLY based on model data
             virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX
diff --git a/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx b/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx
index fb22bf97d424..1d27161b1be2 100644
--- a/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx
@@ -24,9 +24,7 @@
 #include <svx/svdoedge.hxx>
 
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewContactOfSdrEdgeObj final : public ViewContactOfTextObj
         {
@@ -46,8 +44,7 @@ namespace sdr
             // ONLY based on model data
             virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX
diff --git a/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx
index caeaa283cc39..e74f48dfa92e 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx
@@ -24,9 +24,7 @@
 #include <svx/svdomeas.hxx>
 
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewContactOfSdrMeasureObj final : public ViewContactOfTextObj
         {
@@ -46,8 +44,7 @@ namespace sdr
             // ONLY based on model data
             virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX
diff --git a/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx
index 9834de646a6b..196eabf8f4dd 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx
@@ -24,9 +24,7 @@
 #include <svx/svdoashp.hxx>
 
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewContactOfSdrObjCustomShape final : public ViewContactOfTextObj
         {
@@ -49,8 +47,7 @@ namespace sdr
             // ONLY based on model data
             virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX
diff --git a/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx
index f2055f74cc15..c3f71af08e15 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx
@@ -24,9 +24,7 @@
 #include <svx/svdopath.hxx>
 
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewContactOfSdrPathObj final : public ViewContactOfTextObj
         {
@@ -46,8 +44,7 @@ namespace sdr
             // ONLY based on model data
             virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX
diff --git a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
index 321bc4f8cabb..ca081d4c11d4 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
@@ -27,9 +27,7 @@ namespace sdr::contact {
     class ViewObjectContactOfE3dScene;
 }
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewObjectContactOfE3d final : public ViewObjectContactOfSdrObj
         {
@@ -58,8 +56,8 @@ namespace sdr
             // This method will not handle included hierarchies or visibility.
             drawinglayer::primitive3d::Primitive3DContainer const & getPrimitive3DContainer(const DisplayInfo& rDisplayInfo) const;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+
+} // end of namespace sdr::contact
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX
 
diff --git a/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx
index 2174462c6cf9..35aece86a380 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx
@@ -23,9 +23,7 @@
 #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
 
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewObjectContactOfE3dScene final : public ViewObjectContactOfSdrObj
         {
@@ -41,8 +39,7 @@ namespace sdr
             // e.g. for group objects, scenes or pages. This method will test geometrical visibility.
             virtual drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX
diff --git a/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx
index 7b12c8332156..b2286568c93f 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx
@@ -24,9 +24,7 @@
 
 class SdrGrafObj;
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewObjectContactOfGraphic final : public ViewObjectContactOfSdrObj
         {
@@ -37,8 +35,7 @@ namespace sdr
             ViewObjectContactOfGraphic(ObjectContact& rObjectContact, ViewContact& rViewContact);
             virtual ~ViewObjectContactOfGraphic() override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX
 
diff --git a/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx b/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx
index 3dc8873bcd43..9b74032a239a 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx
@@ -22,9 +22,7 @@
 
 #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewObjectContactOfGroup final : public ViewObjectContactOfSdrObj
         {
@@ -39,8 +37,8 @@ namespace sdr
         private:
             virtual bool isPrimitiveVisibleOnAnyLayer(const SdrLayerIDSet& aLayers) const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+
+} // end of namespace sdr::contact
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX
 
diff --git a/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
index 8b30d772ea03..32035ccc25b1 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
@@ -26,9 +26,7 @@ namespace sdr {
     class MasterPageDescriptor;
 }
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewObjectContactOfMasterPageDescriptor final : public ViewObjectContact
         {
@@ -39,8 +37,8 @@ namespace sdr
             virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override;
             virtual drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+
+} // end of namespace sdr::contact
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFMASTERPAGEDESCRIPTOR_HXX
 
diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
index 6b0b4c476262..a990f405087b 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
@@ -28,9 +28,7 @@
 namespace avmedia { class MediaItem; }
 namespace vcl { class Window; }
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class SdrMediaWindow;
 
@@ -57,8 +55,8 @@ namespace sdr
             std::unique_ptr<sdr::contact::SdrMediaWindow> mpMediaWindow;
 
         };
-    } // end of namespace contact
-} // end of namespace sdr
+
+} // end of namespace sdr::contact
 
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX
diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx
index 758b0bfb0c56..437afbddcf8d 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx
@@ -24,9 +24,7 @@
 
 class SdrPage;
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewObjectContactOfPageSubObject : public ViewObjectContact
         {
@@ -40,12 +38,10 @@ namespace sdr
             virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override;
             virtual bool isPrimitiveGhosted(const DisplayInfo& rDisplayInfo) const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
 
-namespace sdr
-{
-    namespace contact
+} // end of namespace sdr::contact
+
+namespace sdr::contact
     {
         class ViewObjectContactOfPageBackground final : public ViewObjectContactOfPageSubObject
         {
@@ -57,12 +53,10 @@ namespace sdr
 
             virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
 
-namespace sdr
-{
-    namespace contact
+} // end of namespace sdr::contact
+
+namespace sdr::contact
     {
         class ViewObjectContactOfMasterPage final : public ViewObjectContactOfPageSubObject
         {
@@ -73,12 +67,9 @@ namespace sdr
 
             virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewObjectContactOfPageFill final : public ViewObjectContactOfPageSubObject
         {
@@ -90,12 +81,9 @@ namespace sdr
 
             virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewObjectContactOfPageShadow final : public ViewObjectContactOfPageSubObject
         {
@@ -105,12 +93,9 @@ namespace sdr
 
             virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewObjectContactOfOuterPageBorder final : public ViewObjectContactOfPageSubObject
         {
@@ -120,12 +105,9 @@ namespace sdr
 
             virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewObjectContactOfInnerPageBorder final : public ViewObjectContactOfPageSubObject
         {
@@ -135,12 +117,9 @@ namespace sdr
 
             virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewObjectContactOfPageHierarchy final : public ViewObjectContactOfPageSubObject
         {
@@ -150,12 +129,9 @@ namespace sdr
 
             virtual drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewObjectContactOfPageGrid final : public ViewObjectContactOfPageSubObject
         {
@@ -167,12 +143,9 @@ namespace sdr
 
             virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewObjectContactOfPageHelplines final : public ViewObjectContactOfPageSubObject
         {
@@ -184,12 +157,9 @@ namespace sdr
 
             virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewObjectContactOfSdrPage final : public ViewObjectContact
         {
@@ -199,8 +169,7 @@ namespace sdr
 
             virtual drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX
 
diff --git a/svx/inc/sdr/overlay/overlaycrosshair.hxx b/svx/inc/sdr/overlay/overlaycrosshair.hxx
index e297f4a4fb4d..09dccf4a8da4 100644
--- a/svx/inc/sdr/overlay/overlaycrosshair.hxx
+++ b/svx/inc/sdr/overlay/overlaycrosshair.hxx
@@ -23,9 +23,7 @@
 #include <svx/sdr/overlay/overlayobject.hxx>
 
 
-namespace sdr
-{
-    namespace overlay
+namespace sdr::overlay
     {
         class OverlayCrosshairStriped final : public OverlayObjectWithBasePosition
         {
@@ -39,8 +37,7 @@ namespace sdr
             // react on stripe definition change
             virtual void stripeDefinitionHasChanged() override;
         };
-    } // end of namespace overlay
-} // end of namespace sdr
+} // end of namespace sdr::overlay
 
 
 #endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYCROSSHAIR_HXX
diff --git a/svx/inc/sdr/overlay/overlayhelpline.hxx b/svx/inc/sdr/overlay/overlayhelpline.hxx
index 84077f10367d..834f7e40a795 100644
--- a/svx/inc/sdr/overlay/overlayhelpline.hxx
+++ b/svx/inc/sdr/overlay/overlayhelpline.hxx
@@ -24,9 +24,7 @@
 #include <svx/svdhlpln.hxx>
 
 
-namespace sdr
-{
-    namespace overlay
+namespace sdr::overlay
     {
         class OverlayHelplineStriped final : public OverlayObjectWithBasePosition
         {
@@ -48,8 +46,7 @@ namespace sdr
             // react on stripe definition change
             virtual void stripeDefinitionHasChanged() override;
         };
-    } // end of namespace overlay
-} // end of namespace sdr
+} // end of namespace sdr::overlay
 
 
 #endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYHELPLINE_HXX
diff --git a/svx/inc/sdr/overlay/overlayline.hxx b/svx/inc/sdr/overlay/overlayline.hxx
index 33ec22c0e25d..425ea96b7253 100644
--- a/svx/inc/sdr/overlay/overlayline.hxx
+++ b/svx/inc/sdr/overlay/overlayline.hxx
@@ -23,9 +23,7 @@
 #include <svx/sdr/overlay/overlayobject.hxx>
 
 
-namespace sdr
-{
-    namespace overlay
+namespace sdr::overlay
     {
         class OverlayLineStriped final : public OverlayObjectWithBasePosition
         {
@@ -47,8 +45,7 @@ namespace sdr
             // react on stripe definition change
             virtual void stripeDefinitionHasChanged() override;
         };
-    } // end of namespace overlay
-} // end of namespace sdr
+} // end of namespace sdr::overlay
 
 
 #endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYLINE_HXX
diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
index 1970131c75ee..a5acd6abc3ee 100644
--- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
@@ -26,9 +26,7 @@
 #include <vcl/idle.hxx>
 
 
-namespace sdr
-{
-    namespace overlay
+namespace sdr::overlay
     {
         class OverlayManagerBuffered final : public OverlayManager
         {
@@ -70,8 +68,7 @@ namespace sdr
             // invalidate the given range at local OutputDevice
             virtual void invalidateRange(const basegfx::B2DRange& rRange) override;
         };
-    } // end of namespace overlay
-} // end of namespace sdr
+} // end of namespace sdr::overlay
 
 
 #endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX
diff --git a/svx/inc/sdr/overlay/overlayobjectcell.hxx b/svx/inc/sdr/overlay/overlayobjectcell.hxx
index 63669ba06ec7..b71a71d9b95c 100644
--- a/svx/inc/sdr/overlay/overlayobjectcell.hxx
+++ b/svx/inc/sdr/overlay/overlayobjectcell.hxx
@@ -24,9 +24,7 @@
 #include <vector>
 
 
-namespace sdr
-{
-    namespace overlay
+namespace sdr::overlay
     {
         // OverlayObjectCell - used for cell cursor, selection and AutoFill handle
 
@@ -46,8 +44,7 @@ namespace sdr
             virtual ~OverlayObjectCell() override;
         };
 
-    } // end of namespace overlay
-} // end of namespace sdr
+} // end of namespace sdr::overlay
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/overlay/overlayrectangle.hxx b/svx/inc/sdr/overlay/overlayrectangle.hxx
index 7f4dfd895eb3..399a9d5c97e7 100644
--- a/svx/inc/sdr/overlay/overlayrectangle.hxx
+++ b/svx/inc/sdr/overlay/overlayrectangle.hxx
@@ -23,9 +23,7 @@
 
 namespace tools { class PolyPolygon; }
 
-namespace sdr
-{
-    namespace overlay
+namespace sdr::overlay
     {
         class OverlayRectangle final : public OverlayObjectWithBasePosition
         {
@@ -60,8 +58,7 @@ namespace sdr
             // implementation does nothing and does not create a new event.
             virtual void Trigger(sal_uInt32 nTime) override;
         };
-    } // end of namespace overlay
-} // end of namespace sdr
+} // end of namespace sdr::overlay
 
 #endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYRECTANGLE_HXX
 
diff --git a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
index 7a18f1cb4b8f..ecdfd1a502cf 100644
--- a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
+++ b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
@@ -23,9 +23,7 @@
 #include <svx/sdr/overlay/overlayobject.hxx>
 
 
-namespace sdr
-{
-    namespace overlay
+namespace sdr::overlay
     {
         class OverlayRollingRectangleStriped final : public OverlayObjectWithBasePosition
         {
@@ -56,8 +54,7 @@ namespace sdr
             // react on stripe definition change
             virtual void stripeDefinitionHasChanged() override;
         };
-    } // end of namespace overlay
-} // end of namespace sdr
+} // end of namespace sdr::overlay
 
 
 #endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYROLLINGRECTANGLE_HXX
diff --git a/svx/inc/sdr/overlay/overlaytools.hxx b/svx/inc/sdr/overlay/overlaytools.hxx
index c5df8fe09d10..c058116f4455 100644
--- a/svx/inc/sdr/overlay/overlaytools.hxx
+++ b/svx/inc/sdr/overlay/overlaytools.hxx
@@ -63,9 +63,7 @@ public:
 // at the given logic position with the Bitmap's pixel size, unscaled and
 // unrotated (like a marker). The discrete pixel on the bitmap assocciated
 // with the target position is given in discrete X,Y coordinates
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class OverlayBitmapExPrimitive final : public DiscreteMetricDependentPrimitive2D
         {
@@ -109,14 +107,11 @@ namespace drawinglayer
 
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
 // Overlay helper class for a crosshair
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class OverlayCrosshairPrimitive final : public ViewportDependentPrimitive2D
         {
@@ -149,15 +144,12 @@ namespace drawinglayer
 
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
 // Overlay helper class for a hatch rectangle as used e.g. for text object
 // selection highlighting
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class OverlayRectanglePrimitive final : public DiscreteMetricDependentPrimitive2D
         {
@@ -200,15 +192,12 @@ namespace drawinglayer
 
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
 // Overlay helper class for a striped helpline
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         enum HelplineStyle
         {
@@ -253,16 +242,13 @@ namespace drawinglayer
 
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
 // Overlay helper class for rolling rectangle helplines. This primitive is
 // only for the extended lines to the ends of the view
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class OverlayRollingRectanglePrimitive final : public ViewportDependentPrimitive2D
         {
@@ -295,8 +281,7 @@ namespace drawinglayer
 
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
 #endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYTOOLS_HXX
diff --git a/svx/inc/sdr/overlay/overlaytriangle.hxx b/svx/inc/sdr/overlay/overlaytriangle.hxx
index 76e481e645fb..0601122a5ef2 100644
--- a/svx/inc/sdr/overlay/overlaytriangle.hxx
+++ b/svx/inc/sdr/overlay/overlaytriangle.hxx
@@ -21,9 +21,7 @@
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 
-namespace sdr
-{
-    namespace overlay
+namespace sdr::overlay
     {
         class OverlayTriangle final : public OverlayObjectWithBasePosition
         {
@@ -42,7 +40,6 @@ namespace sdr
                 Color aTriangleColor);
             virtual ~OverlayTriangle() override;
         };
-    } // end of namespace overlay
-} // end of namespace sdr
+} // end of namespace sdr::overlay
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/primitive2d/sdrattributecreator.hxx b/svx/inc/sdr/primitive2d/sdrattributecreator.hxx
index 1bcc8e22931e..f372741fa68c 100644
--- a/svx/inc/sdr/primitive2d/sdrattributecreator.hxx
+++ b/svx/inc/sdr/primitive2d/sdrattributecreator.hxx
@@ -50,9 +50,7 @@ namespace basegfx {
 }
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         // SdrAttribute creators
         attribute::SdrLineAttribute SVXCORE_DLLPUBLIC createNewSdrLineAttribute(
@@ -123,8 +121,8 @@ namespace drawinglayer
             double& rfCornerRadiusX,
             double& rfCornerRadiusY);
 
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+
+} // end of namespace drawinglayer::primitive2d
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx
index 4ed7d7f1ff74..3ac1b39519bd 100644
--- a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx
@@ -29,9 +29,7 @@
 // predefines
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SdrCaptionPrimitive2D final : public BufferedDecompositionPrimitive2D
         {
@@ -66,8 +64,7 @@ namespace drawinglayer
             // provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
 #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX
diff --git a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx
index 8a2d75ae1eb0..ba20dc6dfdb8 100644
--- a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx
@@ -28,9 +28,7 @@
 // predefines
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SdrConnectorPrimitive2D final : public BufferedDecompositionPrimitive2D
         {
@@ -56,8 +54,7 @@ namespace drawinglayer
             // provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
 #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX
diff --git a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
index 063f6ec92c29..0cad2a8824a3 100644
--- a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
@@ -28,9 +28,7 @@
 // predefines
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SdrCustomShapePrimitive2D : public BufferedDecompositionPrimitive2D
         {
@@ -75,8 +73,7 @@ namespace drawinglayer
             // provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
 #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRCUSTOMSHAPEPRIMITIVE2D_HXX
diff --git a/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx b/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx
index 94c9c59b20ab..02d77f656263 100644
--- a/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx
+++ b/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx
@@ -42,9 +42,7 @@ namespace drawinglayer::attribute {
 }
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         Primitive2DReference SVXCORE_DLLPUBLIC createPolyPolygonFillPrimitive(
             const basegfx::B2DPolyPolygon& rPolyPolygon,
@@ -83,8 +81,7 @@ namespace drawinglayer
             const Primitive2DContainer& rContent,
             sal_Int32 nRadius);
 
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx
index 2e2c0e20a170..2e0f19a63e80 100644
--- a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx
@@ -28,9 +28,7 @@
 // predefines
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SdrEllipsePrimitive2D : public BufferedDecompositionPrimitive2D
         {
@@ -56,13 +54,10 @@ namespace drawinglayer
             // provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SdrEllipseSegmentPrimitive2D final : public SdrEllipsePrimitive2D
         {
@@ -91,8 +86,7 @@ namespace drawinglayer
             // provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
 #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX
diff --git a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
index 31b5f444f34f..2879a99b0c2c 100644
--- a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
@@ -29,9 +29,7 @@
 // predefines
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SdrGrafPrimitive2D final : public BufferedDecompositionPrimitive2D
         {
@@ -64,8 +62,7 @@ namespace drawinglayer
             // provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
 #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX
diff --git a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
index 4e28aad88e86..aa3bd67ff317 100644
--- a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
@@ -41,9 +41,7 @@ namespace drawinglayer::attribute {
 }
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SdrMeasurePrimitive2D final : public BufferedDecompositionPrimitive2D
         {
@@ -112,8 +110,7 @@ namespace drawinglayer
             // provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
 #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX
diff --git a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx
index 8b3ce0bfb579..2618f75b03b2 100644
--- a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx
@@ -28,9 +28,7 @@
 // predefines
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SdrOle2Primitive2D final : public BasePrimitive2D
         {
@@ -59,8 +57,7 @@ namespace drawinglayer
             // provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
 #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX
diff --git a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
index 2dec9b986c0c..27f9cb20803b 100644
--- a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
@@ -30,9 +30,7 @@
 class SdrOle2Obj;
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SdrOleContentPrimitive2D final : public BufferedDecompositionPrimitive2D
         {
@@ -67,8 +65,7 @@ namespace drawinglayer
             // provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
 #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
diff --git a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx
index fe823eb7aa5d..a43cd4dcbb76 100644
--- a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx
@@ -29,9 +29,7 @@
 // predefines
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SdrPathPrimitive2D final : public BufferedDecompositionPrimitive2D
         {
@@ -76,8 +74,7 @@ namespace drawinglayer
             // provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
 #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX
diff --git a/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx b/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx
index 9afff3ecc586..5b2bd6d30535 100644
--- a/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx
+++ b/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx
@@ -32,14 +32,11 @@ namespace basegfx {
 
 // helper methods
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         // create a 3x3 cross in given color as BitmapEx
         BitmapEx createDefaultCross_3x3(const basegfx::BColor& rBColor);
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
 #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRPRIMITIVETOOLS_HXX
diff --git a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx
index d9c4119966ff..9125f63c62de 100644
--- a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx
@@ -28,9 +28,7 @@
 // predefines
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SdrRectanglePrimitive2D final : public BufferedDecompositionPrimitive2D
         {
@@ -67,8 +65,7 @@ namespace drawinglayer
             // provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
 #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX
diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
index eac15db3b878..c35e6b2daff7 100644
--- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
@@ -35,9 +35,7 @@
 class SdrText;
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SdrTextPrimitive2D : public BufferedDecompositionPrimitive2D
         {
@@ -97,13 +95,10 @@ namespace drawinglayer
             // transformed clone operator
             virtual std::unique_ptr<SdrTextPrimitive2D> createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const = 0;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SdrContourTextPrimitive2D final : public SdrTextPrimitive2D
         {
@@ -137,13 +132,10 @@ namespace drawinglayer
             // provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SdrPathTextPrimitive2D final : public SdrTextPrimitive2D
         {
@@ -177,13 +169,10 @@ namespace drawinglayer
             // provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SdrBlockTextPrimitive2D final : public SdrTextPrimitive2D
         {
@@ -233,13 +222,10 @@ namespace drawinglayer
             // provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SdrStretchTextPrimitive2D final : public SdrTextPrimitive2D
         {
@@ -272,13 +258,10 @@ namespace drawinglayer
             // provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SdrAutoFitTextPrimitive2D final : public SdrTextPrimitive2D
         {
@@ -310,12 +293,9 @@ namespace drawinglayer
             // provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SdrChainedTextPrimitive2D final : public SdrTextPrimitive2D
         {
@@ -346,8 +326,7 @@ namespace drawinglayer
             // provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 
 #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX
diff --git a/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx b/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx
index 89f8f5d12a00..327f7da1cbcb 100644
--- a/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx
+++ b/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx
@@ -33,17 +33,14 @@ namespace basegfx {
 }
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         // SdrAttribute creators
         attribute::Sdr3DObjectAttribute* createNewSdr3DObjectAttribute(const SfxItemSet& rSet);
 
         // helpers
 
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::attribute
 
 
 #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX
diff --git a/svx/inc/sdr/properties/attributeproperties.hxx b/svx/inc/sdr/properties/attributeproperties.hxx
index aa02c9484696..f425983d8fb4 100644
--- a/svx/inc/sdr/properties/attributeproperties.hxx
+++ b/svx/inc/sdr/properties/attributeproperties.hxx
@@ -25,9 +25,7 @@
 #include <svx/sdr/properties/defaultproperties.hxx>
 
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class AttributeProperties : public DefaultProperties, public SfxListener, public svl::StyleSheetUser
         {
@@ -85,8 +83,8 @@ namespace sdr
 
             virtual bool isUsedByModel() const override;
         };
-    } // end of namespace properties
-} // end of namespace sdr
+
+} // end of namespace sdr::properties
 
 
 #endif // INCLUDED_SVX_SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX
diff --git a/svx/inc/sdr/properties/captionproperties.hxx b/svx/inc/sdr/properties/captionproperties.hxx
index 6e313daa3b92..6a4a2d91b635 100644
--- a/svx/inc/sdr/properties/captionproperties.hxx
+++ b/svx/inc/sdr/properties/captionproperties.hxx
@@ -23,9 +23,7 @@
 #include <sdr/properties/rectangleproperties.hxx>
 
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class CaptionProperties final : public RectangleProperties
         {
@@ -55,8 +53,7 @@ namespace sdr
             // DefaultProperties::GetObjectItemSet() if a new ItemSet is created
             virtual void ForceDefaultAttributes() override;
         };
-    } // end of namespace properties
-} // end of namespace sdr
+} // end of namespace sdr::properties
 
 
 #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_CAPTIONPROPERTIES_HXX
diff --git a/svx/inc/sdr/properties/circleproperties.hxx b/svx/inc/sdr/properties/circleproperties.hxx
index eb5c1980d957..fc06fe82a5f0 100644
--- a/svx/inc/sdr/properties/circleproperties.hxx
+++ b/svx/inc/sdr/properties/circleproperties.hxx
@@ -23,9 +23,7 @@
 #include <sdr/properties/rectangleproperties.hxx>
 
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class CircleProperties final : public RectangleProperties
         {
@@ -55,8 +53,7 @@ namespace sdr
             // DefaultProperties::GetObjectItemSet() if a new ItemSet is created
             virtual void ForceDefaultAttributes() override;
         };
-    } // end of namespace properties
-} // end of namespace sdr
+} // end of namespace sdr::properties
 
 
 #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX
diff --git a/svx/inc/sdr/properties/connectorproperties.hxx b/svx/inc/sdr/properties/connectorproperties.hxx
index f5d5c3892522..5afce0b33b70 100644
--- a/svx/inc/sdr/properties/connectorproperties.hxx
+++ b/svx/inc/sdr/properties/connectorproperties.hxx
@@ -23,9 +23,7 @@
 #include <sdr/properties/textproperties.hxx>
 
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class ConnectorProperties final : public TextProperties
         {
@@ -51,8 +49,7 @@ namespace sdr
             // set a new StyleSheet and broadcast
             virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override;
         };
-    } // end of namespace properties
-} // end of namespace sdr
+} // end of namespace sdr::properties
 
 
 #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX
diff --git a/svx/inc/sdr/properties/customshapeproperties.hxx b/svx/inc/sdr/properties/customshapeproperties.hxx
index 696243bb3585..1c7ced978997 100644
--- a/svx/inc/sdr/properties/customshapeproperties.hxx
+++ b/svx/inc/sdr/properties/customshapeproperties.hxx
@@ -23,9 +23,7 @@
 #include <sdr/properties/textproperties.hxx>
 
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class CustomShapeProperties final : public TextProperties
         {
@@ -79,8 +77,7 @@ namespace sdr
             // This is the notifier from SfxListener
             virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
         };
-    } // end of namespace properties
-} // end of namespace sdr
+} // end of namespace sdr::properties
 
 
 #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX
diff --git a/svx/inc/sdr/properties/e3dcompoundproperties.hxx b/svx/inc/sdr/properties/e3dcompoundproperties.hxx
index 22da0bfcacc4..96abc06f2df2 100644
--- a/svx/inc/sdr/properties/e3dcompoundproperties.hxx
+++ b/svx/inc/sdr/properties/e3dcompoundproperties.hxx
@@ -23,9 +23,7 @@
 #include <sdr/properties/e3dproperties.hxx>
 
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class E3dCompoundProperties : public E3dProperties
         {
@@ -56,8 +54,8 @@ namespace sdr
             // Set merged ItemSet. Normally, this maps to SetObjectItemSet().
             virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false) override;
         };
-    } // end of namespace properties
-} // end of namespace sdr
+
+} // end of namespace sdr::properties
 
 
 #endif // INCLUDED_SVX_SDR_PROPERTIES_E3DCOMPOUNDPROPERTIES_HXX
diff --git a/svx/inc/sdr/properties/e3dextrudeproperties.hxx b/svx/inc/sdr/properties/e3dextrudeproperties.hxx
index b614a9082a31..072b1c796919 100644
--- a/svx/inc/sdr/properties/e3dextrudeproperties.hxx
+++ b/svx/inc/sdr/properties/e3dextrudeproperties.hxx
@@ -23,9 +23,7 @@
 #include <sdr/properties/e3dcompoundproperties.hxx>
 
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class E3dExtrudeProperties final : public E3dCompoundProperties
         {
@@ -45,8 +43,8 @@ namespace sdr
             // Clone() operator, normally just calls the local copy constructor
             virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
         };
-    } // end of namespace properties
-} // end of namespace sdr
+
+} // end of namespace sdr::properties
 
 
 #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX
diff --git a/svx/inc/sdr/properties/e3dlatheproperties.hxx b/svx/inc/sdr/properties/e3dlatheproperties.hxx
index 8b803005208d..56e46fb8b578 100644
--- a/svx/inc/sdr/properties/e3dlatheproperties.hxx
+++ b/svx/inc/sdr/properties/e3dlatheproperties.hxx
@@ -23,9 +23,7 @@
 #include <sdr/properties/e3dcompoundproperties.hxx>
 
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class E3dLatheProperties final : public E3dCompoundProperties
         {
@@ -45,8 +43,8 @@ namespace sdr
             // Clone() operator, normally just calls the local copy constructor
             virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
         };
-    } // end of namespace properties
-} // end of namespace sdr
+
+} // end of namespace sdr::properties
 
 
 #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX
diff --git a/svx/inc/sdr/properties/e3dproperties.hxx b/svx/inc/sdr/properties/e3dproperties.hxx
index 2a6eb0e9e4cc..360a6f998427 100644
--- a/svx/inc/sdr/properties/e3dproperties.hxx
+++ b/svx/inc/sdr/properties/e3dproperties.hxx
@@ -23,9 +23,7 @@
 #include <sdr/properties/attributeproperties.hxx>
 
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class E3dProperties : public AttributeProperties
         {
@@ -49,8 +47,8 @@ namespace sdr
             // Clone() operator, normally just calls the local copy constructor
             virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
         };
-    } // end of namespace properties
-} // end of namespace sdr
+
+} // end of namespace sdr::properties
 
 
 #endif // INCLUDED_SVX_SDR_PROPERTIES_E3DPROPERTIES_HXX
diff --git a/svx/inc/sdr/properties/e3dsceneproperties.hxx b/svx/inc/sdr/properties/e3dsceneproperties.hxx
index 269ecf83d020..e1192d022756 100644
--- a/svx/inc/sdr/properties/e3dsceneproperties.hxx
+++ b/svx/inc/sdr/properties/e3dsceneproperties.hxx
@@ -23,9 +23,7 @@
 #include <sdr/properties/e3dproperties.hxx>
 
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class E3dSceneProperties final : public E3dProperties
         {
@@ -70,8 +68,8 @@ namespace sdr
             // Special for scene:
             void SetSceneItemsFromCamera();
         };
-    } // end of namespace properties
-} // end of namespace sdr
+
+} // end of namespace sdr::properties
 
 
 #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX
diff --git a/svx/inc/sdr/properties/e3dsphereproperties.hxx b/svx/inc/sdr/properties/e3dsphereproperties.hxx
index b1ef923cb42f..61870c939d6d 100644
--- a/svx/inc/sdr/properties/e3dsphereproperties.hxx
+++ b/svx/inc/sdr/properties/e3dsphereproperties.hxx
@@ -23,9 +23,7 @@
 #include <sdr/properties/e3dcompoundproperties.hxx>
 
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class E3dSphereProperties final : public E3dCompoundProperties
         {
@@ -45,8 +43,8 @@ namespace sdr
             // Clone() operator, normally just calls the local copy constructor
             virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
         };
-    } // end of namespace properties
-} // end of namespace sdr
+
+} // end of namespace sdr::properties
 
 
 #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX
diff --git a/svx/inc/sdr/properties/emptyproperties.hxx b/svx/inc/sdr/properties/emptyproperties.hxx
index 734f7be377d5..f482d5f94481 100644
--- a/svx/inc/sdr/properties/emptyproperties.hxx
+++ b/svx/inc/sdr/properties/emptyproperties.hxx
@@ -28,9 +28,7 @@
 #include <svl/itemset.hxx>
 
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class EmptyProperties : public BaseProperties
         {
@@ -85,8 +83,7 @@ namespace sdr
             // get the installed StyleSheet
             virtual SfxStyleSheet* GetStyleSheet() const override;
         };
-    } // end of namespace properties
-} // end of namespace sdr
+} // end of namespace sdr::properties
 
 #endif // INCLUDED_SVX_SDR_PROPERTIES_EMPTYPROPERTIES_HXX
 
diff --git a/svx/inc/sdr/properties/graphicproperties.hxx b/svx/inc/sdr/properties/graphicproperties.hxx
index 018c7643585c..8587a862a103 100644
--- a/svx/inc/sdr/properties/graphicproperties.hxx
+++ b/svx/inc/sdr/properties/graphicproperties.hxx
@@ -23,9 +23,7 @@
 #include <sdr/properties/rectangleproperties.hxx>
 
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class GraphicProperties final : public RectangleProperties
         {
@@ -58,8 +56,7 @@ namespace sdr
             // DefaultProperties::GetObjectItemSet() if a new ItemSet is created
             virtual void ForceDefaultAttributes() override;
         };
-    } // end of namespace properties
-} // end of namespace sdr
+} // end of namespace sdr::properties
 
 
 #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX
diff --git a/svx/inc/sdr/properties/groupproperties.hxx b/svx/inc/sdr/properties/groupproperties.hxx
index 412881708eac..2e05027c7192 100644
--- a/svx/inc/sdr/properties/groupproperties.hxx
+++ b/svx/inc/sdr/properties/groupproperties.hxx
@@ -23,9 +23,7 @@
 #include <svx/sdr/properties/defaultproperties.hxx>
 
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class GroupProperties final : public DefaultProperties
         {
@@ -106,8 +104,7 @@ namespace sdr
             // to be able to live without the style.
             virtual void ForceStyleToHardAttributes() override;
         };
-    } // end of namespace properties
-} // end of namespace sdr
+} // end of namespace sdr::properties
 
 
 #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_GROUPPROPERTIES_HXX
diff --git a/svx/inc/sdr/properties/itemsettools.hxx b/svx/inc/sdr/properties/itemsettools.hxx
index 4559f8f2e3c8..3f7225161e35 100644
--- a/svx/inc/sdr/properties/itemsettools.hxx
+++ b/svx/inc/sdr/properties/itemsettools.hxx
@@ -29,9 +29,7 @@ class SfxItemSet;
 class Fraction;
 
 // class to remember broadcast start positions
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class ItemChangeBroadcaster
         {
@@ -49,16 +47,12 @@ namespace sdr
                 return maRectangles[nIndex];
             }
         };
-    } // end of namespace properties
-} // end of namespace sdr
+} // end of namespace sdr::properties
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         void ScaleItemSet(SfxItemSet& rSet, const Fraction& rScale);
-    } // end of namespace properties
-} // end of namespace sdr
+} // end of namespace sdr::properties
 
 #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_ITEMSETTOOLS_HXX
 
diff --git a/svx/inc/sdr/properties/measureproperties.hxx b/svx/inc/sdr/properties/measureproperties.hxx
index 70f3812e3888..301661f5a119 100644
--- a/svx/inc/sdr/properties/measureproperties.hxx
+++ b/svx/inc/sdr/properties/measureproperties.hxx
@@ -23,9 +23,7 @@
 #include <sdr/properties/textproperties.hxx>
 
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class MeasureProperties final : public TextProperties
         {
@@ -55,8 +53,7 @@ namespace sdr
             // DefaultProperties::GetObjectItemSet() if a new ItemSet is created
             virtual void ForceDefaultAttributes() override;
         };
-    } // end of namespace properties
-} // end of namespace sdr
+} // end of namespace sdr::properties
 
 
 #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_MEASUREPROPERTIES_HXX
diff --git a/svx/inc/sdr/properties/oleproperties.hxx b/svx/inc/sdr/properties/oleproperties.hxx
index 49629be3dd9d..abd321ba7cdf 100644
--- a/svx/inc/sdr/properties/oleproperties.hxx
+++ b/svx/inc/sdr/properties/oleproperties.hxx
@@ -23,9 +23,7 @@
 #include <sdr/properties/rectangleproperties.hxx>
 
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class OleProperties final : public RectangleProperties
         {
@@ -49,8 +47,7 @@ namespace sdr
             // DefaultProperties::GetObjectItemSet() if a new ItemSet is created
             virtual void ForceDefaultAttributes() override;
         };
-    } // end of namespace properties
-} // end of namespace sdr
+} // end of namespace sdr::properties
 
 
 #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_OLEPROPERTIES_HXX
diff --git a/svx/inc/sdr/properties/pageproperties.hxx b/svx/inc/sdr/properties/pageproperties.hxx
index 1aab9c2f6d3c..cc4d21a641e7 100644
--- a/svx/inc/sdr/properties/pageproperties.hxx
+++ b/svx/inc/sdr/properties/pageproperties.hxx
@@ -23,9 +23,7 @@
 #include <sdr/properties/emptyproperties.hxx>
 
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class PageProperties final : public EmptyProperties
         {
@@ -64,8 +62,7 @@ namespace sdr
             // clear single item
             virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) override;
         };
-    } // end of namespace properties
-} // end of namespace sdr
+} // end of namespace sdr::properties
 
 
 #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_PAGEPROPERTIES_HXX
diff --git a/svx/inc/sdr/properties/rectangleproperties.hxx b/svx/inc/sdr/properties/rectangleproperties.hxx
index 5512ffb5b196..1af85d786d9b 100644
--- a/svx/inc/sdr/properties/rectangleproperties.hxx
+++ b/svx/inc/sdr/properties/rectangleproperties.hxx
@@ -23,9 +23,7 @@
 #include <sdr/properties/textproperties.hxx>
 
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class RectangleProperties : public TextProperties
         {
@@ -49,8 +47,7 @@ namespace sdr
             // set a new StyleSheet and broadcast
             virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override;
         };
-    } // end of namespace properties
-} // end of namespace sdr
+} // end of namespace sdr::properties
 
 
 #endif // INCLUDED_SVX_SDR_PROPERTIES_RECTANGLEPROPERTIES_HXX
diff --git a/svx/inc/sdr/properties/textproperties.hxx b/svx/inc/sdr/properties/textproperties.hxx
index 5e6482a4faf0..26cc52c96ba6 100644
--- a/svx/inc/sdr/properties/textproperties.hxx
+++ b/svx/inc/sdr/properties/textproperties.hxx
@@ -24,9 +24,7 @@
 #include <sdr/properties/attributeproperties.hxx>
 
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class TextProperties : public AttributeProperties
         {
@@ -81,8 +79,7 @@ namespace sdr
             // #i101556# versioning support
             virtual sal_uInt32 getVersion() const override;
         };
-    } // end of namespace properties
-} // end of namespace sdr
+} // end of namespace sdr::properties
 
 
 #endif // INCLUDED_SVX_SDR_PROPERTIES_TEXTPROPERTIES_HXX
diff --git a/svx/source/inc/fmcontrollayout.hxx b/svx/source/inc/fmcontrollayout.hxx
index 8a8062cfe356..f2494d83ef14 100644
--- a/svx/source/inc/fmcontrollayout.hxx
+++ b/svx/source/inc/fmcontrollayout.hxx
@@ -25,11 +25,8 @@
 #include "fmdocumentclassification.hxx"
 
 
-namespace svxform
+namespace svxform::ControlLayouter
 {
-
-    namespace ControlLayouter
-    {
         /** initializes the layout of a newly created form control (model)
         */
         void initializeControlLayout(
@@ -56,8 +53,6 @@ namespace svxform
         */
         css::uno::Reference< css::beans::XPropertySet >
                     getDefaultDocumentTextStyle( const css::uno::Reference< css::beans::XPropertySet >& _rxModel );
-    }
-
 
 }
 
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx
index 767564fe69a8..0402918b82bc 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.hxx
@@ -34,9 +34,7 @@ class ListBox;
 class ToolBox;
 class FloatingWindow;
 
-namespace svx
-{
-namespace sidebar
+namespace svx::sidebar
 {
 
 class LinePropertyPanel : public LinePropertyPanelBase,
@@ -93,7 +91,7 @@ private:
     vcl::EnumContext maContext;
 };
 
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
 
 #endif
 
diff --git a/svx/source/sidebar/lists/ListsPropertyPanel.hxx b/svx/source/sidebar/lists/ListsPropertyPanel.hxx
index 350891684eda..2a1c3dd9b4ef 100644
--- a/svx/source/sidebar/lists/ListsPropertyPanel.hxx
+++ b/svx/source/sidebar/lists/ListsPropertyPanel.hxx
@@ -23,9 +23,7 @@
 #include <sfx2/sidebar/PanelLayout.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 
-namespace svx
-{
-namespace sidebar
+namespace svx::sidebar
 {
 class ListsPropertyPanel : public PanelLayout
 {
@@ -45,7 +43,7 @@ private:
     std::unique_ptr<weld::Toolbar> mxTBxOutline;
     std::unique_ptr<ToolbarUnoDispatcher> mxOutlineDispatcher;
 };
-}
+
 } // end of namespace svx::sidebar
 
 #endif
diff --git a/svx/source/table/viewcontactoftableobj.hxx b/svx/source/table/viewcontactoftableobj.hxx
index 8ee5af27bba9..91a3a26e4e7f 100644
--- a/svx/source/table/viewcontactoftableobj.hxx
+++ b/svx/source/table/viewcontactoftableobj.hxx
@@ -23,9 +23,7 @@
 #include <svx/sdr/contact/viewcontactofsdrobj.hxx>
 #include <svx/svdotable.hxx>
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class ViewContactOfTableObj : public ViewContactOfSdrObj
         {
@@ -39,8 +37,7 @@ namespace sdr
             explicit ViewContactOfTableObj(sdr::table::SdrTableObj& rTextObj);
             virtual ~ViewContactOfTableObj() override;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
 #endif