clang-tidy modernize-concat-nested-namespace in sw

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

37 files changed, 81 insertions, 129 deletions

diff --git a/sw/source/core/crsr/annotationmark.cxx b/sw/source/core/crsr/annotationmark.cxx
index ea11fad3d2cc..aa5f7fc25922 100644
--- a/sw/source/core/crsr/annotationmark.cxx
+++ b/sw/source/core/crsr/annotationmark.cxx
@@ -31,7 +31,7 @@
 #include <ndtxt.hxx>
 #include <txtfld.hxx>
 
-namespace sw { namespace mark
+namespace sw::mark
 {
     AnnotationMark::AnnotationMark(
         const SwPaM& rPaM,
@@ -99,6 +99,6 @@ namespace sw { namespace mark
 
         return pAnnotationFormatField;
     }
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index d6524a5f0072..6643e77f03e9 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -44,7 +44,7 @@ using namespace ::sw::mark;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-namespace sw { namespace mark
+namespace sw::mark
 {
 
     SwPosition FindFieldSep(IFieldmark const& rMark)
@@ -110,7 +110,7 @@ namespace sw { namespace mark
         assert(ret); // must have found it
         return *ret;
     }
-} } // namespace sw::mark
+} // namespace sw::mark
 
 namespace
 {
@@ -240,7 +240,7 @@ namespace
     };
 }
 
-namespace sw { namespace mark
+namespace sw::mark
 {
     MarkBase::MarkBase(const SwPaM& aPaM,
         const OUString& rName)
@@ -938,6 +938,6 @@ namespace sw { namespace mark
             (*pParameters)[ODF_FORMDATE_CURRENTDATE] <<= OUString();
         }
     }
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx
index 6fe2ce5bcc25..9fbba6de069a 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -30,7 +30,7 @@ namespace
     const char CrossRefNumItemBookmark_NamePrefix[] = "__RefNumPara__";
 }
 
-namespace sw { namespace mark
+namespace sw::mark
 {
     CrossRefBookmark::CrossRefBookmark(const SwPaM& rPaM,
         const vcl::KeyCode& rCode,
@@ -88,6 +88,6 @@ namespace sw { namespace mark
     {
         return rName.match(CrossRefNumItemBookmark_NamePrefix);
     }
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/overlayrangesoutline.cxx b/sw/source/core/crsr/overlayrangesoutline.cxx
index 3671f209483f..7c105698c854 100644
--- a/sw/source/core/crsr/overlayrangesoutline.cxx
+++ b/sw/source/core/crsr/overlayrangesoutline.cxx
@@ -50,9 +50,7 @@ namespace
     }
 }
 
-namespace sw
-{
-    namespace overlay
+namespace sw::overlay
     {
         drawinglayer::primitive2d::Primitive2DContainer OverlayRangesOutline::createOverlayObjectPrimitive2DSequence()
         {
@@ -101,7 +99,6 @@ namespace sw
                 objectChange();
             }
         }
-    } // end of namespace overlay
-} // end of namespace sdr
+    } // end of namespace sdr
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx
index 3c117ffab662..ef2f12608f29 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -462,10 +462,10 @@ void ContentIdxStoreImpl::RestoreShellCursors(updater_t const & rUpdater)
     }
 }
 
-namespace sw { namespace mark {
+namespace sw::mark {
     std::shared_ptr<ContentIdxStore> ContentIdxStore::Create()
     {
        return std::make_shared<ContentIdxStoreImpl>();
     }
-}}
+}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index f736348480a5..4144ad47a567 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -530,7 +530,7 @@ void IDocumentMarkAccess::DeleteFieldmarkCommand(::sw::mark::IFieldmark const& r
     pam.GetDoc()->getIDocumentContentOperations().DeleteAndJoin(pam);
 }
 
-namespace sw { namespace mark
+namespace sw::mark
 {
     MarkManager::MarkManager(SwDoc& rDoc)
         : m_vAllMarks()
@@ -1611,7 +1611,7 @@ void MarkManager::dumpAsXml(xmlTextWriterPtr pWriter) const
     xmlTextWriterEndElement(pWriter);
 }
 
-}} // namespace ::sw::mark
+} // namespace ::sw::mark
 
 namespace
 {
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 1660dd8945d6..581d9c3f7dc8 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1988,9 +1988,7 @@ void SwDrawContact::GetAnchoredObjs(std::vector<SwAnchoredObject*>& o_rAnchoredO
 // For paint, that offset is used by setting at the OutputDevice; for primitives this is
 // not possible since we have no OutputDevice, but define the geometry itself.
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         namespace {
 
@@ -2039,12 +2037,9 @@ namespace sdr
         };
 
         }
-    } // end of namespace contact
-} // end of namespace sdr
+    } // end of namespace sdr
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         /// recursively collect primitive data from given VOC with given offset
         static void impAddPrimitivesFromGroup(const ViewObjectContact& rVOC, const basegfx::B2DHomMatrix& rOffsetMatrix, const DisplayInfo& rDisplayInfo, drawinglayer::primitive2d::Primitive2DContainer& rxTarget)
@@ -2150,8 +2145,7 @@ namespace sdr
             return *(new VOCOfDrawVirtObj(rObjectContact, *this));
         }
 
-    } // end of namespace contact
-} // end of namespace sdr
+    } // end of namespace sdr
 
 /// implementation of class <SwDrawVirtObj>
 std::unique_ptr<sdr::contact::ViewContact> SwDrawVirtObj::CreateObjectSpecificViewContact()
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 37778cfd9f86..2ff59ec47287 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -71,9 +71,7 @@ using namespace ::com::sun::star;
 static bool bInResize = false;
 
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         namespace {
 
@@ -110,8 +108,7 @@ namespace sdr
             return drawinglayer::primitive2d::Primitive2DContainer();
         }
 
-    } // end of namespace contact
-} // end of namespace sdr
+    } // end of namespace sdr
 
 std::unique_ptr<sdr::properties::BaseProperties> SwFlyDrawObj::CreateObjectSpecificProperties()
 {
@@ -148,9 +145,7 @@ sal_uInt16 SwFlyDrawObj::GetObjIdentifier() const
 }
 
 // TODO: Need own primitive to get the FlyFrame paint working
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         namespace {
 
@@ -190,12 +185,9 @@ namespace drawinglayer
         };
 
         }
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+    } // end of namespace drawinglayer
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         void SwVirtFlyDrawObjPrimitive::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
         {
@@ -248,17 +240,14 @@ namespace drawinglayer
         // provide unique ID
         ImplPrimitive2DIDBlock(SwVirtFlyDrawObjPrimitive, PRIMITIVE2D_ID_SWVIRTFLYDRAWOBJPRIMITIVE2D)
 
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+    } // end of namespace drawinglayer
 
 // AW: own sdr::contact::ViewContact (VC) sdr::contact::ViewObjectContact (VOC) needed
 // since offset is defined different from SdrVirtObj's sdr::contact::ViewContactOfVirtObj.
 // For paint, that offset is used by setting at the OutputDevice; for primitives this is
 // not possible since we have no OutputDevice, but define the geometry itself.
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         namespace {
 
@@ -286,12 +275,9 @@ namespace sdr
         };
 
         }
-    } // end of namespace contact
-} // end of namespace sdr
+    } // end of namespace sdr
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         drawinglayer::primitive2d::Primitive2DContainer VCOfSwVirtFlyDrawObj::createViewIndependentPrimitive2DSequence() const
         {
@@ -318,8 +304,7 @@ namespace sdr
             return xRetval;
         }
 
-    } // end of namespace contact
-} // end of namespace sdr
+    } // end of namespace sdr
 
 basegfx::B2DRange SwVirtFlyDrawObj::getOuterBound() const
 {
diff --git a/sw/source/core/layout/legacyitem.cxx b/sw/source/core/layout/legacyitem.cxx
index 9dea0dca8cf6..02be381eb9b4 100644
--- a/sw/source/core/layout/legacyitem.cxx
+++ b/sw/source/core/layout/legacyitem.cxx
@@ -22,9 +22,7 @@
 #include <sal/log.hxx>
 #include <fmtornt.hxx>
 
-namespace legacy
-{
-    namespace SwFormatVert
+namespace legacy::SwFormatVert
     {
         sal_uInt16 GetVersion(sal_uInt16)
         {
@@ -77,6 +75,5 @@ namespace legacy
             return rStrm;
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 8135fa1c3a63..72b65395cdf3 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4515,9 +4515,7 @@ void SwFrame::PaintBorderLine( const SwRect& rRect,
         gProp.pSLines->AddLineRect( aOut, pColor, nStyle, pTab, nSubCol, gProp );
 }
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         namespace {
 
@@ -4761,8 +4759,7 @@ namespace drawinglayer
         // provide unique ID
         ImplPrimitive2DIDBlock(SwBorderRectanglePrimitive2D, PRIMITIVE2D_ID_SWBORDERRECTANGLERIMITIVE)
 
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+    } // end of namespace drawinglayer
 
 namespace {
 
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 50b7dcd526be..e7d375299c26 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -832,7 +832,7 @@ void SwMetaPortion::Paint( const SwTextPaintInfo &rInf ) const
     }
 }
 
-namespace sw { namespace mark {
+namespace sw::mark {
     OUString ExpandFieldmark(IFieldmark* pBM)
     {
         const IFieldmark::parameter_map_t* const pParameters = pBM->GetParameters();
@@ -853,7 +853,7 @@ namespace sw { namespace mark {
         static const sal_Unicode vEnSpaces[ODF_FORMFIELD_DEFAULT_LENGTH] = {8194, 8194, 8194, 8194, 8194};
         return OUString(vEnSpaces, ODF_FORMFIELD_DEFAULT_LENGTH);
     }
-} }
+}
 
 SwTextPortion *SwTextFormatter::WhichTextPor( SwTextFormatInfo &rInf ) const
 {
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 12315b438d3e..c4cf552d3833 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6553,9 +6553,7 @@ bool SwWW8ImplReader::InEqualApo(int nLvl) const
     return m_aApos[nLvl];
 }
 
-namespace sw
-{
-    namespace hack
+namespace sw::hack
     {
         Position::Position(const SwPosition &rPos)
             : maPtNode(rPos.nNode), mnPtContent(rPos.nContent.GetIndex())
@@ -6569,7 +6567,6 @@ namespace sw
             return aRet;
         }
     }
-}
 
 SwMacroInfo::SwMacroInfo()
     : SdrObjUserData( SdrInventor::ScOrSwDraw, SW_UD_IMAPDATA )
diff --git a/sw/source/ui/vba/wordvbahelper.cxx b/sw/source/ui/vba/wordvbahelper.cxx
index b54fb6ef3103..add4b3ab778a 100644
--- a/sw/source/ui/vba/wordvbahelper.cxx
+++ b/sw/source/ui/vba/wordvbahelper.cxx
@@ -36,11 +36,7 @@
 using namespace ::com::sun::star;
 using namespace ::ooo::vba;
 
-namespace ooo
-{
-namespace vba
-{
-namespace word
+namespace ooo::vba::word
 {
 
 SwDocShell* getDocShell( const uno::Reference< frame::XModel>& xModel )
@@ -175,8 +171,6 @@ bool gotoSelectedObjectAnchor( const uno::Reference< frame::XModel>& xModel )
     return isObjectSelected;
 }
 
-} // word
-}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
index fa4d684c577c..f6b3de150c8c 100644
--- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx
+++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
@@ -31,7 +31,7 @@
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 
-namespace sw { namespace sidebarwindows {
+namespace sw::sidebarwindows {
 
 namespace {
 
@@ -377,6 +377,6 @@ void AnchorOverlayObject::SetAnchorState( const AnchorState aState)
   }
 }
 
-} } // end of namespace sw::annotation
+} // end of namespace sw::annotation
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
index e321560d42fa..f56e745c1641 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
@@ -33,7 +33,7 @@
 #include <AnnotationWin.hxx>
 #include <swtypes.hxx>
 
-namespace sw { namespace annotation {
+namespace sw::annotation {
 
 static Color ColorFromAlphaColor(const sal_uInt8 aTransparency, const Color& aFront, const Color& aBack)
 {
@@ -200,6 +200,6 @@ void AnnotationMenuButton::KeyInput(const KeyEvent& rKeyEvt)
     }
 }
 
-}} // end of namespace sw::annotation
+} // end of namespace sw::annotation
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index b2ff15aba3e7..da900ec54237 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -64,7 +64,7 @@
 
 #include <memory>
 
-namespace sw { namespace annotation {
+namespace sw::annotation {
 
 SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin,
                                   SwPostItMgr& aMgr,
@@ -502,6 +502,6 @@ tools::Time SwAnnotationWin::GetTime() const
     return mpField->GetTime();
 }
 
-} } // end of namespace sw::annotation
+} // end of namespace sw::annotation
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index f243bf503dc7..335cee087d0e 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -138,7 +138,7 @@ vcl::Window* lcl_getHitWindow(sw::annotation::SwAnnotationWin& rParent, const Mo
 
 }
 
-namespace sw { namespace annotation {
+namespace sw::annotation {
 
 #define METABUTTON_WIDTH        16
 #define METABUTTON_HEIGHT       18
@@ -1573,6 +1573,6 @@ css::uno::Reference< css::accessibility::XAccessible > SwAnnotationWin::CreateAc
     return xAcc;
 }
 
-} } // eof of namespace sw::sidebarwindows
+} // eof of namespace sw::sidebarwindows
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/OverlayRanges.cxx b/sw/source/uibase/docvw/OverlayRanges.cxx
index c7394b1bdc32..9f7f7968f8d7 100644
--- a/sw/source/uibase/docvw/OverlayRanges.cxx
+++ b/sw/source/uibase/docvw/OverlayRanges.cxx
@@ -55,9 +55,7 @@ namespace
     }
 }
 
-namespace sw
-{
-    namespace overlay
+namespace sw::overlay
     {
         drawinglayer::primitive2d::Primitive2DContainer OverlayRanges::createOverlayObjectPrimitive2DSequence()
         {
@@ -174,7 +172,6 @@ namespace sw
             }
         }
 
-    } // end of namespace overlay
-} // end of namespace sdr
+    } // end of namespace sdr
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.cxx b/sw/source/uibase/docvw/ShadowOverlayObject.cxx
index 584af296928b..dd47f70bb9d7 100644
--- a/sw/source/uibase/docvw/ShadowOverlayObject.cxx
+++ b/sw/source/uibase/docvw/ShadowOverlayObject.cxx
@@ -28,7 +28,7 @@
 #include <drawinglayer/primitive2d/primitivetools2d.hxx>
 #include <drawinglayer/primitive2d/fillgradientprimitive2d.hxx>
 
-namespace sw { namespace sidebarwindows {
+namespace sw::sidebarwindows {
 
 // helper SwPostItShadowPrimitive
 
@@ -232,6 +232,6 @@ void ShadowOverlayObject::SetPosition( const basegfx::B2DPoint& rPoint1,
     }
 }
 
-} } // end of namespace sw::sidebarwindows
+} // end of namespace sw::sidebarwindows
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/SidebarScrollBar.cxx b/sw/source/uibase/docvw/SidebarScrollBar.cxx
index 9b57616ba89f..e94a85b121f0 100644
--- a/sw/source/uibase/docvw/SidebarScrollBar.cxx
+++ b/sw/source/uibase/docvw/SidebarScrollBar.cxx
@@ -16,9 +16,7 @@
 #include <edtwin.hxx>
 #include <AnnotationWin.hxx>
 
-namespace sw
-{
-namespace sidebarwindows
+namespace sw::sidebarwindows
 {
 
 SidebarScrollBar::SidebarScrollBar(sw::annotation::SwAnnotationWin& rSidebarWin, WinBits nStyle, SwView& rView)
@@ -75,7 +73,6 @@ SidebarScrollBar::~SidebarScrollBar()
     disposeOnce();
 }
 
-}
 } // end of namespace sw::sidebarwindows
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index 79ece975ea50..544b3c6fc403 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -57,7 +57,7 @@
 #include <redline.hxx>
 #include <memory>
 
-namespace sw { namespace sidebarwindows {
+namespace sw::sidebarwindows {
 
 SidebarTextControl::SidebarTextControl( sw::annotation::SwAnnotationWin& rSidebarWin,
                                       WinBits nBits,
@@ -442,6 +442,6 @@ css::uno::Reference< css::accessibility::XAccessible > SidebarTextControl::Creat
     return xAcc;
 }
 
-} } // end of namespace sw::sidebarwindows
+} // end of namespace sw::sidebarwindows
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
index afbd7b16c438..d3bec6ecae5b 100644
--- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
@@ -35,7 +35,7 @@
 #include <editeng/outliner.hxx>
 #include <vcl/vclevent.hxx>
 
-namespace sw { namespace sidebarwindows {
+namespace sw::sidebarwindows {
 
 namespace {
 
@@ -266,6 +266,6 @@ css::uno::Reference< css::accessibility::XAccessibleContext > SidebarTextControl
     return xAcc;
 }
 
-} } // end of namespace sw::sidebarwindows
+} // end of namespace sw::sidebarwindows
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/SidebarWinAcc.cxx b/sw/source/uibase/docvw/SidebarWinAcc.cxx
index bd51ff8cea36..010394dad277 100644
--- a/sw/source/uibase/docvw/SidebarWinAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarWinAcc.cxx
@@ -26,7 +26,7 @@
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 
-namespace sw { namespace sidebarwindows {
+namespace sw::sidebarwindows {
 
 namespace {
 
@@ -139,6 +139,6 @@ css::uno::Reference< css::accessibility::XAccessibleContext > SidebarWinAccessib
     return xAcc;
 }
 
-} } // end of namespace sw::sidebarwindows
+} // end of namespace sw::sidebarwindows
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
index f8abc3aa1329..f52177742148 100644
--- a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
+++ b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
@@ -58,7 +58,7 @@ namespace {
     typedef std::map < FrameKey, SidebarWinContainer > FrameSidebarWinContainer_;
 }
 
-namespace sw { namespace sidebarwindows {
+namespace sw::sidebarwindows {
 
 class FrameSidebarWinContainer : public FrameSidebarWinContainer_
 {
@@ -167,6 +167,6 @@ void SwFrameSidebarWinContainer::getAll( const SwFrame& rFrame,
     }
 }
 
-} } // eof of namespace sw::sidebarwindows::
+} // eof of namespace sw::sidebarwindows::
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx
index c8f5e3db2f11..1675867acd8d 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.cxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.cxx
@@ -29,7 +29,7 @@
 #include <svl/intitem.hxx>
 #include <svx/pageitem.hxx>
 
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
 
 PageColumnControl::PageColumnControl(PageColumnPopup* pControl, weld::Widget* pParent)
     : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "modules/swriter/ui/pagecolumncontrol.ui", "PageColumnControl")
@@ -117,6 +117,6 @@ IMPL_LINK_NOARG( PageColumnControl, MoreButtonClickHdl_Impl, weld::Button&, void
     m_xControl->EndPopupMode();
 }
 
-} } // end of namespace sw::sidebar
+} // end of namespace sw::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx b/sw/source/uibase/sidebar/PageFooterPanel.cxx
index b9d60703b6ba..229174e78131 100644
--- a/sw/source/uibase/sidebar/PageFooterPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx
@@ -29,7 +29,7 @@
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 
-namespace sw { namespace sidebar{
+namespace sw::sidebar{
 
 VclPtr<vcl::Window> PageFooterPanel::Create(
     vcl::Window* pParent,
@@ -290,6 +290,6 @@ IMPL_LINK_NOARG( PageFooterPanel, FooterLayoutHdl, weld::ComboBox&, void )
 }
 
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx b/sw/source/uibase/sidebar/PageFormatPanel.cxx
index 8a237f049ced..2837937a2ca1 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx
@@ -41,7 +41,7 @@
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 
-namespace sw { namespace sidebar{
+namespace sw::sidebar{
 
 VclPtr<vcl::Window> PageFormatPanel::Create(
     vcl::Window* pParent,
@@ -427,6 +427,6 @@ void PageFormatPanel::UpdateMarginBox()
     }
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.cxx b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
index ffa0e2f07272..fe33e232ba70 100644
--- a/sw/source/uibase/sidebar/PageHeaderPanel.cxx
+++ b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
@@ -29,7 +29,7 @@
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 
-namespace sw { namespace sidebar{
+namespace sw::sidebar{
 
 VclPtr<vcl::Window> PageHeaderPanel::Create(
     vcl::Window* pParent,
@@ -291,6 +291,6 @@ IMPL_LINK_NOARG( PageHeaderPanel, HeaderLayoutHdl, weld::ComboBox&, void )
 }
 
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 0241e034989a..f825ed6eb5ff 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -92,7 +92,7 @@ namespace
     }
 }
 
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
 
 PageMarginControl::PageMarginControl(PageMarginPopup* pControl, weld::Widget* pParent)
     : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "modules/swriter/ui/pagemargincontrol.ui", "PageMarginControl")
@@ -580,6 +580,6 @@ void PageMarginControl::StoreUserCustomValues()
     aWinOpt5.SetUserData( aSeq );
 }
 
-} } // end of namespace sw::sidebar
+} // end of namespace sw::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx
index b52b789c1c15..d44dd3a5b2ca 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.cxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx
@@ -47,7 +47,7 @@ namespace {
     }
 }
 
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
 
 PageOrientationControl::PageOrientationControl(PageOrientationPopup* pControl, weld::Widget* pParent)
     : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "modules/swriter/ui/pageorientationcontrol.ui", "PageOrientationControl")
@@ -189,6 +189,6 @@ IMPL_LINK(PageOrientationControl, ImplOrientationHdl, weld::Button&, rControl, v
     m_xControl->EndPopupMode();
 }
 
-} } // end of namespace sw::sidebar
+} // end of namespace sw::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx
index 2bc18689dd4b..afb077d612b4 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -68,7 +68,7 @@ namespace
     }
 }
 
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
 
 PageSizeControl::PageSizeControl(PageSizePopup* pControl, weld::Widget* pParent)
     : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "modules/swriter/ui/pagesizecontrol.ui", "PageSizeControl")
@@ -233,6 +233,6 @@ IMPL_LINK_NOARG(PageSizeControl, MoreButtonClickHdl_Impl, weld::Button&, void)
     mxControl->EndPopupMode();
 }
 
-} } // end of namespace sw::sidebar
+} // end of namespace sw::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx b/sw/source/uibase/sidebar/PageStylesPanel.cxx
index 4ca5ba227d42..628bc6a880ca 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.cxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx
@@ -34,7 +34,7 @@
 
 using namespace ::com::sun::star;
 
-namespace sw { namespace sidebar{
+namespace sw::sidebar{
 
 namespace {
 
@@ -599,6 +599,6 @@ IMPL_LINK_NOARG(PageStylesPanel, ModifyFillColorListHdl, ColorListBox&, void)
     ModifyFillColor();
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
index add7d794ccf7..33dbd3a9f93a 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
@@ -28,7 +28,7 @@
 
 #include <sfx2/docfile.hxx>
 
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
 
 namespace {
 
@@ -212,6 +212,6 @@ void StylePresetsPanel::NotifyItemUpdate(const sal_uInt16 /*nSId*/,
 {
 }
 
-}} // end of namespace ::sw::sidebar
+} // end of namespace ::sw::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx b/sw/source/uibase/sidebar/TableEditPanel.cxx
index a363fc6bddf3..4d09aa4c0794 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.cxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.cxx
@@ -21,9 +21,7 @@
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 
-namespace sw
-{
-namespace sidebar
+namespace sw::sidebar
 {
 VclPtr<vcl::Window> TableEditPanel::Create(vcl::Window* pParent,
                                            const css::uno::Reference<css::frame::XFrame>& rxFrame,
@@ -229,7 +227,6 @@ IMPL_LINK_NOARG(TableEditPanel, ColumnWidthMofiyHdl, weld::MetricSpinButton&, vo
     m_pBindings->GetDispatcher()->ExecuteList(SID_ATTR_TABLE_COLUMN_WIDTH, SfxCallMode::RECORD,
                                               { &aColumnWidth });
 }
-}
 } // end of namespace ::sw::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx
index 88c8239ee7b6..b3f044d7ca36 100644
--- a/sw/source/uibase/sidebar/ThemePanel.cxx
+++ b/sw/source/uibase/sidebar/ThemePanel.cxx
@@ -397,7 +397,7 @@ BitmapEx GenerateColorPreview(const svx::ColorSet& rColorSet)
 
 } // end anonymous namespace
 
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
 
 VclPtr<vcl::Window> ThemePanel::Create (vcl::Window* pParent,
                                         const css::uno::Reference<css::frame::XFrame>& rxFrame)
@@ -501,6 +501,6 @@ void ThemePanel::NotifyItemUpdate(const sal_uInt16 /*nSId*/,
 {
 }
 
-}} // end of namespace ::sw::sidebar
+} // end of namespace ::sw::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index 5475806390e7..080946ff08dc 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -41,7 +41,7 @@ const char UNO_WRAPON[] = ".uno:WrapOn";
 const char UNO_WRAPTHROUGH[] = ".uno:WrapThrough";
 const char UNO_WRAPIDEAL[] = ".uno:WrapIdeal";
 
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
 
 VclPtr<vcl::Window> WrapPropertyPanel::Create (
     vcl::Window* pParent,
@@ -363,6 +363,6 @@ void WrapPropertyPanel::NotifyItemUpdate(
     }
 }
 
-} } // end of namespace ::sw::sidebar
+} // end of namespace ::sw::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx
index 90664ae098f5..898ea895c387 100644
--- a/sw/source/uibase/wrtsh/select.cxx
+++ b/sw/source/uibase/wrtsh/select.cxx
@@ -45,9 +45,9 @@
 #include <vcl/uitest/logger.hxx>
 #include <vcl/uitest/eventdescription.hxx>
 
-namespace com { namespace sun { namespace star { namespace util {
+namespace com::sun::star::util {
     struct SearchOptions2;
-} } } }
+}
 
 using namespace ::com::sun::star::util;