compact namespace in sw

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

13 files changed, 24 insertions, 40 deletions

diff --git a/sw/source/core/access/accfrmobj.hxx b/sw/source/core/access/accfrmobj.hxx
index bfe6240ce62a..cb5fdfb7b839 100644
--- a/sw/source/core/access/accfrmobj.hxx
+++ b/sw/source/core/access/accfrmobj.hxx
@@ -28,7 +28,7 @@ class SdrObject;
 namespace vcl { class Window; }
 class SwRect;
 
-namespace sw { namespace access {
+namespace sw::access {
 
 class SwAccessibleChild
 {
@@ -82,7 +82,7 @@ class SwAccessibleChild
         void Init( vcl::Window* pWindow );
 };
 
-} } // eof of namespace sw::access
+} // eof of namespace sw::access
 
 #endif
 
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 6b6f481637d5..ee5288cd25c3 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -41,11 +41,11 @@ class SwRangeRedline;
 class SwXTextPortion;
 class SwParaChangeTrackingInfo; //#i108125#
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace i18n { struct Boundary; }
     namespace accessibility { class XAccessibleHyperlink; }
     namespace style { struct TabStop; }
-} } }
+}
 
 typedef std::unordered_map< OUString,
                          css::beans::PropertyValue > tAccParaPropValMap;
diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx
index c64a45d2afbd..246ed862299f 100644
--- a/sw/source/core/access/accportions.hxx
+++ b/sw/source/core/access/accportions.hxx
@@ -29,9 +29,9 @@
 class SwTextFrame;
 struct SwSpecialPos;
 class SwViewOption;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace i18n { struct Boundary; }
-} } }
+}
 
 /**
  * collect text portion data from the layout through SwPortionHandler interface
diff --git a/sw/source/core/inc/annotationmark.hxx b/sw/source/core/inc/annotationmark.hxx
index 8cf1590ca310..9fe8478e22cc 100644
--- a/sw/source/core/inc/annotationmark.hxx
+++ b/sw/source/core/inc/annotationmark.hxx
@@ -25,7 +25,7 @@
 
 class SwFormatField;
 
-namespace sw { namespace mark
+namespace sw::mark
 {
     class AnnotationMark : public MarkBase
     {
@@ -40,7 +40,9 @@ namespace sw { namespace mark
 
         const SwFormatField* GetAnnotationFormatField() const;
     };
-}}
+
+}
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 4a72db8f802b..429746737bf4 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -116,10 +116,10 @@ enum MakePageType
     MAKEPAGE_NOSECTION  // Don't create section frames
 };
 
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
     class SdrAllFillAttributesHelper;
     typedef std::shared_ptr< SdrAllFillAttributesHelper > SdrAllFillAttributesHelperPtr;
-}}
+}
 
 /// Helper class to isolate geometry-defining members of SwFrame
 /// and to control their accesses. Moved to own class to have no
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index ddb7bea2dd38..f7f4a209b584 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -47,7 +47,7 @@ class SwFrameFormats;
 class SwRegionRects;
 class SwTextNode;
 namespace sw { struct Extent; }
-namespace basegfx { namespace utils { class B2DClipState; } }
+namespace basegfx::utils { class B2DClipState; }
 
 #define FAR_AWAY (SAL_MAX_INT32 - 20000)  // initial position of a Fly
 #define BROWSE_HEIGHT (56700L * 10L) // 10 Meters
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index 63b633946911..73e74d7d1fe9 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -40,7 +40,7 @@ class SwPaM;
 class SwNode;
 struct SwPosition;
 
-namespace sw { namespace mark
+namespace sw::mark
 {
     class IMark;
 
@@ -82,7 +82,7 @@ namespace sw { namespace mark
             virtual ~ContentIdxStore() {};
             static std::shared_ptr<ContentIdxStore> Create();
     };
-}}
+}
 
 namespace o3tl {
     template<> struct typed_flags<sw::mark::RestoreMode> : is_typed_flags<sw::mark::RestoreMode, 3> {};
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 61377d2a73ca..6526def25558 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -25,9 +25,9 @@
 
 #include <set>
 
-namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenatedWord; } } } }
+namespace com::sun::star::linguistic2 { class XHyphenatedWord; }
 
-namespace sw { namespace mark { class IMark; } }
+namespace sw::mark { class IMark; }
 class SwCharRange;
 class SwTextNode;
 class SwTextAttrEnd;
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index 2587b6ff2d47..06f68aba48c5 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -31,14 +31,8 @@
 
 #include <set>
 
-namespace com { namespace sun { namespace star { namespace container {
-    class XStringKeyMap;
-} } } }
-
-namespace com { namespace sun { namespace star { namespace text {
-    class XTextRange;
-} } } }
-
+namespace com::sun::star::container { class XStringKeyMap; }
+namespace com::sun::star::text { class XTextRange; }
 class SwTextNode;
 class SwDoc;
 class ModelToViewHelper;
diff --git a/sw/source/core/inc/unofreg.hxx b/sw/source/core/inc/unofreg.hxx
index 8350cc74f7e6..afb8e6dcdff5 100644
--- a/sw/source/core/inc/unofreg.hxx
+++ b/sw/source/core/inc/unofreg.hxx
@@ -25,9 +25,7 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 
-namespace com { namespace sun { namespace star { namespace lang {
-    class XMultiServiceFactory;
-} } } }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
 
 // writer documents
 css::uno::Sequence< OUString > SwTextDocument_getSupportedServiceNames() throw();
diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx
index 30e1b3bf3ebc..bfbded136a66 100644
--- a/sw/source/core/inc/unotextmarkup.hxx
+++ b/sw/source/core/inc/unotextmarkup.hxx
@@ -29,14 +29,8 @@
 
 #include <map>
 
-namespace com { namespace sun { namespace star { namespace container {
-    class XStringKeyMap;
-} } } }
-
-namespace com { namespace sun { namespace star { namespace text {
-    class XTextRange;
-} } } }
-
+namespace com::sun::star::container { class XStringKeyMap; }
+namespace com::sun::star::text { class XTextRange; }
 class SwTextNode;
 class ModelToViewHelper;
 
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index 4a599308274b..aff1e701245a 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -44,9 +44,7 @@ class SwPagePreviewLayout;
 struct PreviewPage;
 class SwTextFrame;
 // --> OD #i76669#
-namespace sdr { namespace contact {
-        class ViewObjectContactRedirector;
-} }
+namespace sdr::contact { class ViewObjectContactRedirector; }
 // <--
 
 class SwViewShellImp
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index afc7c6bbf83b..ec70c66d2024 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -211,9 +211,7 @@ public:
     virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override;
 };
 
-namespace sw { namespace mark {
-    class IFieldmark;
-} }
+namespace sw::mark { class IFieldmark; }
 
 class SwFieldFormDropDownPortion : public SwFieldPortion
 {