clang-tidy modernize-concat-nested-namespace

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

36 files changed, 72 insertions, 72 deletions

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 2767c5d0d9d2..5e363821be93 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -4090,7 +4090,7 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createDefaultViewControl
 }
 
 
-namespace sfx { namespace intern {
+namespace sfx::intern {
 
     /** a class which, in its dtor, cleans up various objects (well, at the moment only the frame) collected during
         the creation of a document view, unless the creation was successful.
@@ -4128,7 +4128,7 @@ namespace sfx { namespace intern {
         bool             m_bSuccess;
         SfxFrameWeakRef  m_aWeakFrame;
     };
-} }
+}
 
 
 SfxViewFrame* SfxBaseModel::FindOrCreateViewFrame_Impl( const Reference< XFrame >& i_rFrame, ::sfx::intern::ViewCreationGuard& i_rGuard ) const
diff --git a/sfx2/source/sidebar/Accessible.cxx b/sfx2/source/sidebar/Accessible.cxx
index 6cb4dd4a87a5..bae5ac590cd6 100644
--- a/sfx2/source/sidebar/Accessible.cxx
+++ b/sfx2/source/sidebar/Accessible.cxx
@@ -22,7 +22,7 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 Accessible::Accessible (
     const Reference<accessibility::XAccessibleContext>& rxContext)
@@ -47,6 +47,6 @@ Reference<accessibility::XAccessibleContext> SAL_CALL Accessible::getAccessibleC
     return mxContext;
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/AccessibleTitleBar.cxx b/sfx2/source/sidebar/AccessibleTitleBar.cxx
index c827194054c9..f6343d1c795b 100644
--- a/sfx2/source/sidebar/AccessibleTitleBar.cxx
+++ b/sfx2/source/sidebar/AccessibleTitleBar.cxx
@@ -28,7 +28,7 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 Reference<accessibility::XAccessible> AccessibleTitleBar::Create (TitleBar& rTitleBar)
 {
@@ -55,6 +55,6 @@ void AccessibleTitleBar::FillAccessibleStateSet (utl::AccessibleStateSetHelper&
     rStateSet.AddState(accessibility::AccessibleStateType::FOCUSABLE);
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx b/sfx2/source/sidebar/AsynchronousCall.cxx
index 0013ea5e5ceb..151accc5d543 100644
--- a/sfx2/source/sidebar/AsynchronousCall.cxx
+++ b/sfx2/source/sidebar/AsynchronousCall.cxx
@@ -20,7 +20,7 @@
 #include <sfx2/sidebar/AsynchronousCall.hxx>
 #include <vcl/svapp.hxx>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 AsynchronousCall::AsynchronousCall()
     : maAction(),
@@ -72,6 +72,6 @@ IMPL_LINK_NOARG(AsynchronousCall, HandleUserCall, void*, void )
         maAction();
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Context.cxx b/sfx2/source/sidebar/Context.cxx
index 2452dd63aeb0..b2bfd68a3791 100644
--- a/sfx2/source/sidebar/Context.cxx
+++ b/sfx2/source/sidebar/Context.cxx
@@ -22,7 +22,7 @@
 #define AnyApplicationName "any"
 #define AnyContextName "any"
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 const sal_Int32 Context::NoMatch = 4;
 const sal_Int32 Context::ApplicationWildcardMatch = 1;
@@ -80,6 +80,6 @@ bool Context::operator!= (const Context& rOther) const
         || ( msContext != rOther.msContext);
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
index 3a182d14f368..8e213e68b71b 100644
--- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
+++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
@@ -30,7 +30,7 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 ContextChangeBroadcaster::ContextChangeBroadcaster()
     : msContextName(),
@@ -125,6 +125,6 @@ OUString ContextChangeBroadcaster::GetModuleName (const css::uno::Reference<css:
     return OUString();
 }
 
-} } // end of namespace ::sd::sidebar
+} // end of namespace ::sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ContextList.cxx b/sfx2/source/sidebar/ContextList.cxx
index 8f0c82783f60..2d77cd7a4c47 100644
--- a/sfx2/source/sidebar/ContextList.cxx
+++ b/sfx2/source/sidebar/ContextList.cxx
@@ -19,7 +19,7 @@
 #include <sfx2/sidebar/ContextList.hxx>
 #include <sfx2/sidebar/Context.hxx>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 ContextList::ContextList()
     : maEntries()
@@ -99,6 +99,6 @@ void ContextList::ToggleVisibilityForContext( const Context &rContext, const boo
         pEntry->mbIsInitiallyVisible = bVisible;
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ControlFactory.cxx b/sfx2/source/sidebar/ControlFactory.cxx
index 317f552fe438..b65f0b9c1779 100644
--- a/sfx2/source/sidebar/ControlFactory.cxx
+++ b/sfx2/source/sidebar/ControlFactory.cxx
@@ -21,7 +21,7 @@
 #include <sfx2/sidebar/MenuButton.hxx>
 #include <sfx2/sidebar/TabItem.hxx>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 VclPtr<CheckBox> ControlFactory::CreateMenuButton (vcl::Window* pParentWindow)
 {
@@ -33,6 +33,6 @@ VclPtr<ImageRadioButton> ControlFactory::CreateTabItem (vcl::Window* pParentWind
     return VclPtr<TabItem>::Create(pParentWindow);
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx
index 49b67cbf6e07..98d39395d26b 100644
--- a/sfx2/source/sidebar/ControllerFactory.cxx
+++ b/sfx2/source/sidebar/ControllerFactory.cxx
@@ -35,7 +35,7 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController(
     ToolBox* pToolBox,
@@ -258,6 +258,6 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBarController(
     return nullptr;
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index 7e1a0ae88925..1459d154689c 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -26,7 +26,7 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 ControllerItem::ControllerItem (
     const sal_uInt16 nSlotId,
@@ -61,6 +61,6 @@ ControllerItem::ItemUpdateReceiverInterface::~ItemUpdateReceiverInterface()
 {
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 520a39418a91..0967468e3879 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -41,7 +41,7 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 Deck::Deck(const DeckDescriptor& rDeckDescriptor, vcl::Window* pParentWindow,
            const std::function<void()>& rCloserAction)
@@ -439,6 +439,6 @@ void Deck::ScrollContainerWindow::SetSeparators (const ::std::vector<sal_Int32>&
     Invalidate();
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/DeckDescriptor.cxx b/sfx2/source/sidebar/DeckDescriptor.cxx
index 6a55dfbd202c..0f38e335dca2 100644
--- a/sfx2/source/sidebar/DeckDescriptor.cxx
+++ b/sfx2/source/sidebar/DeckDescriptor.cxx
@@ -19,7 +19,7 @@
 
 #include <sfx2/sidebar/DeckDescriptor.hxx>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 DeckDescriptor::DeckDescriptor()
     : msTitle(),
@@ -57,6 +57,6 @@ DeckDescriptor::~DeckDescriptor()
 {
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx
index bc1bf6e93986..e96a068a2b5f 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -38,7 +38,7 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 namespace {
     static const sal_Int32 MinimalPanelHeight (25);
@@ -629,6 +629,6 @@ void UpdateFiller (
 
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx
index a3bad46ff40b..8ba8c95bd627 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -30,7 +30,7 @@
 #include <sfx2/sidebar/Tools.hxx>
 #endif
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 namespace
 {
@@ -140,6 +140,6 @@ void DeckTitleBar::MouseMove (const MouseEvent& rMouseEvent)
     Window::MouseMove( rMouseEvent );
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/DrawHelper.cxx b/sfx2/source/sidebar/DrawHelper.cxx
index 17c352a3d76c..9b5c16bc6c3f 100644
--- a/sfx2/source/sidebar/DrawHelper.cxx
+++ b/sfx2/source/sidebar/DrawHelper.cxx
@@ -22,7 +22,7 @@
 
 #include <tools/svborder.hxx>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 void DrawHelper::DrawBorder(vcl::RenderContext& rRenderContext, const tools::Rectangle& rBox, const SvBorder& rBorderSize,
                             const Paint& rHorizontalPaint, const Paint& rVerticalPaint)
@@ -122,6 +122,6 @@ void DrawHelper::DrawRoundedRectangle(vcl::RenderContext& rRenderContext, const
     }
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx
index 2b478e918d89..d39c26d70820 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -28,7 +28,7 @@
 #include <vcl/svapp.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 FocusManager::FocusLocation::FocusLocation (const PanelComponent eComponent, const sal_Int32 nIndex)
     : meComponent(eComponent),
@@ -628,6 +628,6 @@ IMPL_LINK(FocusManager, ChildEventListener, VclWindowEvent&, rEvent, void)
     }
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/IContextChangeReceiver.cxx b/sfx2/source/sidebar/IContextChangeReceiver.cxx
index 8a4ad0f6701d..6fc053921b1a 100644
--- a/sfx2/source/sidebar/IContextChangeReceiver.cxx
+++ b/sfx2/source/sidebar/IContextChangeReceiver.cxx
@@ -18,12 +18,12 @@
  */
 #include <sfx2/sidebar/IContextChangeReceiver.hxx>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 IContextChangeReceiver::~IContextChangeReceiver()
 {
 }
 
-} } // end of namespace ::sd::sidebar
+} // end of namespace ::sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ILayoutableWindow.cxx b/sfx2/source/sidebar/ILayoutableWindow.cxx
index c8d740947d2f..6a24cadbfacb 100644
--- a/sfx2/source/sidebar/ILayoutableWindow.cxx
+++ b/sfx2/source/sidebar/ILayoutableWindow.cxx
@@ -18,12 +18,12 @@
  */
 #include <sfx2/sidebar/ILayoutableWindow.hxx>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 ILayoutableWindow::~ILayoutableWindow()
 {
 }
 
-} } // end of namespace ::sd::sidebar
+} // end of namespace ::sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/MenuButton.cxx b/sfx2/source/sidebar/MenuButton.cxx
index 7b5b7bedd677..76ab0dc162e0 100644
--- a/sfx2/source/sidebar/MenuButton.cxx
+++ b/sfx2/source/sidebar/MenuButton.cxx
@@ -26,7 +26,7 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 MenuButton::MenuButton (vcl::Window* pParentWindow)
     : CheckBox(pParentWindow),
@@ -97,6 +97,6 @@ void MenuButton::MouseButtonUp (const MouseEvent& rMouseEvent)
     }
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Paint.cxx b/sfx2/source/sidebar/Paint.cxx
index 817bd0e54f00..9c6e7344c96b 100644
--- a/sfx2/source/sidebar/Paint.cxx
+++ b/sfx2/source/sidebar/Paint.cxx
@@ -22,7 +22,7 @@
 
 using namespace css;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 Paint::Paint()
     : meType(NoPaint)
@@ -97,6 +97,6 @@ Wallpaper Paint::GetWallpaper() const
     }
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index d83f2d16af04..c1d98be5f36f 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -42,7 +42,7 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 Panel::Panel(const PanelDescriptor& rPanelDescriptor,
              vcl::Window* pParentWindow,
@@ -186,6 +186,6 @@ Reference<awt::XWindow> Panel::GetElementWindow()
     return nullptr;
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/PanelDescriptor.cxx b/sfx2/source/sidebar/PanelDescriptor.cxx
index 90d4183ae4b2..853d2c445ff5 100644
--- a/sfx2/source/sidebar/PanelDescriptor.cxx
+++ b/sfx2/source/sidebar/PanelDescriptor.cxx
@@ -19,7 +19,7 @@
 
 #include <sfx2/sidebar/PanelDescriptor.hxx>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 PanelDescriptor::PanelDescriptor()
     : msTitle(),
@@ -57,6 +57,6 @@ PanelDescriptor::~PanelDescriptor()
 {
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index 5b3a3d63dbf2..deb501e43d07 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -35,7 +35,7 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 static const sal_Int32 gaLeftIconPadding (5);
 static const sal_Int32 gaRightIconPadding (5);
@@ -202,6 +202,6 @@ void PanelTitleBar::DataChanged (const DataChangedEvent& rEvent)
     TitleBar::DataChanged(rEvent);
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx
index aa1422dffef3..455ddcf14fb4 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -42,7 +42,7 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 namespace
 {
@@ -783,6 +783,6 @@ void ResourceManager::disposeDecks()
     }
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Sidebar.cxx b/sfx2/source/sidebar/Sidebar.cxx
index ed12c0829302..eea91f9b9dad 100644
--- a/sfx2/source/sidebar/Sidebar.cxx
+++ b/sfx2/source/sidebar/Sidebar.cxx
@@ -24,7 +24,7 @@
 
 using namespace css;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 void Sidebar::ShowPanel (
     const OUString& rsPanelId,
@@ -88,6 +88,6 @@ bool Sidebar::IsPanelVisible(
     return pController->IsDeckVisible(xPanelDescriptor->msDeckId);
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx
index 14078245e0ef..e75687dfea43 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -25,7 +25,7 @@
 #include <helpids.h>
 #include <comphelper/lok.hxx>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 SFX_IMPL_DOCKINGWINDOW_WITHID(SidebarChildWindow, SID_SIDEBAR);
 
@@ -90,6 +90,6 @@ sal_Int32 SidebarChildWindow::GetDefaultWidth(vcl::Window const* pWindow)
         return 0;
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index bc33163c64f8..9ce9193fa6f3 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -98,7 +98,7 @@ namespace
     }
 }
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 namespace {
     enum MenuId
@@ -1616,6 +1616,6 @@ void SidebarController::saveDeckState()
     }
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index e8172495ffed..fe4548655c81 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -37,7 +37,7 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 class SidebarNotifyIdle : public Idle
 {
@@ -307,6 +307,6 @@ bool SidebarDockingWindow::EventNotify(NotifyEvent& rEvent)
     return SfxDockingWindow::EventNotify(rEvent);
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarModelUpdate.cxx b/sfx2/source/sidebar/SidebarModelUpdate.cxx
index 91c423b1020f..2f81b01f6cc7 100644
--- a/sfx2/source/sidebar/SidebarModelUpdate.cxx
+++ b/sfx2/source/sidebar/SidebarModelUpdate.cxx
@@ -9,12 +9,12 @@
 
 #include <sfx2/sidebar/SidebarModelUpdate.hxx>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 SidebarModelUpdate::~SidebarModelUpdate()
 {
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx
index 0321b9bca3e5..0ada01c391cb 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -30,7 +30,7 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 Reference<ui::XUIElement> SidebarPanelBase::Create (
     const OUString& rsResourceURL,
@@ -195,6 +195,6 @@ void SAL_CALL SidebarPanelBase::updateModel(const css::uno::Reference<css::frame
     pModelUpdate->updateModel(xModel);
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index 03f66a98c0f8..70be2424f276 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -53,7 +53,7 @@ namespace {
     }
 }
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 SidebarToolBox::SidebarToolBox (vcl::Window* pParentWindow)
     : ToolBox(pParentWindow, 0),
@@ -344,6 +344,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void makeNotebookbarToolBox(VclPtr<vcl::Window>
     rRet = pBox;
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 1acd7e10f619..61b2f6559b46 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -41,7 +41,7 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 TabBar::TabBar(vcl::Window* pParentWindow,
                const Reference<frame::XFrame>& rxFrame,
@@ -411,6 +411,6 @@ void TabBar::EnableMenuButton(const bool bEnable)
     mpMenuButton->Enable(bEnable);
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/TabItem.cxx b/sfx2/source/sidebar/TabItem.cxx
index d2535b583acf..160bec8a2075 100644
--- a/sfx2/source/sidebar/TabItem.cxx
+++ b/sfx2/source/sidebar/TabItem.cxx
@@ -28,7 +28,7 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 TabItem::TabItem (vcl::Window* pParentWindow)
     : ImageRadioButton(pParentWindow),
@@ -104,6 +104,6 @@ void TabItem::MouseButtonUp(const MouseEvent& rMouseEvent)
     }
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 9f5b067d9f8e..51d55f067fc1 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -31,7 +31,7 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 Theme& Theme::GetCurrentTheme()
 {
@@ -1042,6 +1042,6 @@ void Theme::ProcessNewValue (
     }
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx
index df58d0d346ff..b793d3a879fd 100644
--- a/sfx2/source/sidebar/TitleBar.cxx
+++ b/sfx2/source/sidebar/TitleBar.cxx
@@ -29,7 +29,7 @@ namespace
     const static sal_Int32 gnRightIconSpace (3);
 }
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 TitleBar::TitleBar(const OUString& rsTitle,
                    vcl::Window* pParentWindow,
@@ -167,6 +167,6 @@ IMPL_LINK(TitleBar, SelectionHandler, ToolBox*, pToolBox, void)
     HandleToolBoxItemClick(nItemId);
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx
index 191b9b047035..27064e58af85 100644
--- a/sfx2/source/sidebar/Tools.cxx
+++ b/sfx2/source/sidebar/Tools.cxx
@@ -32,7 +32,7 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 Image Tools::GetImage (
     const OUString& rsImageURL,
@@ -135,6 +135,6 @@ OUString Tools::GetModuleName (
     return OUString();
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */