10 files changed, 18 insertions, 26 deletions
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 443f5a1109c2..21772db395fe 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -36,7 +36,7 @@ using namespace css::uno;
 
 // namespace open
 
-namespace sc { namespace sidebar {
+namespace sc::sidebar {
 
 AlignmentPropertyPanel::AlignmentPropertyPanel(
     vcl::Window* pParent,
@@ -362,6 +362,6 @@ void AlignmentPropertyPanel::NotifyItemUpdate(
 
 // namespace close
 
-}} // end of namespace ::sc::sidebar
+} // end of namespace ::sc::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index 4f7868c112ec..b7e04177dc1a 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -41,7 +41,7 @@ const char LINESTYLE[] = "LineStyle";
 
 // namespace open
 
-namespace sc { namespace sidebar {
+namespace sc::sidebar {
 
 CellAppearancePropertyPanel::CellAppearancePropertyPanel(
     vcl::Window* pParent,
@@ -507,6 +507,6 @@ void CellAppearancePropertyPanel::UpdateCellBorder(bool bTop, bool bBot, bool bL
 }
 // namespace close
 
-}} // end of namespace ::sc::sidebar
+} // end of namespace ::sc::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index e563073d7f72..5915b50f52df 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -28,7 +28,7 @@
 #include <editeng/lineitem.hxx>
 #include <memory>
 
-namespace sc { namespace sidebar {
+namespace sc::sidebar {
 
 #define FRM_VALID_LEFT      0x01
 #define FRM_VALID_RIGHT     0x02
@@ -275,6 +275,6 @@ IMPL_LINK(CellBorderStylePopup, TB4SelectHdl, const OString&, rId, void)
     maToolButton.set_inactive();
 }
 
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx
index 7139ca23dde4..ab828aa8e1ac 100644
--- a/sc/source/ui/sidebar/CellLineStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx
@@ -29,7 +29,7 @@
 #include <sfx2/dispatch.hxx>
 #include <svx/svxids.hrc>
 
-namespace sc { namespace sidebar {
+namespace sc::sidebar {
 
 CellLineStylePopup::CellLineStylePopup(weld::Toolbar* pParent, const OString& rId, SfxDispatcher* pDispatcher)
     : WeldToolbarPopup(nullptr, pParent, "modules/scalc/ui/floatinglinestyle.ui", "FloatingLineStyle")
@@ -219,6 +219,6 @@ void CellLineStylePopup::SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal_u
     mxCellLineStyleValueSet->Invalidate();
 }
 
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
index a8df9a3363a7..70f8c649fb8d 100644
--- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
@@ -23,7 +23,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 
-namespace sc { namespace sidebar {
+namespace sc::sidebar {
 
 CellLineStyleValueSet::CellLineStyleValueSet()
     : SvtValueSet(nullptr)
@@ -166,6 +166,6 @@ void CellLineStyleValueSet::UserDraw( const UserDrawEvent& rUDEvt )
 
 }
 
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index 98dd424f1a97..653a6494c2b5 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -28,7 +28,7 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sc { namespace sidebar {
+namespace sc::sidebar {
 
 NumberFormatPropertyPanel::NumberFormatPropertyPanel(
     vcl::Window* pParent,
@@ -297,6 +297,6 @@ void NumberFormatPropertyPanel::DisableControls()
     mxEdLeadZeroes->set_sensitive(false);
 }
 
-}} // end of namespace ::sc::sidebar
+} // end of namespace ::sc::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx
index b3f69e7b0e08..9bd54bf774bf 100644
--- a/sc/source/ui/sidebar/ScPanelFactory.cxx
+++ b/sc/source/ui/sidebar/ScPanelFactory.cxx
@@ -36,7 +36,7 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sc { namespace sidebar {
+namespace sc::sidebar {
 
 ScPanelFactory::ScPanelFactory()
     : PanelFactoryInterfaceBase(m_aMutex)
@@ -131,7 +131,7 @@ css::uno::Sequence<OUString> ScPanelFactory::getSupportedServiceNames()
     return { "com.sun.star.ui.UIElementFactory" };
 }
 
-} } // end of namespace sc::sidebar
+} // end of namespace sc::sidebar
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 ScPanelFactory_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &)
diff --git a/sc/source/ui/unoobj/ChartTools.cxx b/sc/source/ui/unoobj/ChartTools.cxx
index 1b97b830fa95..5399256ae443 100644
--- a/sc/source/ui/unoobj/ChartTools.cxx
+++ b/sc/source/ui/unoobj/ChartTools.cxx
@@ -21,8 +21,7 @@
 
 using namespace css;
 
-namespace sc {
-namespace tools {
+namespace sc::tools {
 
 namespace {
 
@@ -170,6 +169,6 @@ std::vector<SdrOle2Obj*> getAllPivotChartsConntectedTo(OUString const & sPivotTa
     return aObjects;
 }
 
-}} // end sc::tools
+} // end sc::tools
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx
index b1f98144fd93..4258e1cddcb5 100644
--- a/sc/source/ui/vba/excelvbahelper.cxx
+++ b/sc/source/ui/vba/excelvbahelper.cxx
@@ -46,9 +46,7 @@
 using namespace ::com::sun::star;
 using namespace ::ooo::vba;
 
-namespace ooo {
-namespace vba {
-namespace excel {
+namespace ooo::vba::excel {
 
 uno::Reference< sheet::XUnnamedDatabaseRanges >
 GetUnnamedDataBaseRanges( const ScDocShell* pShell )
@@ -396,8 +394,6 @@ ScVbaCellRangeAccess::GetDataSet( ScCellRangesBase* pRangeObj )
     return pRangeObj ? pRangeObj->GetCurrentDataSet( true ) : nullptr;
 }
 
-} // namespace excel
-} // namespace vba
 } // namespace ooo
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index d5517b991f00..43448ce4cb4f 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -1143,9 +1143,7 @@ SdrObject* ScDrawView::ApplyGraphicToObject(
 
 // Own derivation of ObjectContact to allow on-demand calculation of
 // GridOffset for non-linear ViewToDevice transformation (calc)
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         namespace {
 
@@ -1227,7 +1225,6 @@ namespace sdr
             }
         }
     }
-}
 
 // Create own derivation of ObjectContact for calc
 sdr::contact::ObjectContact* ScDrawView::createViewSpecificObjectContact(