compact namespace: writerfilter

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

39 files changed, 81 insertions, 165 deletions

diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx
index 6eec32327a14..9e8aa7a62a90 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -26,8 +26,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <o3tl/enumarray.hxx>
 
-namespace writerfilter {
-namespace dmapper
+namespace writerfilter::dmapper
 {
 class PropertyMap;
 class BorderHandler : public LoggedProperties
@@ -74,7 +73,7 @@ public:
     void enableInteropGrabBag(const OUString& aName);
     css::beans::PropertyValue getInteropGrabBag(const OUString& aName = OUString());
 };
-}}
+}
 
 #endif
 
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx
index 4ec63c217f7c..1d5419ec18af 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/writerfilter/source/dmapper/CellColorHandler.hxx
@@ -25,8 +25,7 @@
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 
-namespace writerfilter {
-namespace dmapper
+namespace writerfilter::dmapper
 {
 class TablePropertyMap;
 class CellColorHandler : public LoggedProperties
@@ -63,7 +62,7 @@ public:
     void disableInteropGrabBag();
     bool isInteropGrabBagEnabled() const;
 };
-}}
+}
 
 #endif
 
diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx b/writerfilter/source/dmapper/CellMarginHandler.hxx
index 349611b1012a..956e3b259a80 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.hxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.hxx
@@ -23,8 +23,7 @@
 #include <vector>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
-namespace writerfilter {
-namespace dmapper
+namespace writerfilter::dmapper
 {
 class TablePropertyMap;
 class CellMarginHandler : public LoggedProperties
@@ -61,7 +60,7 @@ public:
     css::beans::PropertyValue getInteropGrabBag();
 
 };
-}}
+}
 
 #endif
 
diff --git a/writerfilter/source/dmapper/ConversionHelper.hxx b/writerfilter/source/dmapper/ConversionHelper.hxx
index 707ac7424bb4..53bae1527e77 100644
--- a/writerfilter/source/dmapper/ConversionHelper.hxx
+++ b/writerfilter/source/dmapper/ConversionHelper.hxx
@@ -34,9 +34,7 @@ namespace com::sun::star{
     }
 }
 
-namespace writerfilter {
-namespace dmapper{
-namespace ConversionHelper{
+namespace writerfilter::dmapper::ConversionHelper{
 
     // create a border line and return the distance value
     void MakeBorderLine(sal_Int32 nLineThickness,
@@ -56,9 +54,7 @@ namespace ConversionHelper{
     sal_Int16 ConvertCustomNumberFormat(const OUString& rFormat);
 
     css::util::DateTime ConvertDateStringToDateTime(const OUString& rDateTime);
-} // namespace ConversionHelper
-} //namespace dmapper
-} // namespace writerfilter
+} // namespace writerfilter::dmapper::ConversionHelper
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx
index c8281f9334ec..d84638f75840 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -54,8 +54,7 @@ class MediaDescriptor;
 
 typedef std::vector<css::beans::PropertyValue> PropertyValueVector_t;
 
-namespace writerfilter {
-namespace dmapper
+namespace writerfilter::dmapper
 {
 
 class PropertyMap;
@@ -177,8 +176,7 @@ private:
     OUString m_sGlossaryEntryName;
 };
 
-} // namespace dmapper
-} // namespace writerfilter
+} // namespace writerfilter::dmapper
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index 545f60919c46..f130cf6da216 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
@@ -24,8 +24,7 @@
 
 #include <com/sun/star/text/XTextAppendAndConvert.hpp>
 
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
 
 typedef css::uno::Sequence< css::uno::Reference< css::text::XTextRange > > CellSequence_t;
 typedef css::uno::Sequence<CellSequence_t> RowSequence_t;
@@ -121,7 +120,7 @@ public:
     DomainMapper_Impl& getDomainMapperImpl();
 };
 
-}}
+}
 
 #endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_DOMAINMAPPERTABLEHANDLER_HXX
 
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index 1b116f94084c..14133b276359 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -28,8 +28,7 @@
 #include <memory>
 #include <comphelper/sequenceashashmap.hxx>
 
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
 
 class DomainMapper;
 
@@ -133,7 +132,7 @@ public:
 
 };
 
-}}
+}
 
 #endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_DOMAINMAPPERTABLEMANAGER_HXX
 
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 9886f7665c6b..d69168ed74fc 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -64,8 +64,7 @@ namespace com::sun::star{
         namespace beans{ class XPropertySet;}
 }
 
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
 
 class SdtHelper;
 
@@ -1081,8 +1080,7 @@ private:
     bool m_bParaWithInlineObject;
 };
 
-} //namespace dmapper
-} //namespace writerfilter
+} //namespace writerfilter::dmapper
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx b/writerfilter/source/dmapper/FFDataHandler.hxx
index 84ac070e50de..f5bdb6666ea1 100644
--- a/writerfilter/source/dmapper/FFDataHandler.hxx
+++ b/writerfilter/source/dmapper/FFDataHandler.hxx
@@ -21,8 +21,7 @@
 #include "LoggedResources.hxx"
 #include <rtl/ustring.hxx>
 #include <vector>
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
 class FFDataHandler : public LoggedProperties
 {
 public:
@@ -97,7 +96,7 @@ private:
 };
 
 
-}}
+}
 #endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_FFDATAHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/FieldTypes.hxx b/writerfilter/source/dmapper/FieldTypes.hxx
index af390fe20e88..7755c3feb7ca 100644
--- a/writerfilter/source/dmapper/FieldTypes.hxx
+++ b/writerfilter/source/dmapper/FieldTypes.hxx
@@ -19,8 +19,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_FIELDTYPES_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_FIELDTYPES_HXX
 
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
 
 enum FieldId
 {
@@ -301,7 +300,7 @@ enum FieldId
     ,FIELD_CITATION
 };
 
-}}
+}
 #endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_FIELDTYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx
index a2f03fff3b03..e81876e4abdf 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -24,8 +24,7 @@
 #include "LoggedResources.hxx"
 #include <com/sun/star/io/XInputStream.hpp>
 
-namespace writerfilter {
-namespace dmapper
+namespace writerfilter::dmapper
 {
 
 struct FontTable_Impl;
@@ -96,7 +95,7 @@ private:
 };
 
 
-}}
+}
 
 #endif
 
diff --git a/writerfilter/source/dmapper/FormControlHelper.hxx b/writerfilter/source/dmapper/FormControlHelper.hxx
index dd7f7d38c3fa..da60c3fea21f 100644
--- a/writerfilter/source/dmapper/FormControlHelper.hxx
+++ b/writerfilter/source/dmapper/FormControlHelper.hxx
@@ -25,8 +25,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include "FieldTypes.hxx"
 
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
 
 class FormControlHelper : public virtual SvRefBase
 {
@@ -50,7 +49,7 @@ private:
 };
 
 }
-}
+
 
 #endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_FORMCONTROLHELPER_HXX
 
diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx
index d28f2fb50bf7..54d5520c3717 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.hxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.hxx
@@ -25,8 +25,7 @@
 
 #include <utility>
 
-namespace writerfilter {
-namespace dmapper
+namespace writerfilter::dmapper
 {
 
 class PositionHandler: public LoggedProperties
@@ -76,7 +75,7 @@ public:
     OUString NameGraphic(const OUString& rTemplate);
 };
 
-} }
+}
 
 #endif
 
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx
index a2495849bcb7..2f5f6ed970b8 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -50,9 +50,7 @@ namespace com::sun::star {
     }
 }
 
-namespace writerfilter
-{
-namespace dmapper
+namespace writerfilter::dmapper
 {
 class GraphicImport_Impl;
 class DomainMapper;
@@ -131,7 +129,7 @@ public:
 
 typedef tools::SvRef<GraphicImport> GraphicImportPtr;
 
-}}
+}
 
 #endif
 
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.hxx b/writerfilter/source/dmapper/LatentStyleHandler.hxx
index 00eb6005c567..db46e974f9f7 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.hxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.hxx
@@ -13,9 +13,7 @@
 #include <vector>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
-namespace writerfilter
-{
-namespace dmapper
+namespace writerfilter::dmapper
 {
 /// Handler for a latent style (w:lsdException element)
 class LatentStyleHandler : public LoggedProperties
@@ -33,8 +31,7 @@ public:
     const std::vector<css::beans::PropertyValue>& getAttributes() const;
 };
 
-} // namespace dmapper
-} // namespace writerfilter
+} // namespace writerfilter::dmapper
 
 #endif
 
diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx b/writerfilter/source/dmapper/MeasureHandler.hxx
index abf4beb8807b..b32b3840675a 100644
--- a/writerfilter/source/dmapper/MeasureHandler.hxx
+++ b/writerfilter/source/dmapper/MeasureHandler.hxx
@@ -23,8 +23,7 @@
 #include <vector>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
-namespace writerfilter {
-namespace dmapper
+namespace writerfilter::dmapper
 {
 /** Handler for sprms that contain a measure and a unit
     - Left indent of tables
@@ -58,7 +57,7 @@ public:
 };
 typedef tools::SvRef
     < MeasureHandler >  MeasureHandlerPtr;
-}}
+}
 
 #endif
 
diff --git a/writerfilter/source/dmapper/ModelEventListener.hxx b/writerfilter/source/dmapper/ModelEventListener.hxx
index 3a5dab834a11..acb69661d127 100644
--- a/writerfilter/source/dmapper/ModelEventListener.hxx
+++ b/writerfilter/source/dmapper/ModelEventListener.hxx
@@ -22,8 +22,7 @@
 #include <com/sun/star/document/XEventListener.hpp>
 #include <cppuhelper/implbase.hxx>
 
-namespace writerfilter {
-namespace dmapper{
+namespace writerfilter::dmapper{
 
 
 class ModelEventListener : public cppu::WeakImplHelper<css::document::XEventListener>
@@ -38,8 +37,7 @@ public:
     virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override;
 
 };
-}//namespace writerfilter
-}//namespace dmapper
+}//namespace writerfilter::dmapper
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index 29f139082522..86c8cfbfd9e1 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -31,8 +31,7 @@
 #include <com/sun/star/container/XIndexReplace.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>
 
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
 
 class DomainMapper;
 class StyleSheetEntry;
@@ -253,7 +252,7 @@ public:
     void DisposeNumPicBullets( );
 };
 
-} }
+}
 
 #endif
 
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx
index e173ab40b444..cbb92aa9a53b 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/writerfilter/source/dmapper/OLEHandler.hxx
@@ -39,8 +39,7 @@ namespace com::sun::star{
         class XComponentContext;
     }
 }
-namespace writerfilter {
-namespace dmapper
+namespace writerfilter::dmapper
 {
 class DomainMapper;
 /** Handler for OLE objects
@@ -95,7 +94,7 @@ public:
     const css::uno::Reference<css::graphic::XGraphic>& getReplacement() const { return m_xReplacement; }
 
 };
-}}
+}
 
 #endif
 
diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx
index 3bfe23ee6746..177ac4bd9847 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.hxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.hxx
@@ -28,8 +28,7 @@
 #include <vector>
 
 
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
 
 class PgBorder
 {
@@ -62,7 +61,7 @@ public:
     void SetBorders( SectionPropertyMap* pSectContext );
 };
 
-} }
+}
 
 #endif
 
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx
index e30aeb813e1c..c1c0e25698d6 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -21,8 +21,7 @@
 
 #include <rtl/ustring.hxx>
 
-namespace writerfilter {
-namespace dmapper{
+namespace writerfilter::dmapper{
 // Ensure that Character Properties are placed between PROP_CHARACTER_STYLES and PROP_CHARACTER_END
 enum PropertyIds
     {
@@ -367,8 +366,7 @@ bool isCharacterProperty(const PropertyIds eId);
 
 bool isParagraphProperty(const PropertyIds eId);
 
-} //namespace dmapper
-} // namespace writerfilter
+} // namespace writerfilter::dmapper
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 2408b3fc005e..0ac658f7674d 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -55,8 +55,7 @@ namespace com::sun::star {
     }
 }
 
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
 
 class  DomainMapper_Impl;
 struct FloatingTableInfo;
@@ -599,8 +598,7 @@ struct TableParagraph
 
 typedef std::shared_ptr< std::vector<TableParagraph> > TableParagraphVectorPtr;
 
-} // namespace dmapper
-} // namespace writerfilter
+} // namespace writerfilter::dmapper
 
 #endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_PROPERTYMAP_HXX
 
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.hxx b/writerfilter/source/dmapper/PropertyMapHelper.hxx
index 4b7bee2d7b1d..09df75385e71 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.hxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.hxx
@@ -22,9 +22,7 @@
 
 #include <com/sun/star/beans/PropertyValues.hpp>
 
-namespace writerfilter
-{
-namespace dmapper
+namespace writerfilter::dmapper
 {
 
 void lcl_DumpTableColumnSeparators(const css::uno::Any & rTableColumnSeparators);
@@ -34,7 +32,7 @@ void lcl_DumpPropertyValues(css::beans::PropertyValues const & rValues);
 void lcl_DumpPropertyValueSeq(css::uno::Sequence<css::beans::PropertyValues> const & rPropValSeq);
 #endif // DBG_UTIL
 }
-}
+
 
 #endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_PROPERTYMAPHELPER_HXX
 
diff --git a/writerfilter/source/dmapper/SdtHelper.hxx b/writerfilter/source/dmapper/SdtHelper.hxx
index 3cce8e3658af..e5decd927ad0 100644
--- a/writerfilter/source/dmapper/SdtHelper.hxx
+++ b/writerfilter/source/dmapper/SdtHelper.hxx
@@ -18,24 +18,13 @@
 #include <rtl/ustrbuf.hxx>
 #include <tools/ref.hxx>
 
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace awt
+namespace com::sun::star::awt
 {
 struct Size;
 class XControlModel;
 }
-}
-}
-}
 
-namespace writerfilter
-{
-namespace dmapper
+namespace writerfilter::dmapper
 {
 class DomainMapper_Impl;
 
@@ -120,8 +109,7 @@ public:
     sal_Int32 getInteropGrabBagSize() const;
 };
 
-} // namespace dmapper
-} // namespace writerfilter
+} // namespace writerfilter::dmapper
 
 #endif
 
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx b/writerfilter/source/dmapper/SectionColumnHandler.hxx
index e05d54b8075d..70c9d6d7209f 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.hxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.hxx
@@ -22,8 +22,7 @@
 #include "LoggedResources.hxx"
 #include <vector>
 
-namespace writerfilter {
-namespace dmapper
+namespace writerfilter::dmapper
 {
 struct Column_
 {
@@ -59,7 +58,7 @@ public:
 
 };
 
-}}
+}
 
 #endif
 
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx
index 888fe4ad342e..d91db71ab1f2 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
@@ -29,8 +29,7 @@ namespace com::sun::star::lang {
     struct Locale;
 }
 
-namespace writerfilter {
-namespace dmapper
+namespace writerfilter::dmapper
 {
 class DomainMapper;
 
@@ -102,7 +101,7 @@ class SettingsTable : public LoggedProperties, public LoggedTable
 
 };
 typedef tools::SvRef< SettingsTable >          SettingsTablePtr;
-}}
+}
 
 #endif
 
diff --git a/writerfilter/source/dmapper/SmartTagHandler.hxx b/writerfilter/source/dmapper/SmartTagHandler.hxx
index 29dbeeb3b833..ef3dd1243231 100644
--- a/writerfilter/source/dmapper/SmartTagHandler.hxx
+++ b/writerfilter/source/dmapper/SmartTagHandler.hxx
@@ -13,11 +13,7 @@
 
 #include "LoggedResources.hxx"
 
-namespace com
-{
-namespace sun
-{
-namespace star
+namespace com::sun::star
 {
 namespace rdf
 {
@@ -33,12 +29,8 @@ namespace uno
 class XComponentContext;
 }
 }
-}
-}
 
-namespace writerfilter
-{
-namespace dmapper
+namespace writerfilter::dmapper
 {
 /// Handler for smart tags, i.e. <w:smartTag> and below.
 class SmartTagHandler : public LoggedProperties
@@ -64,8 +56,7 @@ public:
     void handle(const css::uno::Reference<css::text::XTextRange>& xParagraph);
 };
 
-} // namespace dmapper
-} // namespace writerfilter
+} // namespace writerfilter::dmapper
 
 #endif
 
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index 9381b90eac52..f734cbb8822c 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -31,8 +31,7 @@
 namespace com::sun::star::text { class XTextDocument; }
 
 
-namespace writerfilter {
-namespace dmapper
+namespace writerfilter::dmapper
 {
 
 
@@ -144,7 +143,7 @@ private:
 };
 
 
-}}
+}
 
 #endif
 
diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx
index c7e74263f717..3c9ca8daf73f 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.hxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.hxx
@@ -30,8 +30,7 @@ namespace com::sun::star{
     }
 }
 
-namespace writerfilter {
-namespace dmapper
+namespace writerfilter::dmapper
 {
 class PropertyMap;
 class TablePropertyMap;
@@ -69,7 +68,7 @@ public:
     static OUString getBorderTypeString(sal_Int32 nType);
     static OUString getThemeColorTypeString(sal_Int32 nType);
 };
-}}
+}
 
 #endif
 
diff --git a/writerfilter/source/dmapper/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx
index e16c890783dd..9da80a620481 100644
--- a/writerfilter/source/dmapper/TableData.hxx
+++ b/writerfilter/source/dmapper/TableData.hxx
@@ -26,9 +26,7 @@
 
 #include <vector>
 
-namespace writerfilter
-{
-namespace dmapper
+namespace writerfilter::dmapper
 {
 
 /**
@@ -378,7 +376,7 @@ public:
 };
 
 }
-}
+
 
 #endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_RESOURCEMODEL_TABLEDATA_HXX
 
diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx
index 375cee7e30aa..ba1b225b0cd9 100644
--- a/writerfilter/source/dmapper/TableManager.hxx
+++ b/writerfilter/source/dmapper/TableManager.hxx
@@ -28,9 +28,7 @@
 
 #include <dmapper/resourcemodel.hxx>
 
-namespace writerfilter
-{
-namespace dmapper
+namespace writerfilter::dmapper
 {
 
 class DomainMapperTableHandler;
@@ -517,7 +515,7 @@ public:
 
 }
 
-}
+
 
 #endif // INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_TABLEMANAGER_HXX
 
diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/writerfilter/source/dmapper/TablePositionHandler.hxx
index bc6e7d8d8ebe..0a9a29d61f37 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.hxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.hxx
@@ -11,23 +11,12 @@
 
 #include "LoggedResources.hxx"
 
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace beans
+namespace com::sun::star::beans
 {
 struct PropertyValue;
 }
-}
-}
-}
 
-namespace writerfilter
-{
-namespace dmapper
+namespace writerfilter::dmapper
 {
 /// Handler for floating table positioning
 class TablePositionHandler : public LoggedProperties
@@ -75,8 +64,7 @@ public:
 };
 
 using TablePositionHandlerPtr = tools::SvRef<TablePositionHandler>;
-} // namespace dmapper
-} // namespace writerfilter
+} // namespace writerfilter::dmapper
 
 #endif
 
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.hxx b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
index d35ad7f114f0..1bd81798c24b 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.hxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
@@ -27,8 +27,7 @@
 
 #include <vector>
 
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
 
 class DomainMapper;
 
@@ -94,7 +93,7 @@ private:
     };
 };
 
-} }
+}
 
 #endif
 
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index 578b3a98a333..df493eb11187 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx
@@ -27,8 +27,7 @@
 #include <memory>
 #include <vector>
 
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
 
 class DomainMapper;
 
@@ -79,7 +78,7 @@ private:
     void resolveSprmProps(Sprm & rSprm);
 };
 
-}}
+}
 
 #endif
 
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx
index 60e98d64b970..dede6df2829a 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.hxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx
@@ -22,8 +22,7 @@
 #include <memory>
 #include <optional>
 
-namespace writerfilter {
-namespace dmapper
+namespace writerfilter::dmapper
 {
 
 /// Class to process all text effects like glow, textOutline, ...
@@ -69,7 +68,7 @@ public:
 
 };
 
-}}
+}
 
 #endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TEXTEFFECTSHANDLER_HXX
 
diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx
index c72c53c9a652..5bb03a64321b 100644
--- a/writerfilter/source/dmapper/ThemeTable.hxx
+++ b/writerfilter/source/dmapper/ThemeTable.hxx
@@ -25,8 +25,7 @@
 #include <i18nlangtag/lang.h>
 #include <memory>
 
-namespace writerfilter {
-namespace dmapper
+namespace writerfilter::dmapper
 {
 
 struct ThemeTable_Impl;
@@ -56,7 +55,7 @@ public:
     static OUString fromLCIDToScriptTag(LanguageType lang);
 };
 typedef tools::SvRef< ThemeTable >          ThemeTablePtr;
-}}
+}
 
 #endif
 
diff --git a/writerfilter/source/dmapper/TrackChangesHandler.hxx b/writerfilter/source/dmapper/TrackChangesHandler.hxx
index e57a1ac65a77..16276a2523a3 100644
--- a/writerfilter/source/dmapper/TrackChangesHandler.hxx
+++ b/writerfilter/source/dmapper/TrackChangesHandler.hxx
@@ -13,8 +13,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <dmapper/PropertyMap.hxx>
 
-namespace writerfilter {
-namespace dmapper
+namespace writerfilter::dmapper
 {
 /** Handler for sprms that contain 'track changes' attributes
     - Author
@@ -37,7 +36,7 @@ public:
     /// Compute the UNO properties for the track changes object based on the received tokens.
     css::uno::Sequence<css::beans::PropertyValue> getRedlineProperties() const;
 };
-}}
+}
 
 #endif
 
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index 6418496fd643..f537fde2338f 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -30,8 +30,7 @@ namespace com::sun::star::text
 struct GraphicCrop;
 }
 
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
 
 /// Handles <wp:wrapPolygon> from DOCX and the pWrapPolygonVertices shape property from RTF.
 class WrapPolygon final : public virtual SvRefBase
@@ -81,7 +80,7 @@ private:
 
 };
 
-}}
+}
 
 #endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_WRAPPOLYGONHANDLER_HXX
 
diff --git a/writerfilter/source/dmapper/util.hxx b/writerfilter/source/dmapper/util.hxx
index e7adfdadef82..13a032b5a254 100644
--- a/writerfilter/source/dmapper/util.hxx
+++ b/writerfilter/source/dmapper/util.hxx
@@ -24,14 +24,12 @@
 #include <string>
 #include <dmapper/resourcemodel.hxx>
 
-namespace writerfilter
-{
-namespace dmapper
+namespace writerfilter::dmapper
 {
     std::string XTextRangeToString(css::uno::Reference< css::text::XTextRange > const & textRange);
     void resolveSprmProps(Properties & rHandler, Sprm & rSprm);
 }
-}
+
 
 #endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_UTIL_HXX