From 39177e57834f4cb2fbceda72f4debe7a8d4ce4e7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 19 Jul 2020 21:11:09 +0200 Subject: compact namespace: writerperfect Change-Id: I178bc76636d7fc3f4b11d836555a8ad53725b072 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99013 Tested-by: Jenkins Reviewed-by: Noel Grandin --- 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 ++----------- .../source/writer/exp/XMLBase64ImportContext.hxx | 7 ++----- .../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 ++----- .../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 ++----- 20 files changed, 36 insertions(+), 141 deletions(-) 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 -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 -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 #include -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 #include -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 #include -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 . 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 . 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 . 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 . class XMLTextListContext : public XMLImportContext @@ -27,8 +25,7 @@ public: const css::uno::Reference& 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 . class XMLTextListItemContext : public XMLImportContext @@ -27,8 +25,7 @@ public: const css::uno::Reference& 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 /. class XMLParaContext : public XMLImportContext @@ -57,8 +55,7 @@ void FillStyles(const OUString& rName, std::map& 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 /. class XMLStylesContext : public XMLImportContext @@ -71,8 +69,7 @@ public: const css::uno::Reference& 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 #include -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& 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 . 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 . 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 . class XMLBodyContentContext : public XMLImportContext @@ -32,8 +30,7 @@ public: rtl::Reference CreateTextChildContext(XMLImport& rImport, const OUString& rName, bool bTopLevel = false); -} // namespace exp -} // namespace writerperfect +} // namespace writerperfect::exp #endif -- cgit