use more compact namespace syntax in /include

excluding the UDK headers of course

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

62 files changed, 153 insertions, 154 deletions

diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx
index 75c38657bf9a..a90ab5ee9f27 100644
--- a/include/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
@@ -33,7 +33,7 @@
 #include <sal/types.h>
 #include <svx/AccessibleShape.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace accessibility { class XAccessible; }
     namespace accessibility { class XAccessibleContext; }
     namespace accessibility { struct AccessibleEventObject; }
@@ -47,7 +47,7 @@ namespace com { namespace sun { namespace star {
     namespace lang { class XTypeProvider; }
     namespace uno { class XAggregation; }
     namespace util { struct ModeChangeEvent; }
-} } }
+}
 
 namespace comphelper
 {
diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx
index 07f68228439d..5119da01635b 100644
--- a/include/svx/AccessibleOLEShape.hxx
+++ b/include/svx/AccessibleOLEShape.hxx
@@ -30,9 +30,9 @@
 #include <svx/AccessibleShape.hxx>
 #include <svx/svxdllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace accessibility { class XAccessibleKeyBinding; }
-} } }
+}
 
 namespace accessibility {
 
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index ced35ca26e66..487c7aeabd80 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -46,7 +46,7 @@
 #include <svx/svxdllapi.h>
 #include <memory>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace accessibility { class XAccessible; }
     namespace accessibility { class XAccessibleEventListener; }
     namespace accessibility { class XAccessibleHyperlink; }
@@ -56,7 +56,7 @@ namespace com { namespace sun { namespace star {
     namespace document { struct EventObject; }
     namespace drawing { class XShape; }
     namespace uno { class XInterface; }
-} } }
+}
 
 class SdrObject;
 
diff --git a/include/svx/AccessibleShapeInfo.hxx b/include/svx/AccessibleShapeInfo.hxx
index d40251c41237..5cb9bfb0db04 100644
--- a/include/svx/AccessibleShapeInfo.hxx
+++ b/include/svx/AccessibleShapeInfo.hxx
@@ -23,10 +23,10 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <svx/svxdllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace accessibility { class XAccessible; }
     namespace drawing { class XShape; }
-} } }
+}
 
 namespace accessibility {
 
diff --git a/include/svx/AccessibleShapeTreeInfo.hxx b/include/svx/AccessibleShapeTreeInfo.hxx
index 82f98759902f..220bc2649a2e 100644
--- a/include/svx/AccessibleShapeTreeInfo.hxx
+++ b/include/svx/AccessibleShapeTreeInfo.hxx
@@ -24,11 +24,11 @@
 #include <svx/svxdllapi.h>
 #include <vcl/window.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace accessibility { class XAccessibleComponent; }
     namespace document { class XShapeEventBroadcaster; }
     namespace frame { class XController; }
-} } }
+}
 
 class SdrView;
 
diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx
index e469b8df477c..5f646d83253c 100644
--- a/include/svx/AccessibleTextHelper.hxx
+++ b/include/svx/AccessibleTextHelper.hxx
@@ -27,11 +27,11 @@
 #include <sal/types.h>
 #include <svx/svxdllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace accessibility { class XAccessible; }
     namespace accessibility { class XAccessibleEventListener; }
     namespace awt { struct Point; }
-} } }
+}
 
 class Point;
 class SvxEditSource;
diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx
index a9d1842d8057..14a90c7549bf 100644
--- a/include/svx/ChildrenManager.hxx
+++ b/include/svx/ChildrenManager.hxx
@@ -26,11 +26,11 @@
 #include <rtl/ref.hxx>
 #include <svx/svxdllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
      namespace accessibility { class XAccessible; }
      namespace drawing { class XShape; }
      namespace drawing { class XShapes; }
-} } }
+}
 
 namespace accessibility {
 
diff --git a/include/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx
index 3fe96af56fd2..9b8b11049539 100644
--- a/include/svx/SmartTagItem.hxx
+++ b/include/svx/SmartTagItem.hxx
@@ -25,18 +25,17 @@
 #include <com/sun/star/smarttags/XSmartTagAction.hpp>
 #include <svx/svxdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace container {
+namespace com::sun::star::container {
     class XStringKeyMap;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace text {
+namespace com::sun::star::text {
     class XTextRange;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace frame {
+namespace com::sun::star::frame {
     class XController;
-} } } }
-
+}
 class SVX_DLLPUBLIC SvxSmartTagItem final : public SfxPoolItem
 {
     const css::uno::Sequence < css::uno::Sequence< css::uno::Reference< css::smarttags::XSmartTagAction > > > maActionComponentsSequence;
diff --git a/include/svx/SmartTagMgr.hxx b/include/svx/SmartTagMgr.hxx
index a614d97ebbd9..b20f68a60002 100644
--- a/include/svx/SmartTagMgr.hxx
+++ b/include/svx/SmartTagMgr.hxx
@@ -31,37 +31,37 @@
 #include <map>
 #include <set>
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
     class XComponentContext;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace smarttags {
+namespace com::sun::star::smarttags {
     class XSmartTagRecognizer;
     class XSmartTagAction;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace text {
+namespace com::sun::star::text {
     class XTextMarkup;
     class XTextRange;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace com::sun::star::i18n {
     class XBreakIterator;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace lang {
+namespace com::sun::star::lang {
     struct Locale;
     struct EventObject;
     struct ChangesEvent;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
     class XPropertySet;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace frame {
+namespace com::sun::star::frame {
     class XController;
-} } } }
+}
 
 /** A reference to a smart tag action
 
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 6d51b4a60b3b..4b47a785b860 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -35,9 +35,9 @@
 #include <vcl/customweld.hxx>
 #include <vcl/weld.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace accessibility { class XAccessible; }
-} } }
+}
 
 namespace com::sun::star::uno { class XComponentContext; }
 
diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx
index c1fa1c1f9fd6..e587dbc3db6d 100644
--- a/include/svx/charthelper.hxx
+++ b/include/svx/charthelper.hxx
@@ -24,11 +24,11 @@
 #include <sal/types.h>
 #include <svx/svxdllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace embed { class XEmbeddedObject; }
     namespace frame { class XModel; }
     namespace uno { template <typename > class Reference; }
-} } }
+}
 
 namespace basegfx { class B2DRange; }
 
diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index 6fdcce7256ef..d9b660fa6e52 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -27,7 +27,7 @@
 #include <svx/obj3d.hxx>
 #include <svx/svxdllapi.h>
 
-namespace sdr { namespace contact { class ViewContact; } }
+namespace sdr::contact { class ViewContact; }
 
 class E3dDefaultAttributes;
 
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index b8285349b5e8..d6d299849e95 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -31,9 +31,9 @@
 #include <memory>
 #include <array>
 
-namespace com { namespace sun { namespace star { namespace awt {
+namespace com::sun::star::awt {
     struct Point;
-} } } }
+}
 
 /*************************************************************************
 |* Derived from SfxTabPage for being able to get notified through the
diff --git a/include/svx/e3dsceneupdater.hxx b/include/svx/e3dsceneupdater.hxx
index 6ba0afa888dc..dd7954180cac 100644
--- a/include/svx/e3dsceneupdater.hxx
+++ b/include/svx/e3dsceneupdater.hxx
@@ -26,9 +26,9 @@
 class SdrObject;
 class E3dScene;
 
-namespace drawinglayer { namespace geometry {
+namespace drawinglayer::geometry {
     class ViewInformation3D;
-}}
+}
 
 /** Helper for 3d object changes affecting 2d geometry
 
diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx
index b3005014b757..7459837ec31e 100644
--- a/include/svx/fmpage.hxx
+++ b/include/svx/fmpage.hxx
@@ -27,11 +27,11 @@
 class FmFormModel;
 class FmFormPageImpl;   // contains a list of all forms
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace form {
         class XForms;
     }
-}}}
+}
 
 class SdrView;
 class HelpEvent;
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index ca0a13a902f1..809f26e291c6 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -42,12 +42,12 @@ class SdrView;
 class SdrUnoObj;
 class LinkParamNone;
 
-namespace com { namespace sun { namespace star { namespace form {
+namespace com::sun::star::form {
     class XForm;
     namespace runtime {
         class XFormController;
     }
-} } } }
+}
 
 namespace com::sun::star::awt { class XControl; }
 namespace com::sun::star::awt { class XControlModel; }
diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx
index b83420b43e0c..00cecc94d8be 100644
--- a/include/svx/fmview.hxx
+++ b/include/svx/fmview.hxx
@@ -23,14 +23,14 @@
 #include <svx/view3d.hxx>
 #include <svx/svxdllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans {
         class XPropertySet;
     }
     namespace util {
         class XNumberFormats;
     }
-}}}
+}
 
 class OutputDevice;
 class FmFormObj;
@@ -44,12 +44,12 @@ namespace svx {
 }
 
 class SdrUnoObj;
-namespace com { namespace sun { namespace star { namespace form {
+namespace com::sun::star::form {
     class XForm;
     namespace runtime {
         class XFormController;
     }
-} } } }
+}
 
 class SVXCORE_DLLPUBLIC FmFormView : public E3dView
 {
diff --git a/include/svx/helperhittest3d.hxx b/include/svx/helperhittest3d.hxx
index 0e07e309b9c4..f262564b9e66 100644
--- a/include/svx/helperhittest3d.hxx
+++ b/include/svx/helperhittest3d.hxx
@@ -30,9 +30,9 @@ namespace basegfx {
     class B2DPoint;
 }
 
-namespace drawinglayer { namespace geometry {
+namespace drawinglayer::geometry {
     class ViewInformation3D;
-}}
+}
 
 class E3dCompoundObject;
 class E3dScene;
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 963b14c25075..fbecb2719ba0 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -24,7 +24,7 @@
 #include <editeng/numitem.hxx>
 #include <vcl/font.hxx>
 
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
 
 #define DEFAULT_BULLET_TYPES                            8
 #define DEFAULT_NUM_VALUSET_COUNT                       8
@@ -204,7 +204,7 @@ class OutlineTypeMgr: public NBOTypeMgrBase
         virtual bool IsCustomized(sal_uInt16 nIndex) override;
         static OutlineTypeMgr& GetInstance();
 };
-}}
+}
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/nbdtmgfact.hxx b/include/svx/nbdtmgfact.hxx
index 011cf41ec82f..3928be1e6f36 100644
--- a/include/svx/nbdtmgfact.hxx
+++ b/include/svx/nbdtmgfact.hxx
@@ -21,9 +21,10 @@
 
 #include <svx/nbdtmg.hxx>
 
-namespace svx { namespace sidebar { namespace NBOutlineTypeMgrFact {
+namespace svx::sidebar::NBOutlineTypeMgrFact {
     SVX_DLLPUBLIC NBOTypeMgrBase* CreateInstance(const NBOType aType);
-}}}
+}
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index ed17989fff9e..2b58fb6dd4ab 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <svx/svxdllapi.h>
 
-namespace com{namespace sun{ namespace star{
+namespace com::sun::star {
     namespace container{
         class XIndexAccess;
     }
@@ -36,7 +36,7 @@ namespace com{namespace sun{ namespace star{
     namespace text{
         class XNumberingFormatter;
     }
-}}}
+}
 
 enum class NumberingPageType
 {
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index b4c7abf6d3b7..c986cd68d0ab 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -30,13 +30,13 @@
 // Forward declarations
 class E3dScene;
 
-namespace sdr { namespace properties {
+namespace sdr::properties {
     class BaseProperties;
     class E3dCompoundProperties;
     class E3dExtrudeProperties;
     class E3dLatheProperties;
     class E3dSphereProperties;
-}}
+}
 
 /*************************************************************************
 |*
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index bd53b273a16c..837c2da43a39 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -28,9 +28,9 @@
 #include <svx/svx3ditems.hxx>
 #include <memory>
 
-namespace sdr { namespace properties {
+namespace sdr::properties {
     class BaseProperties;
-}}
+}
 
 /*************************************************************************
 |*
diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx
index 27c219b2cba4..6d5d63a27b1c 100644
--- a/include/svx/sdr/contact/objectcontact.hxx
+++ b/include/svx/sdr/contact/objectcontact.hxx
@@ -35,7 +35,7 @@ namespace basegfx {
     class B2DHomMatrix;
 }
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
 
 class DisplayInfo;
 class ViewContact;
@@ -167,7 +167,7 @@ public:
     void resetAllGridOffsets();
 };
 
-}}
+}
 
 
 #endif // INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACT_HXX
diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx
index 288a0007266a..c3e9328d954f 100644
--- a/include/svx/sdr/contact/viewcontact.hxx
+++ b/include/svx/sdr/contact/viewcontact.hxx
@@ -28,7 +28,7 @@ class SdrLayerIDSet;
 class SdrPage;
 class SdrObject;
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
 
 class ObjectContact;
 class ViewObjectContact;
@@ -140,7 +140,7 @@ public:
     void flushViewObjectContacts(bool bWithHierarchy = true);
 };
 
-}}
+}
 
 
 #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACT_HXX
diff --git a/include/svx/sdr/contact/viewcontactofe3dscene.hxx b/include/svx/sdr/contact/viewcontactofe3dscene.hxx
index 890a964b0af7..b26e272f91f3 100644
--- a/include/svx/sdr/contact/viewcontactofe3dscene.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3dscene.hxx
@@ -32,7 +32,7 @@ namespace basegfx {
     class B3DRange;
 }
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
 
 class SVXCORE_DLLPUBLIC ViewContactOfE3dScene final : public ViewContactOfSdrObj
 {
@@ -96,7 +96,7 @@ private:
     drawinglayer::attribute::SdrLightingAttribute       maSdrLightingAttribute;
 };
 
-}}
+}
 
 #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DSCENE_HXX
 
diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
index 0d7813a71029..cb2953200da4 100644
--- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
@@ -27,7 +27,7 @@
 
 namespace avmedia { class MediaItem; }
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
 
 class SVXCORE_DLLPUBLIC ViewContactOfSdrMediaObj : public ViewContactOfSdrObj
 {
@@ -67,7 +67,7 @@ protected:
     virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
 };
 
-}}
+}
 
 
 #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEDIAOBJ_HXX
diff --git a/include/svx/sdr/contact/viewcontactofsdrobj.hxx b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
index d8d17d96c3f1..a20dde7bb4b6 100644
--- a/include/svx/sdr/contact/viewcontactofsdrobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
@@ -29,7 +29,7 @@ class SdrObject;
 class GeoStat;
 class Bitmap;
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
 
 class SVXCORE_DLLPUBLIC ViewContactOfSdrObj : public ViewContact
 {
@@ -80,7 +80,7 @@ public:
     virtual drawinglayer::primitive2d::Primitive2DContainer embedToObjectSpecificInformation(drawinglayer::primitive2d::Primitive2DContainer aSource) const override;
 };
 
-}}
+}
 
 #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROBJ_HXX
 
diff --git a/include/svx/sdr/contact/viewcontactofvirtobj.hxx b/include/svx/sdr/contact/viewcontactofvirtobj.hxx
index 3e514f116ee1..f1374c7fb669 100644
--- a/include/svx/sdr/contact/viewcontactofvirtobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofvirtobj.hxx
@@ -24,7 +24,7 @@
 
 class SdrVirtObj;
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
 
 class SVXCORE_DLLPUBLIC ViewContactOfVirtObj : public ViewContactOfSdrObj
 {
@@ -47,7 +47,7 @@ protected:
     virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
 };
 
-}}
+}
 
 #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFVIRTOBJ_HXX
 
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx
index f7542908a8e6..9c806aa08e46 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -26,11 +26,11 @@
 
 namespace vcl { class Region; }
 
-namespace sdr { namespace animation {
+namespace sdr::animation {
     class PrimitiveAnimation;
-}}
+}
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
 
 class DisplayInfo;
 class ObjectContact;
@@ -130,7 +130,7 @@ public:
     void resetGridOffset();
 };
 
-}}
+}
 
 
 #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACT_HXX
diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
index 7f2565576322..07e748651ad3 100644
--- a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
@@ -26,7 +26,7 @@ class SdrObject;
 class SdrLayerIDSet;
 class OutputDevice;
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
 
 class SVXCORE_DLLPUBLIC ViewObjectContactOfSdrObj : public ViewObjectContact
 {
@@ -58,7 +58,7 @@ public:
     const OutputDevice* getPageViewOutputDevice() const;
 };
 
-}}
+}
 
 #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROBJ_HXX
 
diff --git a/include/svx/sdr/contact/viewobjectcontactredirector.hxx b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
index c30be2b9ddca..1dc69d2383d1 100644
--- a/include/svx/sdr/contact/viewobjectcontactredirector.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
@@ -23,7 +23,7 @@
 #include <svx/svxdllapi.h>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
 
 class DisplayInfo;
 class ViewObjectContact;
@@ -48,7 +48,7 @@ public:
         const sdr::contact::DisplayInfo& rDisplayInfo);
 };
 
-}}
+}
 
 #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTREDIRECTOR_HXX
 
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index f75f42107520..412d45aa3a5c 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -35,9 +35,9 @@ class OutputDevice;
 class SdrModel;
 namespace vcl { class Region; }
 
-namespace sdr { namespace overlay {
+namespace sdr::overlay {
     class OverlayObject;
-}}
+}
 
 namespace basegfx {
     class B2DRange;
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index f186b32147f6..f34499a05991 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -35,7 +35,7 @@ class SfxItemSet;
 class SvxBoxInfoItem;
 class SvxBoxItem;
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 class TableModel;
 
@@ -191,7 +191,7 @@ rtl::Reference< sdr::SelectionController > CreateTableController(
      const SdrTableObj& rObj,
      const rtl::Reference< sdr::SelectionController >& xRefController );
 
-} }
+}
 
 #endif // INCLUDED_SVX_SDR_TABLE_TABLECONTROLLER_HXX
 
diff --git a/include/svx/sdr/table/tabledesign.hxx b/include/svx/sdr/table/tabledesign.hxx
index cf0ed0cf00f9..8c03ee67b3ea 100644
--- a/include/svx/sdr/table/tabledesign.hxx
+++ b/include/svx/sdr/table/tabledesign.hxx
@@ -24,7 +24,7 @@
 
 #include <com/sun/star/container/XNameAccess.hpp>
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 const sal_Int32 first_row_style = 0;
 const sal_Int32 last_row_style = 1;
@@ -40,7 +40,7 @@ const sal_Int32 style_count = 10;
 
 extern SVX_DLLPUBLIC css::uno::Reference< css::container::XNameAccess > CreateTableDesignFamily();
 
-} }
+}
 
 
 #endif
diff --git a/include/svx/sdrhittesthelper.hxx b/include/svx/sdrhittesthelper.hxx
index 3dc9c81d69f5..87cf1afbea10 100644
--- a/include/svx/sdrhittesthelper.hxx
+++ b/include/svx/sdrhittesthelper.hxx
@@ -31,9 +31,9 @@ class SdrObject;
 class SdrPageView;
 class SdrLayerIDSet;
 class SdrObjList;
-namespace sdr { namespace contact { class ViewObjectContact; }}
+namespace sdr::contact { class ViewObjectContact; }
 namespace basegfx { class B2DPoint; }
-namespace drawinglayer { namespace primitive2d { class Primitive2DContainer; }}
+namespace drawinglayer::primitive2d { class Primitive2DContainer; }
 
 
 // Wrappers for classic Sdr* Mode/View classes
diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index e7d534ca1a9c..80417a6729a0 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -28,7 +28,7 @@
 namespace com::sun::star::awt { class XControlContainer; }
 namespace com::sun::star::uno { template <class interface_type> class Reference; }
 namespace rtl { template <class reference_type> class Reference; }
-namespace sdr { namespace overlay { class OverlayManager; } }
+namespace sdr::overlay { class OverlayManager; }
 namespace vcl { class Region; }
 
 namespace sdr
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index 07b311763144..2ea0356dbb27 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -45,7 +45,7 @@ class XFillColorItem;
 class XFillHatchItem;
 class XFillBitmapItem;
 
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
 
 class SVX_DLLPUBLIC AreaPropertyPanelBase
 :   public PanelLayout,
@@ -171,7 +171,7 @@ protected:
     void SelectFillAttrHdl_Impl();
 };
 
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
 
 #endif // INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREAPROPERTYPANEL_HXX
 
diff --git a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
index d10c6445705b..29e6b4f841a1 100644
--- a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
+++ b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
@@ -23,7 +23,7 @@
 
 class XFillFloatTransparenceItem;
 
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
 
 class AreaTransparencyGradientControl;
 class AreaPropertyPanelBase;
@@ -61,7 +61,7 @@ public:
     void Rearrange(XFillFloatTransparenceItem const * pItem);
 };
 
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
 
 #endif
 
diff --git a/include/svx/sidebar/LineWidthPopup.hxx b/include/svx/sidebar/LineWidthPopup.hxx
index f60a0c848f0d..c16924d0cec8 100644
--- a/include/svx/sidebar/LineWidthPopup.hxx
+++ b/include/svx/sidebar/LineWidthPopup.hxx
@@ -27,7 +27,7 @@
 
 class ValueSet;
 
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
 
 class LinePropertyPanelBase;
 class LineWidthValueSet;
@@ -64,7 +64,7 @@ private:
     DECL_LINK(FocusHdl, weld::Widget&, void);
 };
 
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
 
 #endif
 
diff --git a/include/svx/sidebar/SelectionAnalyzer.hxx b/include/svx/sidebar/SelectionAnalyzer.hxx
index d1aebbc220c4..a7b8cba99d4c 100644
--- a/include/svx/sidebar/SelectionAnalyzer.hxx
+++ b/include/svx/sidebar/SelectionAnalyzer.hxx
@@ -26,7 +26,7 @@ class SdrMarkList;
 class SdrObject;
 enum class SdrInventor : sal_uInt32;
 
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
 
 /** Analyze the current selection of Calc or Draw/Impress documents
     and return the associated sidebar context.
@@ -68,7 +68,7 @@ private:
         const sal_uInt16 nType);
 };
 
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
 
 #endif
 
diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx
index 0a6b8f637b94..4f5c5b818b5f 100644
--- a/include/svx/sidebar/SelectionChangeHandler.hxx
+++ b/include/svx/sidebar/SelectionChangeHandler.hxx
@@ -32,7 +32,7 @@
 class SdrMarkView;
 
 
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
 
 typedef cppu::WeakComponentImplHelper<
     css::view::XSelectionChangeListener
@@ -69,7 +69,7 @@ private:
 };
 
 
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
 
 
 #endif
diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx
index 466fa3e05688..5dd075a28458 100644
--- a/include/svx/sidebar/ValueSetWithTextControl.hxx
+++ b/include/svx/sidebar/ValueSetWithTextControl.hxx
@@ -25,7 +25,7 @@
 
 #include <vector>
 
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
 
 /** Specialization of class <ValueSet>.
     This specialization allows is a one-columned ValueSet which allow
@@ -56,7 +56,7 @@ private:
     ::std::vector< ValueSetWithTextItem > maItems;
 };
 
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
 
 #endif
 
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index f20863aecf69..a78dd5cdc637 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -37,9 +37,9 @@ struct PasteOrDropInfos;
 class SdrUndoManager;
 class TextChainCursorManager;
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
     class Any;
-} } } }
+}
 
 namespace sdr {
     class SelectionController;
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 1cde7792fa1b..14af8569f0e5 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -43,9 +43,9 @@ class SdrModel;
 class SvtSysLocale;
 class LocaleDataWrapper;
 
-namespace com { namespace sun { namespace star { namespace lang {
+namespace com::sun::star::lang {
     struct Locale;
-}}}}
+}
 
 /**
  * Create an Outliner with the engine-global default settings on the heap.
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index ed2905971e97..aca1b4f59404 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -37,9 +37,9 @@ class SdrPageView;
 class MouseEvent;
 class HelpEvent;
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
     class ObjectContact;
-}}
+}
 
 // Every object must be able to create its handles. They will be fetched on
 // selection, registered at the View and made visible.
diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx
index 20af0b898359..01b928b612ed 100644
--- a/include/svx/svdocapt.hxx
+++ b/include/svx/svdocapt.hxx
@@ -27,9 +27,9 @@
 //   Forward Declarations
 class ImpCaptParams;
 
-namespace sdr { namespace properties {
+namespace sdr::properties {
     class CaptionProperties;
-}}
+}
 
 //   Helper Class SdrCaptObjGeoData
 class SdrCaptObjGeoData final : public SdrTextObjGeoData
diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx
index 2767fdd7d9f5..105850fa3f84 100644
--- a/include/svx/svdocirc.hxx
+++ b/include/svx/svdocirc.hxx
@@ -23,9 +23,9 @@
 #include <svx/svdorect.hxx>
 #include <svx/svxdllapi.h>
 
-namespace sdr { namespace properties {
+namespace sdr::properties {
     class CircleProperties;
-}}
+}
 
 // Helper class SdrCircObjGeoData
 
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index 66deeb072845..2320091ab1a1 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -29,9 +29,9 @@
 class SdrDragMethod;
 class SdrPageView;
 
-namespace sdr { namespace properties {
+namespace sdr::properties {
     class ConnectorProperties;
-}}
+}
 
 
 /// Utility class SdrObjConnection
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index 18a0fb47596e..6384d74882fb 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -28,9 +28,9 @@ class SdrOutliner;
 struct ImpMeasureRec;
 struct ImpMeasurePoly;
 
-namespace sdr { namespace properties {
+namespace sdr::properties {
     class MeasureProperties;
-}}
+}
 
 class SdrMeasureObjGeoData final : public SdrTextObjGeoData
 {
diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx
index 1815341aa2e9..258a287509a4 100644
--- a/include/svx/svdomedia.hxx
+++ b/include/svx/svdomedia.hxx
@@ -27,7 +27,7 @@
 
 class Graphic;
 
-namespace sdr { namespace contact { class ViewContactOfSdrMediaObj; } }
+namespace sdr::contact { class ViewContactOfSdrMediaObj; }
 namespace com::sun::star::graphic { class XGraphic; }
 
 
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index c3ce4f0233ec..85f0125c17b0 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -27,7 +27,7 @@
 
 #include <com/sun/star/uno/Reference.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
 
 namespace awt { class XWindow; }
 
@@ -37,7 +37,7 @@ namespace embed { class XEmbeddedObject; }
 
 namespace frame { class XModel; }
 
-}}}
+}
 
 namespace svt { class EmbeddedObjectRef; }
 
diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx
index 5732a33104d6..98929002b6d2 100644
--- a/include/svx/svdorect.hxx
+++ b/include/svx/svdorect.hxx
@@ -28,9 +28,9 @@
 // Forward declaration
 class XPolygon;
 
-namespace sdr { namespace properties {
+namespace sdr::properties {
     class RectangleProperties;
-}}
+}
 
 
 //   SdrRectObj
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 6333b9d6082f..df713b66c951 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -32,11 +32,11 @@ class SvStream;
 class SfxStyleSheet;
 class SdrUndoAction;
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
     class ViewContactOfTableObj;
-}}
+}
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 class TableLayouter;
 struct ImplTableShadowPaintInfo;
@@ -285,7 +285,7 @@ private:
 SVX_DLLPUBLIC void ExportAsRTF( SvStream& rStrm, SdrTableObj& rObj );
 SVX_DLLPUBLIC void ImportAsRTF( SvStream& rStrm, SdrTableObj& rObj );
 
-} }
+}
 
 #endif
 
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 3e4782416e47..6f1804bb1757 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -54,32 +54,32 @@ class TextChainFlow;
 enum class EEAnchorMode;
 enum class EETextFormat;
 
-namespace sdr { namespace properties {
+namespace sdr::properties {
     class TextProperties;
-}}
+}
 
-namespace drawinglayer { namespace primitive2d {
+namespace drawinglayer::primitive2d {
     class SdrContourTextPrimitive2D;
     class SdrPathTextPrimitive2D;
     class SdrBlockTextPrimitive2D;
     class SdrAutoFitTextPrimitive2D;
     class SdrStretchTextPrimitive2D;
     class SdrChainedTextPrimitive2D;
-}}
+}
 
-namespace drawinglayer { namespace animation {
+namespace drawinglayer::animation {
     class AnimationEntryList;
-}}
+}
 
-namespace drawinglayer { namespace geometry {
+namespace drawinglayer::geometry {
     class ViewInformation2D;
-}}
+}
 
-namespace sdr { namespace table {
+namespace sdr::table {
     class Cell;
     class SdrTableRtfExporter;
     class SdrTableRTFParser;
-}}
+}
 
 
 //   Defines
diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx
index c78ba0fa2e97..22f10d334a09 100644
--- a/include/svx/svdouno.hxx
+++ b/include/svx/svdouno.hxx
@@ -34,9 +34,9 @@ class SdrView;
 class SdrPageWindow;
 class SdrControlEventListenerImpl;
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
     class ViewContactOfUnoControl;
-}}
+}
 
 
 // SdrUnoObj
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index e77713e9c2db..7d55b0fab697 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -37,7 +37,7 @@
 
 // predefines
 namespace reportdesign { class OSection; }
-namespace sdr { namespace contact { class ViewContact; }}
+namespace sdr::contact { class ViewContact; }
 class SdrPage;
 class SdrModel;
 class SfxItemPool;
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 1b96b01ac75f..3f899f529211 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -39,10 +39,10 @@
 // Pre defines
 class SdrPageWindow;
 
-namespace com { namespace sun { namespace star { namespace awt {
+namespace com::sun::star::awt {
     class XControlContainer;
-}}}}
-namespace sdr { namespace overlay { class OverlayManager; } }
+}
+namespace sdr::overlay { class OverlayManager; }
 
 class SdrPage;
 class SdrView;
@@ -53,9 +53,9 @@ class SdrModel;
 class SdrObject;
 enum class GraphicManagerDrawFlags;
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
     class ViewObjectContactRedirector;
-}}
+}
 
 
 // Defines for AnimationMode
diff --git a/include/svx/svdtext.hxx b/include/svx/svdtext.hxx
index e95120722d79..7f06e3441454 100644
--- a/include/svx/svdtext.hxx
+++ b/include/svx/svdtext.hxx
@@ -33,9 +33,9 @@ class SdrModel;
 class SfxItemSet;
 enum class OutlinerMode;
 
-namespace sdr { namespace properties {
+namespace sdr::properties {
     class TextProperties;
-}}
+}
 
 /** This class stores information about one text inside a shape.
 */
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index 8c5bd6d5e92e..f37cf109811d 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -50,7 +50,7 @@
 //         SdrView         View
 
 class SvxURLField;
-namespace sdr { namespace contact { class ObjectContact; }}
+namespace sdr::contact { class ObjectContact; }
 
 enum class SdrViewContext {
     Standard,
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index e12f1f1ee015..76ef0d3c35cb 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -34,14 +34,13 @@ namespace sd {
     class View;
 }
 
-namespace com{namespace sun{namespace star{
-namespace linguistic2{
+namespace com::sun::star::linguistic2 {
     class XDictionary;
     class XSpellChecker1;
     class XSpellChecker;
     class XThesaurus;
     class XHyphenator;
-}}}}
+}
 class SdrModel;
 class SdrView;
 class SvxSpellWrapper;
diff --git a/include/svx/unoshtxt.hxx b/include/svx/unoshtxt.hxx
index e259b5386950..803b2996dda6 100644
--- a/include/svx/unoshtxt.hxx
+++ b/include/svx/unoshtxt.hxx
@@ -24,14 +24,14 @@
 #include <editeng/unoedsrc.hxx>
 #include <svx/svxdllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno {
         class XInterface;
     }
     namespace accessibility {
         struct TextSegment;
     }
-} } }
+}
 
 class SvxTextForwarder;
 class SdrObject;