[Libreoffice-commits] core.git: 2 commits - writerfilter/inc writerfilter/source writerperfect/inc writerperfect/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jul 20 06:43:10 UTC 2020
writerfilter/inc/dmapper/DomainMapperFactory.hxx | 7 +---
writerfilter/inc/dmapper/GraphicZOrderHelper.hxx | 7 +---
writerfilter/inc/ooxml/OOXMLDocument.hxx | 5 +--
writerfilter/inc/rtftok/RTFDocument.hxx | 7 +---
writerfilter/source/dmapper/BorderHandler.hxx | 5 +--
writerfilter/source/dmapper/CellColorHandler.hxx | 5 +--
writerfilter/source/dmapper/CellMarginHandler.hxx | 5 +--
writerfilter/source/dmapper/ConversionHelper.hxx | 8 +---
writerfilter/source/dmapper/DomainMapper.hxx | 6 +--
writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 5 +--
writerfilter/source/dmapper/DomainMapperTableManager.hxx | 5 +--
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 6 +--
writerfilter/source/dmapper/FFDataHandler.hxx | 5 +--
writerfilter/source/dmapper/FieldTypes.hxx | 5 +--
writerfilter/source/dmapper/FontTable.hxx | 5 +--
writerfilter/source/dmapper/FormControlHelper.hxx | 5 +--
writerfilter/source/dmapper/GraphicHelpers.hxx | 5 +--
writerfilter/source/dmapper/GraphicImport.hxx | 6 +--
writerfilter/source/dmapper/LatentStyleHandler.hxx | 7 +---
writerfilter/source/dmapper/MeasureHandler.hxx | 5 +--
writerfilter/source/dmapper/ModelEventListener.hxx | 6 +--
writerfilter/source/dmapper/NumberingManager.hxx | 5 +--
writerfilter/source/dmapper/OLEHandler.hxx | 5 +--
writerfilter/source/dmapper/PageBordersHandler.hxx | 5 +--
writerfilter/source/dmapper/PropertyIds.hxx | 6 +--
writerfilter/source/dmapper/PropertyMap.hxx | 6 +--
writerfilter/source/dmapper/PropertyMapHelper.hxx | 6 +--
writerfilter/source/dmapper/SdtHelper.hxx | 18 +----------
writerfilter/source/dmapper/SectionColumnHandler.hxx | 5 +--
writerfilter/source/dmapper/SettingsTable.hxx | 5 +--
writerfilter/source/dmapper/SmartTagHandler.hxx | 15 +--------
writerfilter/source/dmapper/StyleSheetTable.hxx | 5 +--
writerfilter/source/dmapper/TDefTableHandler.hxx | 5 +--
writerfilter/source/dmapper/TableData.hxx | 6 +--
writerfilter/source/dmapper/TableManager.hxx | 6 +--
writerfilter/source/dmapper/TablePositionHandler.hxx | 18 +----------
writerfilter/source/dmapper/TablePropertiesHandler.hxx | 5 +--
writerfilter/source/dmapper/TblStylePrHandler.hxx | 5 +--
writerfilter/source/dmapper/TextEffectsHandler.hxx | 5 +--
writerfilter/source/dmapper/ThemeTable.hxx | 5 +--
writerfilter/source/dmapper/TrackChangesHandler.hxx | 5 +--
writerfilter/source/dmapper/WrapPolygonHandler.hxx | 5 +--
writerfilter/source/dmapper/util.hxx | 6 +--
writerfilter/source/ooxml/Handler.hxx | 5 +--
writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx | 5 +--
writerfilter/source/ooxml/OOXMLDocumentImpl.hxx | 5 +--
writerfilter/source/ooxml/OOXMLFactory.hxx | 5 +--
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 5 +--
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx | 5 +--
writerfilter/source/ooxml/OOXMLFastHelper.hxx | 6 +--
writerfilter/source/ooxml/OOXMLParserState.hxx | 5 +--
writerfilter/source/ooxml/OOXMLPropertySet.hxx | 5 +--
writerfilter/source/ooxml/OOXMLStreamImpl.hxx | 5 +--
writerfilter/source/rtftok/rtfcharsets.hxx | 7 +---
writerfilter/source/rtftok/rtfcontrolwords.hxx | 7 +---
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 15 +--------
writerfilter/source/rtftok/rtffly.hxx | 7 +---
writerfilter/source/rtftok/rtflistener.hxx | 7 +---
writerfilter/source/rtftok/rtflookahead.hxx | 7 +---
writerfilter/source/rtftok/rtfreferenceproperties.hxx | 7 +---
writerfilter/source/rtftok/rtfreferencetable.hxx | 7 +---
writerfilter/source/rtftok/rtfsdrimport.hxx | 15 +--------
writerfilter/source/rtftok/rtfskipdestination.hxx | 7 +---
writerfilter/source/rtftok/rtfsprm.hxx | 7 +---
writerfilter/source/rtftok/rtftokenizer.hxx | 18 +----------
writerfilter/source/rtftok/rtfvalue.hxx | 15 +--------
writerperfect/inc/DirectoryStream.hxx | 11 ------
writerperfect/inc/DocumentHandler.hxx | 14 --------
writerperfect/inc/WPXSvInputStream.hxx | 11 ------
writerperfect/source/writer/EPUBExportFilter.hxx | 11 ------
writerperfect/source/writer/EPUBExportUIComponent.hxx | 11 ------
writerperfect/source/writer/EPUBPackage.hxx | 13 +------
writerperfect/source/writer/exp/XMLBase64ImportContext.hxx | 7 +---
writerperfect/source/writer/exp/XMLFootnoteImportContext.hxx | 7 +---
writerperfect/source/writer/exp/XMLSectionContext.hxx | 7 +---
writerperfect/source/writer/exp/XMLTextFrameContext.hxx | 7 +---
writerperfect/source/writer/exp/XMLTextListContext.hxx | 7 +---
writerperfect/source/writer/exp/XMLTextListItemContext.hxx | 7 +---
writerperfect/source/writer/exp/txtparai.hxx | 7 +---
writerperfect/source/writer/exp/txtstyli.hxx | 7 +---
writerperfect/source/writer/exp/xmlfmt.hxx | 7 +---
writerperfect/source/writer/exp/xmlictxt.hxx | 7 +---
writerperfect/source/writer/exp/xmlimp.hxx | 15 +--------
writerperfect/source/writer/exp/xmlmetai.hxx | 7 +---
writerperfect/source/writer/exp/xmltbli.hxx | 7 +---
writerperfect/source/writer/exp/xmltext.hxx | 7 +---
86 files changed, 175 insertions(+), 451 deletions(-)
New commits:
commit bc262b9a3dafdbaf8aa8e85b3c9110bafdc6cae9
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun Jul 19 21:10:56 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Jul 20 08:42:36 2020 +0200
compact namespace: writerfilter
Change-Id: I1dd3aff6c08fb2bce031abd6e88603a4ec9077fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99012
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/writerfilter/inc/dmapper/DomainMapperFactory.hxx b/writerfilter/inc/dmapper/DomainMapperFactory.hxx
index 624805cad320..90879c0b46a6 100644
--- a/writerfilter/inc/dmapper/DomainMapperFactory.hxx
+++ b/writerfilter/inc/dmapper/DomainMapperFactory.hxx
@@ -21,9 +21,7 @@ namespace utl
class MediaDescriptor;
}
-namespace writerfilter
-{
-namespace dmapper
+namespace writerfilter::dmapper
{
enum class SourceDocumentType
{
@@ -46,8 +44,7 @@ public:
SAL_DLLPUBLIC_EXPORT std::tuple<OUString, std::vector<OUString>, std::vector<OUString>>
splitFieldCommand(const OUString& rCommand);
-} // namespace dmapper
-} // namespace writerfilter
+} // namespace writerfilter::dmapper
#endif // INCLUDED_WRITERFILTER_INC_DMAPPER_DOMAINMAPPERFACTORY_HXX
diff --git a/writerfilter/inc/dmapper/GraphicZOrderHelper.hxx b/writerfilter/inc/dmapper/GraphicZOrderHelper.hxx
index c566eec171d9..1eadc33dcf87 100644
--- a/writerfilter/inc/dmapper/GraphicZOrderHelper.hxx
+++ b/writerfilter/inc/dmapper/GraphicZOrderHelper.hxx
@@ -12,9 +12,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <map>
-namespace writerfilter
-{
-namespace dmapper
+namespace writerfilter::dmapper
{
class GraphicZOrderHelper
{
@@ -28,8 +26,7 @@ private:
Items items;
};
-} // namespace dmapper
-} // namespace writerfilter
+} // namespace writerfilter::dmapper
#endif // INCLUDED_WRITERFILTER_INC_DMAPPER_GRAPHICZORDERHELPER_HXX
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index 82dd78c779b5..72aa04493d1b 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -66,8 +66,7 @@
core API to insert the according elements to the core.
*/
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
{
class OOXMLStream : public virtual SvRefBase
@@ -252,7 +251,7 @@ public:
std::string fastTokenToId(sal_uInt32 nToken);
-}}
+}
#endif // INCLUDED_WRITERFILTER_INC_OOXML_OOXMLDOCUMENT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/inc/rtftok/RTFDocument.hxx b/writerfilter/inc/rtftok/RTFDocument.hxx
index 55b1fbee3f4a..0e0cec27f198 100644
--- a/writerfilter/inc/rtftok/RTFDocument.hxx
+++ b/writerfilter/inc/rtftok/RTFDocument.hxx
@@ -17,9 +17,7 @@
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <unotools/mediadescriptor.hxx>
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
/// The RTFDocument opens and resolves the RTF document.
class RTFDocument : public writerfilter::Reference<Stream>
@@ -44,8 +42,7 @@ public:
css::uno::Reference<css::task::XStatusIndicator> const& xStatusIndicator,
const utl::MediaDescriptor& rMediaDescriptor);
};
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
#endif // INCLUDED_WRITERFILTER_INC_RTFTOK_RTFDOCUMENT_HXX
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
diff --git a/writerfilter/source/ooxml/Handler.hxx b/writerfilter/source/ooxml/Handler.hxx
index 47ae7d562a53..5e18db73a494 100644
--- a/writerfilter/source/ooxml/Handler.hxx
+++ b/writerfilter/source/ooxml/Handler.hxx
@@ -22,8 +22,7 @@
#include <dmapper/resourcemodel.hxx>
#include "OOXMLFastContextHandler.hxx"
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
{
class OOXMLFootnoteHandler : public Properties
{
@@ -157,7 +156,7 @@ public:
};
-}}
+}
#endif // INCLUDED_WRITERFILTER_SOURCE_OOXML_HANDLER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx
index 979998fec317..a6daaa836f82 100644
--- a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx
+++ b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx
@@ -23,8 +23,7 @@
#include <ooxml/OOXMLDocument.hxx>
#include <vector>
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
{
class OOXMLBinaryObjectReference :
public writerfilter::Reference<BinaryObj>
@@ -41,7 +40,7 @@ public:
virtual void resolve(BinaryObj & rHandler) override;
};
-}}
+}
#endif // INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLBINARYOBJECTREFERENCE_HXX
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
index b68d524f0c5e..efaefd5f7d2a 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
@@ -28,8 +28,7 @@
#include <vector>
#include <stack>
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
{
class OOXMLDocumentImpl : public OOXMLDocument
@@ -136,7 +135,7 @@ public:
OUString const& GetDocumentBaseURL() const { return m_rBaseURL; };
const css::uno::Sequence<css::beans::PropertyValue>& getMediaDescriptor() const;
};
-}}
+}
#endif // OOXML_DOCUMENT_IMPL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx b/writerfilter/source/ooxml/OOXMLFactory.hxx
index aa3c981c695d..bf92bd6e2a51 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.hxx
@@ -24,8 +24,7 @@
#include "OOXMLFastContextHandler.hxx"
-namespace writerfilter {
-namespace ooxml {
+namespace writerfilter::ooxml {
enum class ResourceType {
NoResource,
@@ -102,7 +101,7 @@ private:
};
}
-}
+
#endif // INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFACTORY_HXX
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index ca6e6507ecba..0d797226d101 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -30,8 +30,7 @@
#include "OOXMLParserState.hxx"
#include "OOXMLPropertySet.hxx"
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
{
class OOXMLDocumentImpl;
@@ -599,7 +598,7 @@ protected:
virtual void process() override;
};
-}}
+}
#endif // INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFASTCONTEXTHANDLER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
index b7839178f475..a6c3c58f3569 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
@@ -27,8 +27,7 @@
#include <ooxml/OOXMLDocumentImpl.hxx>
#include <rtl/ref.hxx>
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
{
class OOXMLFastContextHandler;
@@ -87,7 +86,7 @@ private:
mutable rtl::Reference<OOXMLFastContextHandler> mxContextHandler;
rtl::Reference<OOXMLFastContextHandler> const & getContextHandler() const;
};
-}}
+}
#endif // INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFASTDOCUMENTHANDLER_HXX
diff --git a/writerfilter/source/ooxml/OOXMLFastHelper.hxx b/writerfilter/source/ooxml/OOXMLFastHelper.hxx
index fcf162f44949..b68baee63b96 100644
--- a/writerfilter/source/ooxml/OOXMLFastHelper.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastHelper.hxx
@@ -21,9 +21,7 @@
#include "OOXMLFastContextHandler.hxx"
-namespace writerfilter {
-
-namespace ooxml
+namespace writerfilter::ooxml
{
template <class T>
@@ -59,7 +57,7 @@ void OOXMLFastHelper<T>::newProperty(OOXMLFastContextHandler * pHandler,
pHandler->newProperty(nId, pVal);
}
-}}
+}
#endif // INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFASTHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLParserState.hxx b/writerfilter/source/ooxml/OOXMLParserState.hxx
index 5e9811e2ac51..65009aba4a70 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.hxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.hxx
@@ -23,8 +23,7 @@
#include "OOXMLDocumentImpl.hxx"
#include "OOXMLPropertySet.hxx"
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
{
/**
@@ -117,7 +116,7 @@ public:
};
-}}
+}
#endif // INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLPARSERSTATE_HXX
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
index f31d46fce232..892bef78ceaa 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
@@ -24,8 +24,7 @@
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <dmapper/resourcemodel.hxx>
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
{
class OOXMLValue : public Value
@@ -395,7 +394,7 @@ public:
};
-}}
+}
#endif // INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLPROPERTYSET_HXX
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
index b7d5b4aaa7ed..383cec85c22a 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
@@ -27,8 +27,7 @@
extern OUString customTarget;
extern OUString embeddingsTarget;
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
{
class OOXMLStreamImpl : public OOXMLStream
@@ -80,7 +79,7 @@ public:
// Giving access to mxDocumentStream. It is needed by resolving custom xml to get list of customxml's used in document.
const css::uno::Reference<css::io::XStream>& accessDocumentStream() { return mxDocumentStream;}
};
-}}
+}
#endif // INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLSTREAMIMPL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfcharsets.hxx b/writerfilter/source/rtftok/rtfcharsets.hxx
index 42ddccce2a49..e83e2ef69633 100644
--- a/writerfilter/source/rtftok/rtfcharsets.hxx
+++ b/writerfilter/source/rtftok/rtfcharsets.hxx
@@ -10,9 +10,7 @@
#ifndef INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFCHARSETS_HXX
#define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFCHARSETS_HXX
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
/// RTF legacy charsets
struct RTFEncoding
@@ -22,8 +20,7 @@ struct RTFEncoding
};
extern RTFEncoding const aRTFEncodings[];
extern int nRTFEncodings;
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
#endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFCHARSETS_HXX
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.hxx b/writerfilter/source/rtftok/rtfcontrolwords.hxx
index 2b350e552b2b..92dc10e61dc1 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.hxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.hxx
@@ -10,9 +10,7 @@
#ifndef INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFCONTROLWORDS_HXX
#define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFCONTROLWORDS_HXX
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
/**
* An RTF destination state is the last open destination control word.
@@ -2048,8 +2046,7 @@ public:
extern RTFMathSymbol const aRTFMathControlWords[];
extern int nRTFMathControlWords;
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
#endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFCONTROLWORDS_HXX
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 64bd15d76a04..6d4a608e5eee 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -32,11 +32,7 @@ namespace oox
{
class GraphicHelper;
}
-namespace com
-{
-namespace sun
-{
-namespace star
+namespace com::sun::star
{
namespace beans
{
@@ -51,12 +47,8 @@ namespace lang
class XMultiServiceFactory;
}
}
-}
-}
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
class RTFParserState;
class RTFDocumentImpl;
@@ -980,8 +972,7 @@ private:
/// Are we after a \cell, but before a \row?
bool m_bAfterCellBeforeRow;
};
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
#endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFDOCUMENTIMPL_HXX
diff --git a/writerfilter/source/rtftok/rtffly.hxx b/writerfilter/source/rtftok/rtffly.hxx
index 9f94720d0a85..0960e17732e3 100644
--- a/writerfilter/source/rtftok/rtffly.hxx
+++ b/writerfilter/source/rtftok/rtffly.hxx
@@ -17,9 +17,7 @@
#include <ooxml/resourceids.hxx>
#include <osl/endian.h>
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
/// Stores the vertical orientation properties of an RTF fly frame.
class RTFVertOrient
@@ -136,8 +134,7 @@ public:
private:
sal_uInt16 m_nVal;
};
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
#endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFFLY_HXX
diff --git a/writerfilter/source/rtftok/rtflistener.hxx b/writerfilter/source/rtftok/rtflistener.hxx
index e35c0cccf1cb..44b95c2c4d23 100644
--- a/writerfilter/source/rtftok/rtflistener.hxx
+++ b/writerfilter/source/rtftok/rtflistener.hxx
@@ -12,9 +12,7 @@
#include "rtfcontrolwords.hxx"
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
enum class RTFInternalState
{
@@ -67,8 +65,7 @@ public:
virtual void finishSubstream() = 0;
virtual bool isSubstream() const = 0;
};
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
#endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFLISTENER_HXX
diff --git a/writerfilter/source/rtftok/rtflookahead.hxx b/writerfilter/source/rtftok/rtflookahead.hxx
index 52a4b3b14a5e..64d1176a0fd5 100644
--- a/writerfilter/source/rtftok/rtflookahead.hxx
+++ b/writerfilter/source/rtftok/rtflookahead.hxx
@@ -16,9 +16,7 @@
class SvStream;
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
class RTFTokenizer;
/**
@@ -55,8 +53,7 @@ private:
bool m_bHasTable;
bool m_bHasColumns;
};
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
#endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFLOOKAHEAD_HXX
diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.hxx b/writerfilter/source/rtftok/rtfreferenceproperties.hxx
index d5121b26ad2c..33a8514bcf00 100644
--- a/writerfilter/source/rtftok/rtfreferenceproperties.hxx
+++ b/writerfilter/source/rtftok/rtfreferenceproperties.hxx
@@ -12,9 +12,7 @@
#include "rtfsprm.hxx"
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
/// Sends RTFSprm instances to DomainMapper.
class RTFReferenceProperties : public writerfilter::Reference<Properties>
@@ -31,8 +29,7 @@ private:
RTFSprms m_aAttributes;
RTFSprms m_aSprms;
};
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
#endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFREFERENCEPROPERTIES_HXX
diff --git a/writerfilter/source/rtftok/rtfreferencetable.hxx b/writerfilter/source/rtftok/rtfreferencetable.hxx
index 8c9595493373..f5aebcc7f7b3 100644
--- a/writerfilter/source/rtftok/rtfreferencetable.hxx
+++ b/writerfilter/source/rtftok/rtfreferencetable.hxx
@@ -13,9 +13,7 @@
#include <map>
#include <dmapper/resourcemodel.hxx>
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
/// Sends tables (e.g. font table) to the domain mapper.
class RTFReferenceTable : public writerfilter::Reference<Table>
@@ -30,8 +28,7 @@ public:
private:
Entries_t m_aEntries;
};
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
#endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFREFERENCETABLE_HXX
diff --git a/writerfilter/source/rtftok/rtfsdrimport.hxx b/writerfilter/source/rtftok/rtfsdrimport.hxx
index 474966d28a37..f8d29b68701b 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.hxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.hxx
@@ -16,11 +16,7 @@
#include <dmapper/GraphicZOrderHelper.hxx>
#include <tools/ref.hxx>
-namespace com
-{
-namespace sun
-{
-namespace star
+namespace com::sun::star
{
namespace beans
{
@@ -37,12 +33,8 @@ namespace lang
class XComponent;
}
}
-}
-}
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
class RTFDocumentImpl;
class RTFShape;
@@ -107,8 +99,7 @@ private:
bool m_bFakePict;
std::stack<writerfilter::dmapper::GraphicZOrderHelper> m_aGraphicZOrderHelpers;
};
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
#endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFSDRIMPORT_HXX
diff --git a/writerfilter/source/rtftok/rtfskipdestination.hxx b/writerfilter/source/rtftok/rtfskipdestination.hxx
index 8f8c6aa9d5f2..e0188b6e069f 100644
--- a/writerfilter/source/rtftok/rtfskipdestination.hxx
+++ b/writerfilter/source/rtftok/rtfskipdestination.hxx
@@ -10,9 +10,7 @@
#ifndef INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFSKIPDESTINATION_HXX
#define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFSKIPDESTINATION_HXX
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
class RTFListener;
@@ -31,8 +29,7 @@ private:
/// If false, the destructor is a noop, required by the \* symbol itself.
bool m_bReset;
};
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
#endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFSKIPDESTINATION_HXX
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx b/writerfilter/source/rtftok/rtfsprm.hxx
index dd3e05cb8723..1b489fcd5864 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -18,9 +18,7 @@
#include <tools/ref.hxx>
#include "rtfvalue.hxx"
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
using RTFSprmsImplBase = std::vector<std::pair<Id, RTFValue::Pointer_t>>;
@@ -98,8 +96,7 @@ private:
Id m_nKeyword;
RTFValue::Pointer_t& m_pValue;
};
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
#endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFSPRM_HXX
diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx b/writerfilter/source/rtftok/rtftokenizer.hxx
index 5c1cd1949328..319c39d04679 100644
--- a/writerfilter/source/rtftok/rtftokenizer.hxx
+++ b/writerfilter/source/rtftok/rtftokenizer.hxx
@@ -20,24 +20,13 @@
#include <rtl/ustring.hxx>
#include <tools/ref.hxx>
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace task
+namespace com::sun::star::task
{
class XStatusIndicator;
}
-}
-}
-}
class SvStream;
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
/// RTF tokenizer that separates control words from text.
class RTFTokenizer final : public virtual SvRefBase
@@ -79,8 +68,7 @@ private:
std::size_t m_nLineStartPos;
std::size_t m_nGroupStart;
};
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
#endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFTOKENIZER_HXX
diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx
index b1c22b0b999f..736c7d0470d1 100644
--- a/writerfilter/source/rtftok/rtfvalue.hxx
+++ b/writerfilter/source/rtftok/rtfvalue.hxx
@@ -12,11 +12,7 @@
#include <dmapper/resourcemodel.hxx>
-namespace com
-{
-namespace sun
-{
-namespace star
+namespace com::sun::star
{
namespace embed
{
@@ -27,12 +23,8 @@ namespace io
class XInputStream;
}
}
-}
-}
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
class RTFSprms;
class RTFShape;
@@ -88,8 +80,7 @@ private:
tools::SvRef<RTFShape> m_pShape;
tools::SvRef<RTFPicture> m_pPicture;
};
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
#endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFVALUE_HXX
commit 39177e57834f4cb2fbceda72f4debe7a8d4ce4e7
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun Jul 19 21:11:09 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Jul 20 08:42:29 2020 +0200
compact namespace: writerperfect
Change-Id: I178bc76636d7fc3f4b11d836555a8ad53725b072
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99013
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/writerperfect/inc/DirectoryStream.hxx b/writerperfect/inc/DirectoryStream.hxx
index 3da07bc1580f..34075fe9fcdf 100644
--- a/writerperfect/inc/DirectoryStream.hxx
+++ b/writerperfect/inc/DirectoryStream.hxx
@@ -15,19 +15,10 @@
#include "writerperfectdllapi.h"
#include <memory>
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace ucb
+namespace com::sun::star::ucb
{
class XContent;
}
-}
-}
-}
namespace writerperfect
{
diff --git a/writerperfect/inc/DocumentHandler.hxx b/writerperfect/inc/DocumentHandler.hxx
index 6f8734008257..5fb769f9a134 100644
--- a/writerperfect/inc/DocumentHandler.hxx
+++ b/writerperfect/inc/DocumentHandler.hxx
@@ -26,22 +26,10 @@
#include "writerperfectdllapi.h"
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace xml
-{
-namespace sax
+namespace com::sun::star::xml::sax
{
class XDocumentHandler;
}
-}
-}
-}
-}
namespace writerperfect
{
diff --git a/writerperfect/inc/WPXSvInputStream.hxx b/writerperfect/inc/WPXSvInputStream.hxx
index 35908684825a..0ac33a60ec01 100644
--- a/writerperfect/inc/WPXSvInputStream.hxx
+++ b/writerperfect/inc/WPXSvInputStream.hxx
@@ -15,20 +15,11 @@
#include "writerperfectdllapi.h"
#include <memory>
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace io
+namespace com::sun::star::io
{
class XInputStream;
class XSeekable;
}
-}
-}
-}
namespace writerperfect
{
diff --git a/writerperfect/source/writer/EPUBExportFilter.hxx b/writerperfect/source/writer/EPUBExportFilter.hxx
index 1b9f830300fe..aef92930d8ac 100644
--- a/writerperfect/source/writer/EPUBExportFilter.hxx
+++ b/writerperfect/source/writer/EPUBExportFilter.hxx
@@ -18,19 +18,10 @@
#include <com/sun/star/document/XExporter.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace uno
+namespace com::sun::star::uno
{
class XComponentContext;
}
-}
-}
-}
namespace writerperfect
{
diff --git a/writerperfect/source/writer/EPUBExportUIComponent.hxx b/writerperfect/source/writer/EPUBExportUIComponent.hxx
index 8b5852fcc69b..115b3c79cc70 100644
--- a/writerperfect/source/writer/EPUBExportUIComponent.hxx
+++ b/writerperfect/source/writer/EPUBExportUIComponent.hxx
@@ -20,19 +20,10 @@
#include <comphelper/sequenceashashmap.hxx>
#include <cppuhelper/implbase.hxx>
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace uno
+namespace com::sun::star::uno
{
class XComponentContext;
}
-}
-}
-}
namespace writerperfect
{
diff --git a/writerperfect/source/writer/EPUBPackage.hxx b/writerperfect/source/writer/EPUBPackage.hxx
index 00cd129d8045..74c8863650e2 100644
--- a/writerperfect/source/writer/EPUBPackage.hxx
+++ b/writerperfect/source/writer/EPUBPackage.hxx
@@ -15,11 +15,7 @@
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/uno/Reference.h>
-namespace com
-{
-namespace sun
-{
-namespace star
+namespace com::sun::star
{
namespace beans
{
@@ -37,16 +33,11 @@ namespace uno
{
class XComponentContext;
}
-namespace xml
-{
-namespace sax
+namespace xml::sax
{
class XWriter;
}
}
-}
-}
-}
namespace writerperfect
{
diff --git a/writerperfect/source/writer/exp/XMLBase64ImportContext.hxx b/writerperfect/source/writer/exp/XMLBase64ImportContext.hxx
index 1fc1325fd2ce..5610dc4b0be4 100644
--- a/writerperfect/source/writer/exp/XMLBase64ImportContext.hxx
+++ b/writerperfect/source/writer/exp/XMLBase64ImportContext.hxx
@@ -16,9 +16,7 @@
#include "xmlictxt.hxx"
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
/// Handler for <office:binary-data>.
class XMLBase64ImportContext : public XMLImportContext
@@ -40,8 +38,7 @@ private:
OUString m_aBase64CharsLeft;
};
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
#endif
diff --git a/writerperfect/source/writer/exp/XMLFootnoteImportContext.hxx b/writerperfect/source/writer/exp/XMLFootnoteImportContext.hxx
index 22594f2ddd76..bb771dd3d082 100644
--- a/writerperfect/source/writer/exp/XMLFootnoteImportContext.hxx
+++ b/writerperfect/source/writer/exp/XMLFootnoteImportContext.hxx
@@ -16,9 +16,7 @@
#include "xmlictxt.hxx"
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
/// Handler for <text:note>.
class XMLFootnoteImportContext : public XMLImportContext
@@ -38,8 +36,7 @@ private:
librevenge::RVNGPropertyList m_aProperties;
};
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
#endif
diff --git a/writerperfect/source/writer/exp/XMLSectionContext.hxx b/writerperfect/source/writer/exp/XMLSectionContext.hxx
index 20c4047c0c2e..7b5922cdd68f 100644
--- a/writerperfect/source/writer/exp/XMLSectionContext.hxx
+++ b/writerperfect/source/writer/exp/XMLSectionContext.hxx
@@ -12,9 +12,7 @@
#include "xmlictxt.hxx"
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
/// Handler for <text:section>.
class XMLSectionContext : public XMLImportContext
@@ -31,8 +29,7 @@ public:
void SAL_CALL endElement(const OUString& rName) override;
};
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
#endif
diff --git a/writerperfect/source/writer/exp/XMLTextFrameContext.hxx b/writerperfect/source/writer/exp/XMLTextFrameContext.hxx
index fa8c52123afb..162445e5b2b8 100644
--- a/writerperfect/source/writer/exp/XMLTextFrameContext.hxx
+++ b/writerperfect/source/writer/exp/XMLTextFrameContext.hxx
@@ -14,9 +14,7 @@
#include "xmlictxt.hxx"
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
class XMLBase64ImportContext;
@@ -36,8 +34,7 @@ public:
void SAL_CALL endElement(const OUString& rName) override;
};
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
#endif
diff --git a/writerperfect/source/writer/exp/XMLTextListContext.hxx b/writerperfect/source/writer/exp/XMLTextListContext.hxx
index d5145465da77..5b895c196fb8 100644
--- a/writerperfect/source/writer/exp/XMLTextListContext.hxx
+++ b/writerperfect/source/writer/exp/XMLTextListContext.hxx
@@ -12,9 +12,7 @@
#include "xmlictxt.hxx"
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
/// Handler for <text:list>.
class XMLTextListContext : public XMLImportContext
@@ -27,8 +25,7 @@ public:
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
};
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
#endif
diff --git a/writerperfect/source/writer/exp/XMLTextListItemContext.hxx b/writerperfect/source/writer/exp/XMLTextListItemContext.hxx
index c66fac6a2104..9959e78ceb29 100644
--- a/writerperfect/source/writer/exp/XMLTextListItemContext.hxx
+++ b/writerperfect/source/writer/exp/XMLTextListItemContext.hxx
@@ -12,9 +12,7 @@
#include "xmlictxt.hxx"
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
/// Handler for <text:list-item>.
class XMLTextListItemContext : public XMLImportContext
@@ -27,8 +25,7 @@ public:
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
};
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
#endif
diff --git a/writerperfect/source/writer/exp/txtparai.hxx b/writerperfect/source/writer/exp/txtparai.hxx
index 561be4f0a115..f49553643332 100644
--- a/writerperfect/source/writer/exp/txtparai.hxx
+++ b/writerperfect/source/writer/exp/txtparai.hxx
@@ -16,9 +16,7 @@
#include "xmlictxt.hxx"
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
/// Handler for <text:p>/<text:h>.
class XMLParaContext : public XMLImportContext
@@ -57,8 +55,7 @@ void FillStyles(const OUString& rName,
std::map<OUString, librevenge::RVNGPropertyList>& rNamedStyles,
librevenge::RVNGPropertyList& rPropertyList);
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
#endif
diff --git a/writerperfect/source/writer/exp/txtstyli.hxx b/writerperfect/source/writer/exp/txtstyli.hxx
index c4ddc488899e..4aa2fc669b02 100644
--- a/writerperfect/source/writer/exp/txtstyli.hxx
+++ b/writerperfect/source/writer/exp/txtstyli.hxx
@@ -14,9 +14,7 @@
#include "xmlictxt.hxx"
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
class XMLStylesContext;
@@ -58,8 +56,7 @@ private:
XMLStylesContext& m_rStyles;
};
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
#endif
diff --git a/writerperfect/source/writer/exp/xmlfmt.hxx b/writerperfect/source/writer/exp/xmlfmt.hxx
index 6f3211de258f..71457d9bc579 100644
--- a/writerperfect/source/writer/exp/xmlfmt.hxx
+++ b/writerperfect/source/writer/exp/xmlfmt.hxx
@@ -19,9 +19,7 @@ namespace librevenge
class RVNGPropertyList;
}
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
/// Handler for <office:automatic-styles>/<office:styles>.
class XMLStylesContext : public XMLImportContext
@@ -71,8 +69,7 @@ public:
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
};
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
#endif
diff --git a/writerperfect/source/writer/exp/xmlictxt.hxx b/writerperfect/source/writer/exp/xmlictxt.hxx
index a0ea42bc63df..bb7f7598a826 100644
--- a/writerperfect/source/writer/exp/xmlictxt.hxx
+++ b/writerperfect/source/writer/exp/xmlictxt.hxx
@@ -15,9 +15,7 @@
#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
class XMLImport;
@@ -49,8 +47,7 @@ private:
XMLImport& mrImport;
};
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
#endif
diff --git a/writerperfect/source/writer/exp/xmlimp.hxx b/writerperfect/source/writer/exp/xmlimp.hxx
index 6994be4720ac..85cec8506819 100644
--- a/writerperfect/source/writer/exp/xmlimp.hxx
+++ b/writerperfect/source/writer/exp/xmlimp.hxx
@@ -24,11 +24,7 @@
#include "xmlictxt.hxx"
-namespace com
-{
-namespace sun
-{
-namespace star
+namespace com::sun::star
{
namespace beans
{
@@ -43,12 +39,8 @@ namespace uri
class XUriReferenceFactory;
}
}
-}
-}
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
class XMLImportContext;
@@ -153,8 +145,7 @@ public:
setDocumentLocator(const css::uno::Reference<css::xml::sax::XLocator>& xLocator) override;
};
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
#endif
diff --git a/writerperfect/source/writer/exp/xmlmetai.hxx b/writerperfect/source/writer/exp/xmlmetai.hxx
index 1f3e0d774794..7a48cf007089 100644
--- a/writerperfect/source/writer/exp/xmlmetai.hxx
+++ b/writerperfect/source/writer/exp/xmlmetai.hxx
@@ -14,9 +14,7 @@
#include "xmlictxt.hxx"
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
/// Handler for <office:meta>.
class XMLMetaDocumentContext : public XMLImportContext
@@ -81,8 +79,7 @@ private:
OUString m_aDate;
};
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
#endif
diff --git a/writerperfect/source/writer/exp/xmltbli.hxx b/writerperfect/source/writer/exp/xmltbli.hxx
index dff4dda2f988..e29c2b1edc65 100644
--- a/writerperfect/source/writer/exp/xmltbli.hxx
+++ b/writerperfect/source/writer/exp/xmltbli.hxx
@@ -14,9 +14,7 @@
#include "xmlictxt.hxx"
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
/// Handler for <table:table>.
class XMLTableContext : public XMLImportContext
@@ -42,8 +40,7 @@ private:
librevenge::RVNGPropertyListVector m_aColumns;
};
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
#endif
diff --git a/writerperfect/source/writer/exp/xmltext.hxx b/writerperfect/source/writer/exp/xmltext.hxx
index 756a7ddbcb64..2a7ef2654637 100644
--- a/writerperfect/source/writer/exp/xmltext.hxx
+++ b/writerperfect/source/writer/exp/xmltext.hxx
@@ -12,9 +12,7 @@
#include "xmlictxt.hxx"
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
/// Handler for <office:text>.
class XMLBodyContentContext : public XMLImportContext
@@ -32,8 +30,7 @@ public:
rtl::Reference<XMLImportContext> CreateTextChildContext(XMLImport& rImport, const OUString& rName,
bool bTopLevel = false);
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
#endif
More information about the Libreoffice-commits
mailing list