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

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

18 files changed, 39 insertions, 49 deletions

diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 67511b76fcc3..f4842d7d710d 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -145,9 +145,7 @@ SdrText* CellTextProvider::getText(sal_Int32 nIndex) const
 
 }
 
-namespace sdr
-{
-    namespace properties
+namespace sdr::properties
     {
         class CellProperties : public TextProperties
         {
@@ -379,10 +377,9 @@ namespace sdr
             AttributeProperties::ItemChange( nWhich, pNewItem );
         }
 
-    } // end of namespace properties
-} // end of namespace sdr
+    } // end of namespace sdr
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 
 // Cell
@@ -1701,6 +1698,6 @@ void Cell::dumpAsXml(xmlTextWriterPtr pWriter, sal_Int32 nRow, sal_Int32 nCol) c
     xmlTextWriterEndElement(pWriter);
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx
index 09197d1be194..8adecf6316e7 100644
--- a/svx/source/table/cellcursor.cxx
+++ b/svx/source/table/cellcursor.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::table;
 
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 CellCursor::CellCursor( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom )
 : CellCursorBase( xTable, nLeft, nTop, nRight, nBottom )
@@ -540,6 +540,6 @@ sal_Bool SAL_CALL CellCursor::isMergeable(  )
 }
 
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/cellrange.cxx b/svx/source/table/cellrange.cxx
index 416d104d8a9a..c0a7eee72261 100644
--- a/svx/source/table/cellrange.cxx
+++ b/svx/source/table/cellrange.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::table;
 
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 CellRange::CellRange( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom )
 : mxTable( xTable )
@@ -111,6 +111,6 @@ Reference< XCellRange > SAL_CALL CellRange::getCellRangeByName( const OUString&
 }
 
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/propertyset.cxx b/svx/source/table/propertyset.cxx
index 5a59e40143f1..300c877bf67e 100644
--- a/svx/source/table/propertyset.cxx
+++ b/svx/source/table/propertyset.cxx
@@ -24,7 +24,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 FastPropertySetInfo::FastPropertySetInfo( const PropertyVector& rProps )
 {
@@ -201,6 +201,6 @@ void SAL_CALL FastPropertySet::firePropertiesChangeEvent( const Sequence< OUStri
 {
 }
 
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 50fb4cc94f39..45f89f38268f 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -82,7 +82,7 @@ using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::style;
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 namespace {
 
@@ -2533,6 +2533,6 @@ bool SdrTableObj::createTableEdgesJson(boost::property_tree::ptree & rJsonRoot)
     return true;
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx
index 2342c6f10c87..016746a1eea9 100644
--- a/svx/source/table/tablecolumn.cxx
+++ b/svx/source/table/tablecolumn.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star::table;
 using namespace ::com::sun::star::beans;
 
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 const sal_Int32 Property_Width = 0;
 const sal_Int32 Property_OptimalWidth = 1;
@@ -283,6 +283,6 @@ sal_Int32 TableColumn::getWidth() const
     return mnWidth;
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tablecolumns.cxx b/svx/source/table/tablecolumns.cxx
index d56a124f05a3..1b033c14eae0 100644
--- a/svx/source/table/tablecolumns.cxx
+++ b/svx/source/table/tablecolumns.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::table;
 
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 TableColumns::TableColumns( const TableModelRef& xTableModel )
 : mxTableModel( xTableModel )
@@ -115,6 +115,6 @@ sal_Bool SAL_CALL TableColumns::hasElements()
 }
 
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 3b53fe2f7e61..54c67302cd9a 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -110,7 +110,7 @@ enum class CellPosFlag  // signals the relative position of a cell to a selectio
 namespace o3tl
 { template<> struct typed_flags<CellPosFlag> : is_typed_flags<CellPosFlag, 0xff> {}; }
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 namespace {
 
@@ -3253,6 +3253,6 @@ bool SvxTableController::setCursorLogicPosition(const Point& rPosition, bool bPo
     return false;
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index c80f4ace3f60..153cfc3f72c4 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -61,7 +61,7 @@ using ::osl::MutexGuard;
 using ::osl::ClearableMutexGuard;
 using ::cppu::OInterfaceContainerHelper;
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 typedef std::map< OUString, sal_Int32 > CellStyleNameMap;
 
@@ -720,6 +720,6 @@ Reference< XNameAccess > CreateTableDesignFamily()
     return new TableDesignFamily;
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx
index ea7fd2e3306f..86a60dc3c717 100644
--- a/svx/source/table/tablehandles.cxx
+++ b/svx/source/table/tablehandles.cxx
@@ -39,7 +39,7 @@
 #include <sdr/overlay/overlayrectangle.hxx>
 #include <drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx>
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 namespace {
 
@@ -312,7 +312,6 @@ void TableBorderHdl::CreateB2dIAObject()
 }
 
 
-} // end of namespace table
 } // end of namespace sdr
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 11ac8da225d8..492208a99586 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::table;
 using namespace ::com::sun::star::text;
 
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 
 static SvxBorderLine gEmptyBorder;
@@ -1314,6 +1314,6 @@ void TableLayouter::Layout::dumpAsXml(xmlTextWriterPtr pWriter) const
     xmlTextWriterEndElement(pWriter);
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 7b0cc4de5806..464f862c0947 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -52,7 +52,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
 
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 
 // removes the given range from a vector
@@ -1112,6 +1112,6 @@ void TableModel::dumpAsXml(xmlTextWriterPtr pWriter) const
     xmlTextWriterEndElement(pWriter);
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx
index f7ca4d8d40d0..2bb1f15d5c6f 100644
--- a/svx/source/table/tablerow.cxx
+++ b/svx/source/table/tablerow.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::table;
 using namespace ::com::sun::star::beans;
 
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 const sal_Int32 Property_Height = 0;
 const sal_Int32 Property_OptimalHeight = 1;
@@ -346,6 +346,6 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo()
 }
 
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx
index 572210ce1bb3..479098ae817d 100644
--- a/svx/source/table/tablerows.cxx
+++ b/svx/source/table/tablerows.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::table;
 
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 TableRows::TableRows( const TableModelRef& xTableModel )
 : mxTableModel( xTableModel )
@@ -109,6 +109,6 @@ sal_Bool SAL_CALL TableRows::hasElements()
 }
 
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index ef1823cf7fed..4a27e670a7f8 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -46,7 +46,7 @@ using namespace ::com::sun::star::table;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::beans;
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 class SdrTableRtfExporter
 {
@@ -240,6 +240,6 @@ void SdrTableRtfExporter::WriteCell( sal_Int32 nCol, sal_Int32 nRow )
         mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PLAIN );
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index 267c6a9c6519..d342856bedee 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::table;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::beans;
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 namespace {
 
@@ -504,6 +504,6 @@ void SdrTableObj::ImportAsRTF( SvStream& rStream, SdrTableObj& rObj )
     aParser.Read( rStream );
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx
index 7b1b070b4458..d0433bbe9b54 100644
--- a/svx/source/table/tableundo.cxx
+++ b/svx/source/table/tableundo.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::table;
 
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 CellUndo::CellUndo( const tools::WeakReference<SdrObject>& xObjRef, const CellRef& xCell )
 :   SdrUndoAction(xCell->GetObject().getSdrModelFromSdrObject())
@@ -513,6 +513,6 @@ void TableStyleUndo::getData( Data& rData )
     }
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index 3687df3424e9..24efdd8d3663 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -50,9 +50,7 @@ using editeng::SvxBorderLine;
 using namespace com::sun::star;
 
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer::primitive2d
     {
         namespace {
 
@@ -146,12 +144,9 @@ namespace drawinglayer
         // provide unique ID
         ImplPrimitive2DIDBlock(SdrCellPrimitive2D, PRIMITIVE2D_ID_SDRCELLPRIMITIVE2D)
 
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+    } // end of namespace drawinglayer
 
-namespace sdr
-{
-    namespace contact
+namespace sdr::contact
     {
         static svx::frame::Style impGetLineStyle(
             const sdr::table::TableLayouter& rLayouter,
@@ -421,7 +416,6 @@ namespace sdr
         ViewContactOfTableObj::~ViewContactOfTableObj()
         {
         }
-    } // end of namespace contact
-} // end of namespace sdr
+    } // end of namespace sdr
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */