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

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

87 files changed, 110 insertions, 242 deletions

diff --git a/sc/qa/unit/cond_format_merge.cxx b/sc/qa/unit/cond_format_merge.cxx
index 28da3a88fbb2..0c6b78c791a3 100644
--- a/sc/qa/unit/cond_format_merge.cxx
+++ b/sc/qa/unit/cond_format_merge.cxx
@@ -15,19 +15,10 @@
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <test/calc_unoapi_test.hxx>
 
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace lang
+namespace com::sun::star::lang
 {
 class XComponent;
 }
-}
-}
-}
 
 using namespace css;
 
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 5c15ee25b470..113d0d0b188f 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -78,7 +78,7 @@
 #include "helper/qahelper.hxx"
 #include "helper/shared_test_impl.hxx"
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::frame { class XModel; }
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 7006bbd48e8e..3a0db48fc0d7 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -70,7 +70,7 @@
 #include <vcl/field.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace embed { class XEmbeddedObject; } } } }
+namespace com::sun::star::embed { class XEmbeddedObject; }
 
 #define DET_ARROW_OFFSET    1000
 
diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx
index 044b8e83d9ec..6306cba96768 100644
--- a/sc/source/core/data/globalx.cxx
+++ b/sc/source/core/data/globalx.cxx
@@ -34,7 +34,7 @@
 #include <unotools/configmgr.hxx>
 #include <unotools/localedatawrapper.hxx>
 
-namespace com { namespace sun { namespace star { namespace ucb { class XCommandEnvironment; } } } }
+namespace com::sun::star::ucb { class XCommandEnvironment; }
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index f126311d5bf3..2a88dfc54c49 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -143,7 +143,7 @@ static const char* const publicFunc =
 
 using namespace formula;
 
-namespace sc { namespace opencl {
+namespace sc::opencl {
 
 namespace {
 
@@ -4417,6 +4417,6 @@ bool FormulaGroupInterpreterOpenCL::interpret( ScDocument& rDoc,
     return aRes.pushResultToDocument(rDoc, rTopPos);
 }
 
-}} // namespace sc::opencl
+} // namespace sc::opencl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/opencl/op_addin.cxx b/sc/source/core/opencl/op_addin.cxx
index 4dcfc9f8a59e..8a42de3232ff 100644
--- a/sc/source/core/opencl/op_addin.cxx
+++ b/sc/source/core/opencl/op_addin.cxx
@@ -14,7 +14,7 @@
 
 using namespace formula;
 
-namespace sc { namespace opencl {
+namespace sc::opencl {
 
 void OpBesselj::GenSlidingWindowFunction(std::stringstream &ss,
     const std::string &sSymName, SubArguments &vSubArguments)
@@ -231,6 +231,6 @@ void OpGestep::GenSlidingWindowFunction(
     ss << "}\n";
 }
 
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/opencl/op_array.cxx b/sc/source/core/opencl/op_array.cxx
index 69990cff921f..c745ec8a154b 100644
--- a/sc/source/core/opencl/op_array.cxx
+++ b/sc/source/core/opencl/op_array.cxx
@@ -14,7 +14,7 @@
 
 using namespace formula;
 
-namespace sc { namespace opencl {
+namespace sc::opencl {
 
 void OpSumX2MY2::GenSlidingWindowFunction(std::stringstream &ss,
             const std::string &sSymName, SubArguments &vSubArguments)
@@ -186,6 +186,6 @@ void OpSumXMY2::GenSlidingWindowFunction(std::stringstream &ss,
     ss << "}";
 }
 
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/opencl/op_database.cxx b/sc/source/core/opencl/op_database.cxx
index 4071ea62d17a..b3fc72d408c3 100644
--- a/sc/source/core/opencl/op_database.cxx
+++ b/sc/source/core/opencl/op_database.cxx
@@ -12,7 +12,7 @@
 #include <formula/vectortoken.hxx>
 #include <sstream>
 
-namespace sc { namespace opencl {
+namespace sc::opencl {
 
 void OpDmax::GenSlidingWindowFunction(std::stringstream &ss,
             const std::string &sSymName, SubArguments &vSubArguments)
@@ -1637,6 +1637,6 @@ void OpDcount2::GenSlidingWindowFunction(std::stringstream &ss,
     ss << "}";
 }
 
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/opencl/op_financial.cxx b/sc/source/core/opencl/op_financial.cxx
index 4cbfbe564e18..6d44271f1203 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -14,7 +14,7 @@
 
 using namespace formula;
 
-namespace sc { namespace opencl {
+namespace sc::opencl {
 // Definitions of inline functions
 #include "opinlinefun_finacial.cxx"
 
@@ -4786,6 +4786,6 @@ void OpDB::GenSlidingWindowFunction(std::stringstream& ss,
     ss <<"    return tmp;\n";
     ss <<"}";
 }
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/opencl/op_logical.cxx b/sc/source/core/opencl/op_logical.cxx
index d73e91747852..2d91b169723f 100644
--- a/sc/source/core/opencl/op_logical.cxx
+++ b/sc/source/core/opencl/op_logical.cxx
@@ -14,7 +14,7 @@
 
 using namespace formula;
 
-namespace sc { namespace opencl {
+namespace sc::opencl {
 void OpAnd::GenSlidingWindowFunction(std::stringstream &ss,
     const std::string &sSymName, SubArguments &vSubArguments)
 {
@@ -356,5 +356,5 @@ void OpIf::GenSlidingWindowFunction(std::stringstream &ss,
     ss << "}\n";
 }
 
-}}
+}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/opencl/op_math.cxx b/sc/source/core/opencl/op_math.cxx
index 13f341b08a04..01658ce987d1 100644
--- a/sc/source/core/opencl/op_math.cxx
+++ b/sc/source/core/opencl/op_math.cxx
@@ -15,7 +15,7 @@
 
 using namespace formula;
 
-namespace sc { namespace opencl {
+namespace sc::opencl {
 
 void OpCos::GenSlidingWindowFunction(std::stringstream &ss,
             const std::string &sSymName, SubArguments &vSubArguments)
@@ -3202,6 +3202,6 @@ void OpSeriesSum::GenSlidingWindowFunction(std::stringstream &ss,
     ss << "    return res;\n";
     ss << "}";
 }
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/opencl/op_spreadsheet.cxx b/sc/source/core/opencl/op_spreadsheet.cxx
index 9df0447d7e1d..48789d582b07 100644
--- a/sc/source/core/opencl/op_spreadsheet.cxx
+++ b/sc/source/core/opencl/op_spreadsheet.cxx
@@ -17,7 +17,7 @@
 
 using namespace formula;
 
-namespace sc { namespace opencl {
+namespace sc::opencl {
 
 void OpVLookup::GenSlidingWindowFunction(std::stringstream &ss,
             const std::string &sSymName, SubArguments &vSubArguments)
@@ -281,6 +281,6 @@ void OpVLookup::GenSlidingWindowFunction(std::stringstream &ss,
     ss << "}";
 }
 
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/opencl/op_statistical.cxx b/sc/source/core/opencl/op_statistical.cxx
index 4a9bec3be0b1..94415b39e41a 100644
--- a/sc/source/core/opencl/op_statistical.cxx
+++ b/sc/source/core/opencl/op_statistical.cxx
@@ -15,7 +15,7 @@
 
 using namespace formula;
 
-namespace sc { namespace opencl {
+namespace sc::opencl {
 void OpVar::GenSlidingWindowFunction(std::stringstream &ss,
             const std::string &sSymName, SubArguments &vSubArguments)
 {
@@ -9825,6 +9825,6 @@ void OpAveDev:: GenSlidingWindowFunction(std::stringstream &ss,
     ss << "    return tmp;\n";
     ss << "}";
 }
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/opencl/opbase.cxx b/sc/source/core/opencl/opbase.cxx
index 2d026475a088..7755610a14f3 100644
--- a/sc/source/core/opencl/opbase.cxx
+++ b/sc/source/core/opencl/opbase.cxx
@@ -15,7 +15,7 @@
 
 using namespace formula;
 
-namespace sc { namespace opencl {
+namespace sc::opencl {
 
 UnhandledToken::UnhandledToken(
     const char* m, const std::string& fn, int ln ) :
@@ -386,6 +386,6 @@ void CheckVariables::UnrollDoubleVector( std::stringstream& ss,
     ss << "    }\n";
 }
 
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/tool/matrixoperators.cxx b/sc/source/core/tool/matrixoperators.cxx
index cc2d2d9bbf89..c42062b932a2 100644
--- a/sc/source/core/tool/matrixoperators.cxx
+++ b/sc/source/core/tool/matrixoperators.cxx
@@ -11,9 +11,7 @@
 #include <matrixoperators.hxx>
 
 
-namespace sc {
-
-namespace op {
+namespace sc::op {
 
 void Sum::operator()(double& rAccum, double fVal) const
 {
@@ -37,6 +35,5 @@ void Product::operator()(double& rAccum, double fVal) const
 const double Product::InitVal = 1.0;
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx
index f5271cefa7e3..d9108d23405e 100644
--- a/sc/source/filter/excel/expop2.cxx
+++ b/sc/source/filter/excel/expop2.cxx
@@ -38,7 +38,7 @@
 
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 
-namespace com { namespace sun { namespace star { namespace document { class XDocumentProperties; } } } }
+namespace com::sun::star::document { class XDocumentProperties; }
 
 namespace {
 
diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx
index 2abc37307f90..b3fc5b16722d 100644
--- a/sc/source/filter/oox/addressconverter.cxx
+++ b/sc/source/filter/oox/addressconverter.cxx
@@ -27,8 +27,7 @@
 #include <oox/core/filterbase.hxx>
 #include <oox/helper/binaryinputstream.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::sheet;
@@ -479,7 +478,6 @@ void AddressConverter::initializeMaxPos(
     }
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx
index 9e53200092ce..3ec6e3923ae0 100644
--- a/sc/source/filter/oox/autofilterbuffer.cxx
+++ b/sc/source/filter/oox/autofilterbuffer.cxx
@@ -40,8 +40,7 @@
 #include <defnamesbuffer.hxx>
 #include <biffhelper.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::sheet;
 using namespace ::com::sun::star::table;
@@ -737,7 +736,6 @@ AutoFilter* AutoFilterBuffer::getActiveAutoFilter()
     return maAutoFilters.empty() ? nullptr : maAutoFilters.back().get();
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/autofiltercontext.cxx b/sc/source/filter/oox/autofiltercontext.cxx
index 1ec7b7138b72..459adefbd019 100644
--- a/sc/source/filter/oox/autofiltercontext.cxx
+++ b/sc/source/filter/oox/autofiltercontext.cxx
@@ -23,8 +23,7 @@
 #include <autofilterbuffer.hxx>
 #include <oox/token/namespaces.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using ::oox::core::ContextHandlerRef;
 
@@ -146,7 +145,6 @@ void AutoFilterContext::onStartRecord( SequenceInputStream& rStrm )
     mrAutoFilter.importAutoFilter( rStrm, getSheetIndex() );
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx
index ce48e93d8c70..06e0ebe06ee0 100644
--- a/sc/source/filter/oox/biffhelper.cxx
+++ b/sc/source/filter/oox/biffhelper.cxx
@@ -23,8 +23,7 @@
 #include <osl/diagnose.h>
 #include <oox/helper/binaryinputstream.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 namespace {
 
@@ -105,7 +104,6 @@ union DecodedDouble
     return aString;
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/chartsheetfragment.cxx b/sc/source/filter/oox/chartsheetfragment.cxx
index 03dfde6aef8b..1047edfd49b0 100644
--- a/sc/source/filter/oox/chartsheetfragment.cxx
+++ b/sc/source/filter/oox/chartsheetfragment.cxx
@@ -26,8 +26,7 @@
 #include <worksheetsettings.hxx>
 #include <biffhelper.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::oox::core;
 
@@ -170,7 +169,6 @@ void ChartsheetFragment::importDrawing( SequenceInputStream& rStrm )
     setDrawingPath( getFragmentPathFromRelId( BiffHelper::readString( rStrm ) ) );
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx
index 097e86b176d9..58b08ec0d3c9 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -46,8 +46,7 @@
 #include <docsh.hxx>
 #include <postit.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::sheet;
@@ -243,7 +242,6 @@ void CommentsBuffer::finalizeImport()
     pModel->setLock(bWasLocked);
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/commentsfragment.cxx b/sc/source/filter/oox/commentsfragment.cxx
index 8a4fe854b9b1..b1442e51e9a8 100644
--- a/sc/source/filter/oox/commentsfragment.cxx
+++ b/sc/source/filter/oox/commentsfragment.cxx
@@ -23,8 +23,7 @@
 #include <richstringcontext.hxx>
 #include <oox/token/namespaces.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::oox::core;
 
@@ -140,7 +139,6 @@ void CommentsFragment::importComment( SequenceInputStream& rStrm )
     mxComment->importComment( rStrm );
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index aa10002ea957..206cdc972f7f 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -43,8 +43,7 @@
 #include <tokenuno.hxx>
 #include <extlstcontext.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::sheet;
 using namespace ::com::sun::star::uno;
@@ -1395,7 +1394,6 @@ const std::vector< std::unique_ptr<ScFormatEntry> >& ExtCfCondFormat::getEntries
     return maEntries;
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/condformatcontext.cxx b/sc/source/filter/oox/condformatcontext.cxx
index dd3afa564d81..bc03c9b2a92f 100644
--- a/sc/source/filter/oox/condformatcontext.cxx
+++ b/sc/source/filter/oox/condformatcontext.cxx
@@ -24,8 +24,7 @@
 #include <condformatbuffer.hxx>
 #include <oox/token/namespaces.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using ::oox::core::ContextHandlerRef;
 
@@ -260,7 +259,6 @@ void CondFormatContext::onEndRecord()
     }
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx
index 4433b69abe71..850aa2efce55 100644
--- a/sc/source/filter/oox/connectionsbuffer.cxx
+++ b/sc/source/filter/oox/connectionsbuffer.cxx
@@ -26,8 +26,7 @@
 #include <oox/token/tokens.hxx>
 #include <oox/helper/binaryinputstream.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::uno;
 
@@ -311,7 +310,6 @@ void ConnectionsBuffer::insertConnectionToMap( const ConnectionRef& rxConnection
     }
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/connectionsfragment.cxx b/sc/source/filter/oox/connectionsfragment.cxx
index 3774f7315e86..1619747763de 100644
--- a/sc/source/filter/oox/connectionsfragment.cxx
+++ b/sc/source/filter/oox/connectionsfragment.cxx
@@ -23,8 +23,7 @@
 #include <biffhelper.hxx>
 #include <connectionsbuffer.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::oox::core;
 
@@ -157,7 +156,6 @@ void ConnectionsFragment::finalizeImport()
     getConnections().finalizeImport();
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index 93c91c574d75..89f1f4acfeea 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -38,8 +38,7 @@
 #include <compiler.hxx>
 #include <document.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::sheet;
 using namespace ::com::sun::star::table;
@@ -402,7 +401,6 @@ DefinedNameRef DefinedNamesBuffer::createDefinedName()
     return xDefName;
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx
index d1c670d00537..9b840048f8ef 100644
--- a/sc/source/filter/oox/drawingbase.cxx
+++ b/sc/source/filter/oox/drawingbase.cxx
@@ -27,8 +27,7 @@
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::oox::drawingml;
 
@@ -288,7 +287,6 @@ EmuPoint ShapeAnchor::calcCellAnchorEmu( const CellAnchorModel& rModel ) const
     return aEmuPoint;
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx
index 09ac89d60d17..ad40e29b3c3f 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -47,8 +47,7 @@
 #include <themebuffer.hxx>
 #include <unitconverter.hxx>
 #include <worksheetbuffer.hxx>
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
@@ -773,7 +772,6 @@ void VmlDrawingFragment::finalizeImport()
     getVmlDrawing().convertAndInsert();
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/excelchartconverter.cxx b/sc/source/filter/oox/excelchartconverter.cxx
index bc5b74690f3a..220b12952be0 100644
--- a/sc/source/filter/oox/excelchartconverter.cxx
+++ b/sc/source/filter/oox/excelchartconverter.cxx
@@ -30,8 +30,7 @@
 #include <oox/helper/containerhelper.hxx>
 #include <formulaparser.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::chart2;
 using namespace ::com::sun::star::chart2::data;
@@ -120,7 +119,6 @@ Reference< XDataSequence > ExcelChartConverter::createDataSequence(
     return xDataSeq;
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx
index 820c174c37bd..aeb8507fac87 100644
--- a/sc/source/filter/oox/excelfilter.cxx
+++ b/sc/source/filter/oox/excelfilter.cxx
@@ -40,8 +40,7 @@
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sheet;
@@ -246,7 +245,6 @@ OUString ExcelFilter::getImplementationName()
     return "com.sun.star.comp.oox.xls.ExcelFilter";
 }
 
-} // namespace xls
 } // namespace oox
 
 
diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx
index e22a3b2f90b0..e22c30e49f4d 100644
--- a/sc/source/filter/oox/excelhandlers.cxx
+++ b/sc/source/filter/oox/excelhandlers.cxx
@@ -19,8 +19,7 @@
 
 #include <excelhandlers.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using ::oox::core::FilterBase;
 using ::oox::core::FragmentHandler2;
@@ -39,7 +38,6 @@ WorksheetFragmentBase::WorksheetFragmentBase(
 {
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx
index c77a52d689d6..100c8ccddfda 100644
--- a/sc/source/filter/oox/excelvbaproject.cxx
+++ b/sc/source/filter/oox/excelvbaproject.cxx
@@ -30,8 +30,7 @@
 #include <oox/helper/propertyset.hxx>
 #include <oox/token/properties.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::frame;
@@ -120,7 +119,6 @@ void ExcelVbaProject::prepareImport()
     }
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx
index 152841b2c932..2f235c9bde0a 100644
--- a/sc/source/filter/oox/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -37,8 +37,7 @@
 #include <addressconverter.hxx>
 #include <biffhelper.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::sheet;
 using namespace ::com::sun::star::uno;
@@ -665,7 +664,6 @@ const RefSheetsModel* ExternalLinkBuffer::getRefSheets( sal_Int32 nRefId ) const
         &maRefSheets[ static_cast< size_t >( nRefId ) ] : nullptr;
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/externallinkfragment.cxx b/sc/source/filter/oox/externallinkfragment.cxx
index 7c29458e6f83..0a1474df6428 100644
--- a/sc/source/filter/oox/externallinkfragment.cxx
+++ b/sc/source/filter/oox/externallinkfragment.cxx
@@ -29,8 +29,7 @@
 #include <unitconverter.hxx>
 #include <biffhelper.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::sheet;
 using namespace ::com::sun::star::uno;
@@ -331,7 +330,6 @@ const RecordInfo* ExternalLinkFragment::getRecordInfos() const
     return spRecInfos;
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx
index cf003d0bb191..cd64197c01d8 100644
--- a/sc/source/filter/oox/extlstcontext.cxx
+++ b/sc/source/filter/oox/extlstcontext.cxx
@@ -31,8 +31,7 @@ using ::oox::xls::CondFormatBuffer;
 
 sal_Int32 rStyleIdx = 0;
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 ExtCfRuleContext::ExtCfRuleContext( WorksheetContextBase& rFragment, ScDataBarFormatData* pTarget ):
     WorksheetContextBase( rFragment ),
@@ -364,7 +363,6 @@ ContextHandlerRef ExtLstGlobalWorkbookContext::onCreateContext( sal_Int32 nEleme
     return this;
 }
 
-} //namespace oox
 } //namespace xls
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index 5156ab5ec207..dca31883b630 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -73,8 +73,7 @@ namespace o3tl {
     template<> struct typed_flags<FuncFlags> : is_typed_flags<FuncFlags, 0x77ff> {};
 }
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sheet;
@@ -1703,7 +1702,6 @@ void FormulaProcessorBase::convertStringToStringList(
     }
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index 3f8c8db4169a..26aec23827db 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star::sheet;
 
 #include <memory>
 
-namespace oox { namespace xls {
+namespace oox::xls {
 
 namespace {
 
@@ -461,6 +461,6 @@ void FormulaBuffer::setCellFormulaValue(
     maCellFormulaValues[rAddress.Tab()].push_back(aVal);
 }
 
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index d44c7a9407f9..51974233f847 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -35,8 +35,7 @@
 #include <externallinkbuffer.hxx>
 #include <tablebuffer.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::sheet;
 using namespace ::com::sun::star::sheet::ReferenceFlags;
@@ -1850,7 +1849,6 @@ OUString FormulaParser::importMacroName( const OUString& rFormulaString )
     return OUString();
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index 60515720f0f2..77f8052d0745 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -40,8 +40,7 @@
 #include <document.hxx>
 #include <ftools.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
@@ -2085,7 +2084,6 @@ void NumberFormatsBuffer::insertBuiltinFormats()
     }
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx
index ce280cbf8b1a..51422101d3ed 100644
--- a/sc/source/filter/oox/ooxformulaparser.cxx
+++ b/sc/source/filter/oox/ooxformulaparser.cxx
@@ -25,10 +25,9 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <formulaparser.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sheet;
@@ -162,7 +161,6 @@ OUString SAL_CALL OOXMLFormulaParser::printFormula(
     throw RuntimeException();
 }
 
-} // namespace xls
 } // namespace oox
 
 
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index 7fd571505081..74a1f169b051 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -49,8 +49,7 @@
 #include <biffhelper.hxx>
 #include <filter/msfilter/util.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
@@ -1049,7 +1048,6 @@ sal_Int32 PageSettingsConverter::writeHeaderFooter(
     return nHeight;
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index fdb7b15da2e2..9aca019ab8ce 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -48,8 +48,7 @@
 #include <addressconverter.hxx>
 #include <biffhelper.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::sheet;
@@ -1218,7 +1217,6 @@ PivotCache& PivotCacheBuffer::createPivotCache( sal_Int32 nCacheId )
     return *rxCache;
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx
index c42316e41d54..a72219962427 100644
--- a/sc/source/filter/oox/pivotcachefragment.cxx
+++ b/sc/source/filter/oox/pivotcachefragment.cxx
@@ -26,8 +26,7 @@
 #include <pivotcachebuffer.hxx>
 #include <worksheetbuffer.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::uno;
 using namespace ::oox::core;
@@ -321,7 +320,6 @@ void PivotCacheRecordsFragment::importPCRecordItem( sal_Int32 nRecId, SequenceIn
 }
 
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx
index 5464a0eabbbf..3f62a6313b42 100644
--- a/sc/source/filter/oox/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -57,8 +57,7 @@
 #include <documentimport.hxx>
 #include <workbooksettings.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::sheet;
@@ -1454,7 +1453,6 @@ void PivotTableBuffer::finalizeImport()
     maTables.forEachMem( &PivotTable::finalizeImport );
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/pivottablefragment.cxx b/sc/source/filter/oox/pivottablefragment.cxx
index 9ce2bb7eb790..6c5d479dd839 100644
--- a/sc/source/filter/oox/pivottablefragment.cxx
+++ b/sc/source/filter/oox/pivottablefragment.cxx
@@ -22,8 +22,7 @@
 #include <biffhelper.hxx>
 #include <oox/token/namespaces.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::oox::core;
 
@@ -276,7 +275,6 @@ const RecordInfo* PivotTableFragment::getRecordInfos() const
     return spRecInfos;
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx
index cf16040337fe..d0940956699e 100644
--- a/sc/source/filter/oox/querytablebuffer.cxx
+++ b/sc/source/filter/oox/querytablebuffer.cxx
@@ -34,8 +34,7 @@
 #include <connectionsbuffer.hxx>
 #include <defnamesbuffer.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::sheet;
@@ -279,7 +278,6 @@ void QueryTableBuffer::finalizeImport()
     maQueryTables.forEachMem( &QueryTable::finalizeImport );
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/querytablefragment.cxx b/sc/source/filter/oox/querytablefragment.cxx
index f485cb2a4e03..789e469953f2 100644
--- a/sc/source/filter/oox/querytablefragment.cxx
+++ b/sc/source/filter/oox/querytablefragment.cxx
@@ -22,8 +22,7 @@
 #include <biffhelper.hxx>
 #include <oox/token/namespaces.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::oox::core;
 
@@ -68,7 +67,6 @@ const RecordInfo* QueryTableFragment::getRecordInfos() const
     return spRecInfos;
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/revisionfragment.cxx b/sc/source/filter/oox/revisionfragment.cxx
index 071b8f4717e4..70dd03b671e7 100644
--- a/sc/source/filter/oox/revisionfragment.cxx
+++ b/sc/source/filter/oox/revisionfragment.cxx
@@ -35,7 +35,7 @@
 
 using namespace com::sun::star;
 
-namespace oox { namespace xls {
+namespace oox::xls {
 
 namespace {
 
@@ -448,6 +448,6 @@ void RevisionLogFragment::pushRevision()
     }
 }
 
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx
index fb6b46932f3f..49e8d7297dc1 100644
--- a/sc/source/filter/oox/richstring.cxx
+++ b/sc/source/filter/oox/richstring.cxx
@@ -33,8 +33,7 @@
 
 #include <vcl/svapp.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::uno;
@@ -483,7 +482,6 @@ void RichString::createPhoneticPortions( const OUString& rText, PhoneticPortionM
     }
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/richstringcontext.cxx b/sc/source/filter/oox/richstringcontext.cxx
index d2a48995bb63..98da03bc1602 100644
--- a/sc/source/filter/oox/richstringcontext.cxx
+++ b/sc/source/filter/oox/richstringcontext.cxx
@@ -22,8 +22,7 @@
 #include <stylesfragment.hxx>
 #include <oox/token/namespaces.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using ::oox::core::ContextHandlerRef;
 
@@ -87,7 +86,6 @@ void RichStringContext::onCharacters( const OUString& rChars )
     }
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx
index 1ea69343d657..bdb99ff94209 100644
--- a/sc/source/filter/oox/scenariobuffer.cxx
+++ b/sc/source/filter/oox/scenariobuffer.cxx
@@ -33,8 +33,7 @@
 #include <addressconverter.hxx>
 #include <biffhelper.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::sheet;
@@ -208,7 +207,6 @@ void ScenarioBuffer::finalizeImport()
     maSheetScenarios.forEachMem( &SheetScenarios::finalizeImport );
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/scenariocontext.cxx b/sc/source/filter/oox/scenariocontext.cxx
index 8c2bc9007d74..23c5a99828d2 100644
--- a/sc/source/filter/oox/scenariocontext.cxx
+++ b/sc/source/filter/oox/scenariocontext.cxx
@@ -23,8 +23,7 @@
 #include <scenariobuffer.hxx>
 #include <oox/token/namespaces.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using ::oox::core::ContextHandlerRef;
 
@@ -108,7 +107,6 @@ void ScenariosContext::onStartRecord( SequenceInputStream& rStrm )
         mrSheetScenarios.importScenarios( rStrm );
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/sharedstringsbuffer.cxx b/sc/source/filter/oox/sharedstringsbuffer.cxx
index 0c70ba11d15e..4162cb44b6d0 100644
--- a/sc/source/filter/oox/sharedstringsbuffer.cxx
+++ b/sc/source/filter/oox/sharedstringsbuffer.cxx
@@ -19,8 +19,7 @@
 
 #include <sharedstringsbuffer.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 SharedStringsBuffer::SharedStringsBuffer( const WorkbookHelper& rHelper ) :
      WorkbookHelper( rHelper )
@@ -44,7 +43,6 @@ RichStringRef SharedStringsBuffer::getString( sal_Int32 nStringId ) const
     return maStrings.get( nStringId );
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/sharedstringsfragment.cxx b/sc/source/filter/oox/sharedstringsfragment.cxx
index f938eafa43e8..13735126290b 100644
--- a/sc/source/filter/oox/sharedstringsfragment.cxx
+++ b/sc/source/filter/oox/sharedstringsfragment.cxx
@@ -24,8 +24,7 @@
 #include <sharedstringsbuffer.hxx>
 #include <oox/token/namespaces.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::oox::core;
 
@@ -84,7 +83,6 @@ void SharedStringsFragment::finalizeImport()
     getSharedStrings().finalizeImport();
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx
index 03b35ef76e35..e2675c04c865 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -47,8 +47,7 @@
 #include <numformat.hxx>
 #include <sax/tools/converter.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sheet;
@@ -751,7 +750,6 @@ void SheetDataBuffer::applyCellMerging( const ScRange& rRange )
         rDoc.DoMerge( getSheetIndex(), rStart.Col(), rStart.Row(), rEnd.Col(), rEnd.Row() );
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx
index ce4d3816f61b..c89a37d2d908 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -29,8 +29,7 @@
 #include <richstringcontext.hxx>
 #include <sal/log.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using ::oox::core::ContextHandlerRef;
 
@@ -572,7 +571,6 @@ void SheetDataContext::importSharedFmla( SequenceInputStream& rStrm )
     }
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index f67d4b01c47f..b080965e79b1 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -85,8 +85,7 @@
 #include <stlsheet.hxx>
 #include <biffhelper.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::container;
@@ -3015,7 +3014,6 @@ void StylesBuffer::writeCellXfToDoc(
     pXf->writeToDoc(rDoc, rRange);
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/stylesfragment.cxx b/sc/source/filter/oox/stylesfragment.cxx
index 2c2c9968703d..8d0a583ff88f 100644
--- a/sc/source/filter/oox/stylesfragment.cxx
+++ b/sc/source/filter/oox/stylesfragment.cxx
@@ -24,8 +24,7 @@
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::oox::core;
 
@@ -313,7 +312,6 @@ void StylesFragment::finalizeImport()
     getStyles().finalizeImport();
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx
index 8c8526ce9a57..132ffbc16a7a 100644
--- a/sc/source/filter/oox/tablebuffer.cxx
+++ b/sc/source/filter/oox/tablebuffer.cxx
@@ -32,8 +32,7 @@
 #include <addressconverter.hxx>
 #include <biffhelper.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::sheet;
 using namespace ::com::sun::star::uno;
@@ -206,7 +205,6 @@ void TableBuffer::insertTableToMaps( const TableRef& rxTable )
     }
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/tablecolumnsbuffer.cxx b/sc/source/filter/oox/tablecolumnsbuffer.cxx
index 0a90f72236f7..f21a869f4fe8 100644
--- a/sc/source/filter/oox/tablecolumnsbuffer.cxx
+++ b/sc/source/filter/oox/tablecolumnsbuffer.cxx
@@ -24,8 +24,7 @@
 #include <oox/token/tokens.hxx>
 #include <dbdata.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 TableColumn::TableColumn( const WorkbookHelper& rHelper ) :
     WorkbookHelper( rHelper ),
@@ -124,7 +123,6 @@ TableColumns* TableColumnsBuffer::getActiveTableColumns()
     return maTableColumnsVector.empty() ? nullptr : maTableColumnsVector.back().get();
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/tablecolumnscontext.cxx b/sc/source/filter/oox/tablecolumnscontext.cxx
index ce1c3f38b5b5..74003a08446c 100644
--- a/sc/source/filter/oox/tablecolumnscontext.cxx
+++ b/sc/source/filter/oox/tablecolumnscontext.cxx
@@ -22,8 +22,7 @@
 #include <tablecolumnsbuffer.hxx>
 #include <oox/token/namespaces.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using ::oox::core::ContextHandlerRef;
 
@@ -88,7 +87,6 @@ void TableColumnsContext::onStartRecord( SequenceInputStream& rStrm )
     mrTableColumns.importTableColumns( rStrm );
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/tablefragment.cxx b/sc/source/filter/oox/tablefragment.cxx
index c4eabf266e37..f86491d9e83c 100644
--- a/sc/source/filter/oox/tablefragment.cxx
+++ b/sc/source/filter/oox/tablefragment.cxx
@@ -25,8 +25,7 @@
 #include <tablebuffer.hxx>
 #include <oox/token/namespaces.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::oox::core;
 
@@ -93,7 +92,6 @@ const RecordInfo* TableFragment::getRecordInfos() const
     return spRecInfos;
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/themebuffer.cxx b/sc/source/filter/oox/themebuffer.cxx
index 1f7d97ab80fa..303ff7f2cfae 100644
--- a/sc/source/filter/oox/themebuffer.cxx
+++ b/sc/source/filter/oox/themebuffer.cxx
@@ -21,8 +21,7 @@
 
 #include <stylesbuffer.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 
 ThemeBuffer::ThemeBuffer( const WorkbookHelper& rHelper ) :
@@ -50,7 +49,6 @@ ThemeBuffer::~ThemeBuffer()
     return getClrScheme().getColorByIndex(nIndex, nColor) ? nColor : API_RGB_TRANSPARENT;
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx
index 0d47ec205237..911a01785b35 100644
--- a/sc/source/filter/oox/unitconverter.cxx
+++ b/sc/source/filter/oox/unitconverter.cxx
@@ -32,10 +32,9 @@
 #include <stylesbuffer.hxx>
 #include <biffhelper.hxx>
 
-namespace com { namespace sun { namespace star { namespace awt { struct FontDescriptor; } } } }
+namespace com::sun::star::awt { struct FontDescriptor; }
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::awt;
@@ -236,7 +235,6 @@ double UnitConverter::getCoefficient( Unit eUnit ) const
     return maCoeffs[ eUnit ];
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx
index a01c536fcac9..7bca06c08169 100644
--- a/sc/source/filter/oox/viewsettings.cxx
+++ b/sc/source/filter/oox/viewsettings.cxx
@@ -40,10 +40,9 @@
 #include <workbooksettings.hxx>
 #include <worksheetbuffer.hxx>
 
-namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } }
+namespace com::sun::star::container { class XNameContainer; }
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::container;
@@ -632,7 +631,6 @@ WorkbookViewModel& ViewSettings::createWorkbookView()
     return *xModel;
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index 7e7edc655a59..f13f851abb00 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -73,8 +73,7 @@
 #include <comphelper/processfactory.hxx>
 #include <officecfg/Office/Calc.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::table;
@@ -628,7 +627,6 @@ void WorkbookFragment::importPivotCacheDefFragment( const OUString& rRelId, sal_
     getPivotCaches().registerPivotCacheFragment( nCacheId, getFragmentPathFromRelId( rRelId ) );
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index 89269da46260..ff67a82a8b56 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -79,8 +79,7 @@
 
 #include <memory>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::document;
@@ -1025,7 +1024,6 @@ rtl_TextEncoding WorkbookHelper::getTextEncoding() const
     return mrBookGlob.getTextEncoding();
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx
index dac0490ae9cb..180e643b8231 100644
--- a/sc/source/filter/oox/workbooksettings.cxx
+++ b/sc/source/filter/oox/workbooksettings.cxx
@@ -35,8 +35,7 @@
 #include <unitconverter.hxx>
 #include <biffhelper.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sheet;
@@ -287,7 +286,6 @@ void WorkbookSettings::setDateMode( bool bDateMode1904, bool bDateCompatibility
     getUnitConverter().finalizeNullDate( getNullDate() );
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx
index ade90452d21f..04cf5c41fb88 100644
--- a/sc/source/filter/oox/worksheetbuffer.cxx
+++ b/sc/source/filter/oox/worksheetbuffer.cxx
@@ -33,8 +33,7 @@
 #include <documentimport.hxx>
 #include <biffhelper.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::sheet;
@@ -241,7 +240,6 @@ void WorksheetBuffer::finalizeImport( sal_Int16 nActiveSheet )
     }
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx
index 775e9ad9a3a7..09f34d702b60 100644
--- a/sc/source/filter/oox/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -44,8 +44,7 @@
 #include <viewsettings.hxx>
 #include <worksheetsettings.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::oox::core;
 
@@ -902,7 +901,6 @@ void WorksheetFragment::importEmbeddedOleData( StreamDataSequence& orEmbeddedDat
         getBaseFilter().importBinaryData( orEmbeddedData, aFragmentPath );
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index d390e9c33357..5c0c713281be 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -74,8 +74,7 @@
 #include <editeng/editobj.hxx>
 #include <editeng/flditem.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
@@ -1592,7 +1591,6 @@ void WorksheetHelper::createSharedFormulaMapEntry(
     getFormulaBuffer().createSharedFormulaMapEntry(rAddress, nSharedId, rTokens);
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/worksheetsettings.cxx b/sc/source/filter/oox/worksheetsettings.cxx
index 93e340eb1c2c..719b2904301b 100644
--- a/sc/source/filter/oox/worksheetsettings.cxx
+++ b/sc/source/filter/oox/worksheetsettings.cxx
@@ -32,8 +32,7 @@
 #include <addressconverter.hxx>
 #include <biffhelper.hxx>
 
-namespace oox {
-namespace xls {
+namespace oox::xls {
 
 using namespace ::com::sun::star::uno;
 
@@ -289,7 +288,6 @@ void WorksheetSettings::finalizeImport()
     }
 }
 
-} // namespace xls
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/orcus/filterdetect.cxx b/sc/source/filter/orcus/filterdetect.cxx
index 106248854b1d..03b057a376d8 100644
--- a/sc/source/filter/orcus/filterdetect.cxx
+++ b/sc/source/filter/orcus/filterdetect.cxx
@@ -18,7 +18,7 @@
 
 #include <orcus/format_detection.hpp>
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace {
 
diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx
index 1f8058361213..ab16ae66c4ba 100644
--- a/sc/source/filter/orcus/xmlcontext.cxx
+++ b/sc/source/filter/orcus/xmlcontext.cxx
@@ -30,7 +30,7 @@
 #include <string>
 #include <sstream>
 
-namespace com { namespace sun { namespace star { namespace ucb { class XCommandEnvironment; } } } }
+namespace com::sun::star::ucb { class XCommandEnvironment; }
 
 #define BUFFER_SIZE 4096
 
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 2c30fffa9359..4049cdb4a244 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -155,7 +155,7 @@
 #include <vector>
 #include <vbahelper/vbaaccesshelper.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
 
 
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(