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>

17 files changed, 56 insertions, 118 deletions

diff --git a/include/svx/sdr/animation/animationstate.hxx b/include/svx/sdr/animation/animationstate.hxx
index fb19740644b8..3284a68386c6 100644
--- a/include/svx/sdr/animation/animationstate.hxx
+++ b/include/svx/sdr/animation/animationstate.hxx
@@ -24,17 +24,9 @@
 #include <svx/sdr/animation/scheduler.hxx>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewObjectContact;
-    } // end of namespace contact
-}
+namespace sdr::contact { class ViewObjectContact; }
 
-namespace sdr
-{
-    namespace animation
+namespace sdr::animation
     {
         class PrimitiveAnimation final : public Event
         {
@@ -58,8 +50,8 @@ namespace sdr
             // execute event, from base class Event
             virtual void Trigger(sal_uInt32 nTime) override;
         };
-    } // end of namespace animation
-} // end of namespace sdr
+
+} // end of namespace sdr::animation
 
 #endif // INCLUDED_SVX_SDR_ANIMATION_ANIMATIONSTATE_HXX
 
diff --git a/include/svx/sdr/animation/objectanimator.hxx b/include/svx/sdr/animation/objectanimator.hxx
index fca03a85466e..a0e199932bc8 100644
--- a/include/svx/sdr/animation/objectanimator.hxx
+++ b/include/svx/sdr/animation/objectanimator.hxx
@@ -24,10 +24,8 @@
 #include <svx/sdr/animation/scheduler.hxx>
 
 
-namespace sdr
+namespace sdr::animation
 {
-    namespace animation
-    {
         class primitiveAnimator final : public Scheduler
         {
         public:
@@ -35,8 +33,7 @@ namespace sdr
             primitiveAnimator();
             UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) virtual ~primitiveAnimator() override;
         };
-    } // end of namespace animation
-} // end of namespace sdr
+} // end of namespace sdr::animation
 
 
 #endif // INCLUDED_SVX_SDR_ANIMATION_OBJECTANIMATOR_HXX
diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx
index 43666f3982f7..312083b684a2 100644
--- a/include/svx/sdr/animation/scheduler.hxx
+++ b/include/svx/sdr/animation/scheduler.hxx
@@ -26,9 +26,7 @@
 #include <vector>
 
 
-namespace sdr
-{
-    namespace animation
+namespace sdr::animation
     {
 
         class SVXCORE_DLLPUBLIC Event
@@ -93,8 +91,7 @@ namespace sdr
             SAL_DLLPRIVATE void SetPaused(bool bNew);
         };
 
-    } // end of namespace animation
-} // end of namespace sdr
+} // end of namespace sdr::animation
 
 
 #endif // INCLUDED_SVX_SDR_ANIMATION_SCHEDULER_HXX
diff --git a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
index 01d9a37c19de..6b72b7d0efec 100644
--- a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
+++ b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
@@ -30,9 +30,7 @@
 
 class Color;
 
-namespace drawinglayer
-{
-    namespace attribute
+namespace drawinglayer::attribute
     {
         class SVXCORE_DLLPUBLIC SdrAllFillAttributesHelper
         {
@@ -73,18 +71,15 @@ namespace drawinglayer
             // oriented
             bool needCompleteRepaint() const;
         };
-    } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace drawinglayer::attribute
 
 //////////////////////////////////////////////////////////////////////////////
 
-namespace drawinglayer
+namespace drawinglayer::attribute
 {
-    namespace attribute
-    {
         typedef std::shared_ptr< SdrAllFillAttributesHelper > SdrAllFillAttributesHelperPtr;
-    } // end of namespace attribute
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::attribute
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/svx/sdr/contact/displayinfo.hxx b/include/svx/sdr/contact/displayinfo.hxx
index 4c5842b454cb..7075b04ccf6f 100644
--- a/include/svx/sdr/contact/displayinfo.hxx
+++ b/include/svx/sdr/contact/displayinfo.hxx
@@ -25,9 +25,7 @@
 #include <svx/svxdllapi.h>
 #include <basegfx/range/b2irectangle.hxx>
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class SVXCORE_DLLPUBLIC DisplayInfo final
         {
@@ -98,8 +96,8 @@ namespace sdr
             bool GetSubContentActive() const { return mbSubContentActive; }
             void SetSubContentActive(bool bNew);
         };
-    } // end of namespace contact
-} // end of namespace sdr
+
+} // end of namespace sdr::contact
 
 
 #endif // INCLUDED_SVX_SDR_CONTACT_DISPLAYINFO_HXX
diff --git a/include/svx/sdr/contact/objectcontactofpageview.hxx b/include/svx/sdr/contact/objectcontactofpageview.hxx
index c3f4ef9d3d19..6ff7761326c1 100644
--- a/include/svx/sdr/contact/objectcontactofpageview.hxx
+++ b/include/svx/sdr/contact/objectcontactofpageview.hxx
@@ -26,9 +26,7 @@
 class SdrPageWindow;
 class SdrPage;
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         class SVXCORE_DLLPUBLIC ObjectContactOfPageView : public ObjectContact, public Idle
         {
@@ -112,8 +110,7 @@ namespace sdr
             */
             void    SetUNOControlsDesignMode( bool _bDesignMode ) const;
         };
-    } // end of namespace contact
-} // end of namespace sdr
+} // end of namespace sdr::contact
 
 #endif // INCLUDED_SVX_INC_SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX
 
diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
index 80059b791ba1..cf1b411366a3 100644
--- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
+++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
@@ -24,9 +24,7 @@
 #include <vcl/bitmapex.hxx>
 
 
-namespace sdr
-{
-    namespace overlay
+namespace sdr::overlay
     {
         class SVXCORE_DLLPUBLIC OverlayAnimatedBitmapEx final : public OverlayObjectWithBasePosition
         {
@@ -75,8 +73,7 @@ namespace sdr
             double getShearX() const { return mfShearX; }
             double getRotation() const { return mfRotation; }
         };
-    } // end of namespace overlay
-} // end of namespace sdr
+} // end of namespace sdr::overlay
 
 
 #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYANIMATEDBITMAPEX_HXX
diff --git a/include/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx
index fbfce1ee3a61..42de7d65314f 100644
--- a/include/svx/sdr/overlay/overlaybitmapex.hxx
+++ b/include/svx/sdr/overlay/overlaybitmapex.hxx
@@ -24,9 +24,7 @@
 #include <vcl/bitmapex.hxx>
 
 
-namespace sdr
-{
-    namespace overlay
+namespace sdr::overlay
     {
         class SVXCORE_DLLPUBLIC OverlayBitmapEx final : public OverlayObjectWithBasePosition
         {
@@ -55,8 +53,7 @@ namespace sdr
                 double fRotation = 0.0);
             virtual ~OverlayBitmapEx() override;
         };
-    } // end of namespace overlay
-} // end of namespace sdr
+} // end of namespace sdr::overlay
 
 
 #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYBITMAPEX_HXX
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index 412d45aa3a5c..11ed2c9d0b97 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -43,9 +43,7 @@ namespace basegfx {
     class B2DRange;
 }
 
-namespace sdr
-{
-    namespace overlay
+namespace sdr::overlay
     {
         class SVXCORE_DLLPUBLIC OverlayManager
             : protected sdr::animation::Scheduler
@@ -131,8 +129,8 @@ namespace sdr
 
             void InsertEvent(sdr::animation::Event& rNew) { Scheduler::InsertEvent(rNew); }
         };
-    } // end of namespace overlay
-} // end of namespace sdr
+
+} // end of namespace sdr::overlay
 
 #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYMANAGER_HXX
 
diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx
index 569d93a25de9..f8cf8be0b7ff 100644
--- a/include/svx/sdr/overlay/overlayobject.hxx
+++ b/include/svx/sdr/overlay/overlayobject.hxx
@@ -31,14 +31,10 @@
 
 class OutputDevice;
 
-namespace sdr
+namespace sdr::overlay
 {
-    namespace overlay
-    {
-        class OverlayManager;
-    } // end of namespace overlay
+    class OverlayManager;
 }
-
 namespace basegfx
 {
     class B2DPolygon;
@@ -46,9 +42,7 @@ namespace basegfx
     class B2DRange;
 }
 
-namespace sdr
-{
-    namespace overlay
+namespace sdr::overlay
     {
         class SVXCORE_DLLPUBLIC OverlayObject : public sdr::animation::Event
         {
@@ -177,12 +171,9 @@ namespace sdr
         // typedefs for a vector of OverlayObjects
         typedef ::std::vector< OverlayObject* > OverlayObjectVector;
 
-    } // end of namespace overlay
-} // end of namespace sdr
+} // end of namespace sdr::overlay
 
-namespace sdr
-{
-    namespace overlay
+namespace sdr::overlay
     {
         class SVXCORE_DLLPUBLIC OverlayObjectWithBasePosition : public OverlayObject
         {
@@ -198,8 +189,8 @@ namespace sdr
             const basegfx::B2DPoint& getBasePosition() const { return maBasePosition; }
             void setBasePosition(const basegfx::B2DPoint& rNew);
         };
-    } // end of namespace overlay
-} // end of namespace sdr
+
+} // end of namespace sdr::overlay
 
 #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECT_HXX
 
diff --git a/include/svx/sdr/overlay/overlayobjectlist.hxx b/include/svx/sdr/overlay/overlayobjectlist.hxx
index 4859db33e6e6..6985a1b5ae23 100644
--- a/include/svx/sdr/overlay/overlayobjectlist.hxx
+++ b/include/svx/sdr/overlay/overlayobjectlist.hxx
@@ -29,9 +29,7 @@
 
 class Point;
 
-namespace sdr
-{
-    namespace overlay
+namespace sdr::overlay
     {
         class SVXCORE_DLLPUBLIC OverlayObjectList final
         {
@@ -63,8 +61,8 @@ namespace sdr
             // calculate BaseRange of all included OverlayObjects and return
             basegfx::B2DRange getBaseRange() const;
         };
-    } // end of namespace overlay
-} // end of namespace sdr
+
+} // end of namespace sdr::overlay
 
 
 #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTLIST_HXX
diff --git a/include/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx
index 88c7404e6a3d..4cb5c4610a00 100644
--- a/include/svx/sdr/overlay/overlaypolypolygon.hxx
+++ b/include/svx/sdr/overlay/overlaypolypolygon.hxx
@@ -24,9 +24,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 
 
-namespace sdr
-{
-    namespace overlay
+namespace sdr::overlay
     {
         class SVXCORE_DLLPUBLIC OverlayPolyPolygonStripedAndFilled final : public OverlayObject
         {
@@ -47,8 +45,8 @@ 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_SDR_OVERLAY_OVERLAYPOLYPOLYGON_HXX
diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
index 84cf195f4b5c..5562fa381014 100644
--- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
+++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
@@ -24,9 +24,7 @@
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 
 
-namespace sdr
-{
-    namespace overlay
+namespace sdr::overlay
     {
         class SVXCORE_DLLPUBLIC OverlayPrimitive2DSequenceObject final : public OverlayObjectWithBasePosition
         {
@@ -41,8 +39,8 @@ namespace sdr
 
             virtual ~OverlayPrimitive2DSequenceObject() override;
         };
-    } // end of namespace overlay
-} // end of namespace sdr
+
+} // end of namespace sdr::overlay
 
 
 #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYPRIMITIVE2DSEQUENCEOBJECT_HXX
diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx
index dc40a87597dd..75a19d48a387 100644
--- a/include/svx/sdr/overlay/overlayselection.hxx
+++ b/include/svx/sdr/overlay/overlayselection.hxx
@@ -23,9 +23,7 @@
 #include <svx/sdr/overlay/overlayobject.hxx>
 
 
-namespace sdr
-{
-    namespace overlay
+namespace sdr::overlay
     {
         // overlay type definition
         enum class OverlayType
@@ -71,8 +69,7 @@ namespace sdr
             // data write access
             void setRanges(const std::vector< basegfx::B2DRange >& rNew);
         };
-    } // end of namespace overlay
-} // end of namespace sdr
+} // end of namespace sdr::overlay
 
 
 #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYSELECTION_HXX
diff --git a/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx
index 82072669829d..e24bb372a7ce 100644
--- a/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx
@@ -25,9 +25,7 @@
 
 // predefines
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SVXCORE_DLLPUBLIC SdrFrameBorderData
         {
@@ -83,12 +81,9 @@ namespace drawinglayer
 
         typedef std::vector<SdrFrameBorderData> SdrFrameBorderDataVector;
 
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         class SVXCORE_DLLPUBLIC SdrFrameBorderPrimitive2D final : public BufferedDecompositionPrimitive2D
         {
@@ -123,8 +118,8 @@ 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_SDRFRAMEBORDERPRIMITIVE2D_HXX
diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx
index 852b5e88164c..c9c4fdc5ec59 100644
--- a/include/svx/sdr/properties/defaultproperties.hxx
+++ b/include/svx/sdr/properties/defaultproperties.hxx
@@ -30,9 +30,7 @@
 struct _xmlTextWriter;
 typedef struct _xmlTextWriter* xmlTextWriterPtr;
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class SVXCORE_DLLPUBLIC DefaultProperties : public BaseProperties
         {
@@ -103,8 +101,8 @@ namespace sdr
             // Default implementation does nothing.
             virtual void ForceDefaultAttributes();
         };
-    } // end of namespace properties
-} // end of namespace sdr
+
+} // end of namespace sdr::properties
 
 #endif // INCLUDED_SVX_SDR_PROPERTIES_DEFAULTPROPERTIES_HXX
 
diff --git a/include/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx
index 22d9bf2f78b0..db40737756ca 100644
--- a/include/svx/sdr/properties/properties.hxx
+++ b/include/svx/sdr/properties/properties.hxx
@@ -38,14 +38,12 @@ class Fraction;
 class SfxItemPool;
 class SdrModel;
 
-namespace sdr
+namespace sdr::properties
 {
-    namespace properties
-    {
-        class ItemChangeBroadcaster;
-    }
+    class ItemChangeBroadcaster;
 }
 
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //
 //  BaseProperties
@@ -72,9 +70,7 @@ namespace sdr
 //      EmptyProperties
 //          PageProperties
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class SVXCORE_DLLPUBLIC BaseProperties
         {
@@ -205,8 +201,7 @@ namespace sdr
         // checks the FillStyle item and removes unneeded Gradient, FillBitmap and Hatch items
         void SVXCORE_DLLPUBLIC CleanupFillProperties( SfxItemSet& rItemSet );
 
-    } // end of namespace properties
-} // end of namespace sdr
+} // end of namespace sdr::properties
 
 #endif // INCLUDED_SVX_SDR_PROPERTIES_PROPERTIES_HXX