forms/source/xforms/pathexpression.hxx | 9 +++------
forms/source/xforms/xformsevent.hxx | 7 ++-----
framework/source/inc/pattern/frame.hxx | 8 ++------
include/basic/vbahelper.hxx | 6 ++----
include/codemaker/unotype.hxx | 5 +----
include/sfx2/filedlghelper.hxx | 21 ++++-----------------
include/sfx2/frame.hxx | 15 +++------------
include/svl/cryptosign.hxx | 13 ++-----------
include/svl/sigstruct.hxx | 6 ++----
include/svtools/imageresourceaccess.hxx | 7 ++-----
include/toolkit/helper/property.hxx | 7 ++-----
include/unotools/textsearch.hxx | 11 +----------
include/unotools/ucbstreamhelper.hxx | 11 +----------
include/vbahelper/helperdecl.hxx | 6 ++----
include/vbahelper/vbaaccesshelper.hxx | 5 +----
include/vbahelper/vbahelper.hxx | 7 ++-----
include/vbahelper/vbareturntypes.hxx | 7 ++-----
registry/tools/fileurl.hxx | 7 ++-----
registry/tools/options.hxx | 7 ++-----
scaddins/source/analysis/bessel.hxx | 6 ++----
scaddins/source/pricing/pricing.hxx | 6 ++----
sfx2/inc/thumbnailviewitem.hxx | 1 -
sfx2/source/inc/appdata.hxx | 4 +---
sfx2/source/inc/partwnd.hxx | 14 +-------------
shell/source/backends/kf5be/kf5access.hxx | 11 +----------
starmath/source/smdetect.hxx | 14 +-------------
uui/source/secmacrowarnings.hxx | 8 ++------
xmloff/inc/fasttokenhandler.hxx | 6 ++----
xmloff/source/chart/ColorPropertySet.hxx | 7 ++-----
xmlsecurity/inc/documentsignaturehelper.hxx | 12 ++++--------
xmlsecurity/inc/documentsignaturemanager.hxx | 8 +-------
xmlsecurity/inc/pdfio/pdfdocument.hxx | 12 +++---------
xmlsecurity/inc/pdfsignaturehelper.hxx | 13 ++-----------
xmlsecurity/inc/xmlsignaturehelper.hxx | 16 +++++++---------
xmlsecurity/inc/xmlsignaturehelper2.hxx | 12 ++++--------
xmlsecurity/source/helper/ooxmlsecexporter.hxx | 13 ++-----------
36 files changed, 75 insertions(+), 253 deletions(-)
New commits:
commit da7489eb6aa9dfedb43f9be6e1b90e3ae06a75cc
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jul 10 15:19:30 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Jul 20 10:12:57 2020 +0200
compact namespace decl
used
git grep -lw namespace
| xargs perl -i -p0e 's/(\w+)\s*.\{.\s*namespace\s*(\w+)/\1::\2/smg;'
to do the initial replace, then compiled and fixed.
Change-Id: If69904d75940c851aeffab0e78c4ba02cc968d44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98526
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/forms/source/xforms/pathexpression.hxx
b/forms/source/xforms/pathexpression.hxx
index 7f01c673ce72..23a35a033d27 100644
--- a/forms/source/xforms/pathexpression.hxx
+++ b/forms/source/xforms/pathexpression.hxx
@@ -25,13 +25,10 @@
#include <vector>
// forward declaractions
-namespace com::sun::star
+namespace com::sun::star::xml::dom
{
- namespace xml::dom
- {
- class XNodeList;
- namespace events { class XEventListener; }
- }
+ class XNodeList;
+ namespace events { class XEventListener; }
}
diff --git a/forms/source/xforms/xformsevent.hxx
b/forms/source/xforms/xformsevent.hxx
index df4f5bcd20da..bfe7b2593026 100644
--- a/forms/source/xforms/xformsevent.hxx
+++ b/forms/source/xforms/xformsevent.hxx
@@ -25,10 +25,7 @@
#include <com/sun/star/xforms/XFormsEvent.hpp>
#include <com/sun/star/xml/dom/events/XEventTarget.hpp>
-namespace com {
-namespace sun {
-namespace star {
-namespace xforms {
+namespace com::sun::star::xforms {
class XFormsEventConcrete : public cppu::WeakImplHelper< XFormsEvent > {
@@ -67,7 +64,7 @@ class XFormsEventConcrete : public cppu::WeakImplHelper<
XFormsEvent > {
bool m_cancelable;
};
-} } } }
+}
#endif
diff --git a/framework/source/inc/pattern/frame.hxx
b/framework/source/inc/pattern/frame.hxx
index 9585af25665c..46b86f56f891 100644
--- a/framework/source/inc/pattern/frame.hxx
+++ b/framework/source/inc/pattern/frame.hxx
@@ -27,9 +27,7 @@
// namespaces
-namespace framework{
- namespace pattern{
- namespace frame{
+namespace framework::pattern::frame{
/** @short close (or dispose) the given resource.
@@ -77,9 +75,7 @@ inline bool closeIt(const css::uno::Reference<
css::uno::XInterface >& xResource
return true;
}
- } // namespace frame
- } // namespace pattern
-} // namespace framework
+} // namespace framework::pattern::frame
#endif // INCLUDED_FRAMEWORK_SOURCE_INC_PATTERN_FRAME_HXX
diff --git a/include/basic/vbahelper.hxx b/include/basic/vbahelper.hxx
index 10372abf392b..8d18b66b1d10 100644
--- a/include/basic/vbahelper.hxx
+++ b/include/basic/vbahelper.hxx
@@ -26,8 +26,7 @@
namespace com::sun::star::frame { class XModel; }
namespace com::sun::star::uno { template <typename > class Reference; }
-namespace basic {
-namespace vba {
+namespace basic::vba {
/* This header contains public helper functions for VBA used from this module
and from other VBA implementation modules such as vbahelper.
@@ -88,8 +87,7 @@ BASIC_DLLPUBLIC void registerCurrentDirectory(
const OUString& rPath );
-} // namespace vba
-} // namespace basic
+} // namespace basic::vba
#endif
diff --git a/include/codemaker/unotype.hxx b/include/codemaker/unotype.hxx
index 90e17f5197f9..606321873242 100644
--- a/include/codemaker/unotype.hxx
+++ b/include/codemaker/unotype.hxx
@@ -26,9 +26,7 @@
namespace rtl { class OString; }
-namespace codemaker {
-
-namespace UnoType {
+namespace codemaker::UnoType {
/**
An enumeration of all the sorts of relevant UNOIDL entities.
*/
@@ -82,7 +80,6 @@ namespace UnoType {
rtl::OString decompose(
rtl::OString const & type, sal_Int32 * rank = nullptr,
std::vector< rtl::OString > * arguments = nullptr);
-}
}
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index a0a436f12e9c..4700d9c8173d 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -33,25 +33,12 @@
#include <memory>
#include <vector>
-namespace com
+namespace com::sun::star::ui::dialogs
{
- namespace sun
- {
- namespace star
- {
- namespace ui
- {
- namespace dialogs
- {
- class XFilePicker3;
- struct FilePickerEvent;
- struct DialogClosedEvent;
- }
- }
- }
- }
+ class XFilePicker3;
+ struct FilePickerEvent;
+ struct DialogClosedEvent;
}
-
namespace com::sun::star::awt { class XWindow; }
namespace com::sun::star::uno { template <typename > class Reference; }
namespace weld { class Window; }
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 4eb2c6115e24..26af0c08f957 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -33,19 +33,10 @@
#include <vector>
-namespace com
+namespace com::sun::star::frame
{
- namespace sun
- {
- namespace star
- {
- namespace frame
- {
- class XFrame;
- class XController;
- }
- }
- }
+ class XFrame;
+ class XController;
}
class SvBorder;
diff --git a/include/svl/cryptosign.hxx b/include/svl/cryptosign.hxx
index 61905360a1b9..4171807be89c 100644
--- a/include/svl/cryptosign.hxx
+++ b/include/svl/cryptosign.hxx
@@ -18,19 +18,11 @@
#include <svl/svldllapi.h>
-namespace com {
-namespace sun {
-namespace star {
-namespace security {
- class XCertificate; }
-}}}
-
+namespace com::sun::star::security { class XCertificate; }
class SvStream;
struct SignatureInformation;
-namespace svl {
-
-namespace crypto {
+namespace svl::crypto {
/// Converts a hex-encoded string into a byte array.
SVL_DLLPUBLIC std::vector<unsigned char> DecodeHexString(const OString& rHex);
@@ -84,7 +76,6 @@ private:
OUString m_aSignPassword;
};
-}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/sigstruct.hxx b/include/svl/sigstruct.hxx
index 38c1ee5ed142..04cb45cbe18f 100644
--- a/include/svl/sigstruct.hxx
+++ b/include/svl/sigstruct.hxx
@@ -71,9 +71,7 @@ struct SignatureReferenceInformation
typedef ::std::vector< SignatureReferenceInformation >
SignatureReferenceInformations;
-namespace svl
-{
-namespace crypto
+namespace svl::crypto
{
/// Specifies the algorithm used for signature generation and validation.
enum class SignatureMethodAlgorithm
@@ -82,7 +80,7 @@ enum class SignatureMethodAlgorithm
ECDSA
};
}
-}
+
struct SignatureInformation
{
diff --git a/include/svtools/imageresourceaccess.hxx
b/include/svtools/imageresourceaccess.hxx
index 86dd259a24fb..566ca1ab8280 100644
--- a/include/svtools/imageresourceaccess.hxx
+++ b/include/svtools/imageresourceaccess.hxx
@@ -30,9 +30,7 @@ namespace com :: sun :: star :: uno { class
XComponentContext; }
class SvStream;
-namespace svt
-{
-namespace GraphicAccess
+namespace svt::GraphicAccess
{
/** Helpers for obtaining streams (which also can be used with the
ImageProducer)
@@ -62,8 +60,7 @@ UNLESS_MERGELIBS(SVT_DLLPUBLIC)
css::uno::Reference<css::io::XInputStream> getIm
css::uno::Reference<css::uno::XComponentContext> const & rxContext,
OUString const & rImageResourceURL);
-} // namespace GraphicAccess
-} // namespace svt
+} // namespace svt::GraphicAccess
#endif // INCLUDED_SVTOOLS_IMAGERESOURCEACCESS_HXX
diff --git a/include/toolkit/helper/property.hxx
b/include/toolkit/helper/property.hxx
index efc924a1ad2b..4a8fe2385317 100644
--- a/include/toolkit/helper/property.hxx
+++ b/include/toolkit/helper/property.hxx
@@ -25,13 +25,10 @@
#include <sal/types.h>
#include <rtl/ustring.hxx>
-namespace com {
-namespace sun {
-namespace star {
-namespace uno {
+namespace com::sun::star::uno {
class Type;
class Any;
-} } } }
+}
#define BASEPROPERTY_NOTFOUND 0
diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index 04a25a1a3c46..45db38b2981f 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -31,16 +31,7 @@ class CharClass;
namespace com::sun::star::lang { struct Locale; }
namespace com::sun::star::util { class XTextSearch2; }
-
-namespace com {
- namespace sun {
- namespace star {
- namespace util {
- struct SearchResult;
- }
- }
- }
-}
+namespace com::sun::star::util { struct SearchResult; }
namespace i18nutil {
struct SearchOptions;
struct SearchOptions2;
diff --git a/include/unotools/ucbstreamhelper.hxx
b/include/unotools/ucbstreamhelper.hxx
index fd7bd08cc5bf..69bae538b316 100644
--- a/include/unotools/ucbstreamhelper.hxx
+++ b/include/unotools/ucbstreamhelper.hxx
@@ -26,20 +26,11 @@
#include <tools/stream.hxx>
#include <memory>
-namespace com
-{
- namespace sun
- {
- namespace star
- {
- namespace io
+namespace com::sun::star::io
{
class XStream;
class XInputStream;
}
- }
- }
-}
namespace com::sun::star::awt { class XWindow; }
diff --git a/include/vbahelper/helperdecl.hxx b/include/vbahelper/helperdecl.hxx
index 7ee9f2793eb3..6ab78f1df0cf 100644
--- a/include/vbahelper/helperdecl.hxx
+++ b/include/vbahelper/helperdecl.hxx
@@ -22,8 +22,7 @@
#include <comphelper/servicedecl.hxx>
-namespace comphelper {
-namespace service_decl {
+namespace comphelper::service_decl {
template <typename ImplT_, typename WithArgsT = with_args<false> >
struct vba_service_class_ : public serviceimpl_base<
detail::OwnServiceImpl<ImplT_>, WithArgsT >
{
@@ -43,8 +42,7 @@ struct vba_service_class_ : public serviceimpl_base<
detail::OwnServiceImpl<Impl
explicit vba_service_class_( PostProcessFuncT const& postProcessFunc ) :
baseT( postProcessFunc ) {}
};
-} // namespace service_decl
-} // namespace comphelper
+} // namespace comphelper::service_decl
#endif
diff --git a/include/vbahelper/vbaaccesshelper.hxx
b/include/vbahelper/vbaaccesshelper.hxx
index ce55e01e22ff..e00b25b241e2 100644
--- a/include/vbahelper/vbaaccesshelper.hxx
+++ b/include/vbahelper/vbaaccesshelper.hxx
@@ -36,10 +36,8 @@
#include <sfx2/docfilt.hxx>
#include <sfx2/docfile.hxx>
-namespace ooo
+namespace ooo::vba
{
- namespace vba
- {
inline css::uno::Reference< css::lang::XMultiServiceFactory >
getVBAServiceFactory( SfxObjectShell const * pShell )
{
@@ -74,7 +72,6 @@ namespace ooo
// word seems to return an erroneous mime type :-/
"application/msword" not consistent with the excel one
inline bool isAlienWordDoc( SfxObjectShell const & rDocShell ) {
return isAlienDoc( rDocShell, "application/msword" ); }
- }
}
#endif
diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx
index 6f05013cbdfc..7333dd375e1e 100644
--- a/include/vbahelper/vbahelper.hxx
+++ b/include/vbahelper/vbahelper.hxx
@@ -51,9 +51,7 @@ class SfxObjectShell;
class SfxViewFrame;
class SfxViewShell;
-namespace ooo
-{
- namespace vba
+namespace ooo::vba
{
/// @throws css::lang::IllegalArgumentException
template < class T >
@@ -273,8 +271,7 @@ public:
static void runtimeexception( ErrCode err );
};
- } // vba
-} // ooo
+} // ooo::vba
namespace ov = ooo::vba;
diff --git a/include/vbahelper/vbareturntypes.hxx
b/include/vbahelper/vbareturntypes.hxx
index 7893a72cdbd8..96bb168abc01 100644
--- a/include/vbahelper/vbareturntypes.hxx
+++ b/include/vbahelper/vbareturntypes.hxx
@@ -27,9 +27,7 @@
#include <sal/types.h>
#include <vbahelper/vbahelper.hxx>
-namespace ooo
-{
- namespace vba
+namespace ooo::vba
{
template< typename T1, typename T2 >
class DefaultReturnHelper : public ::cppu::WeakImplHelper< T2,
css::script::XDefaultProperty >
@@ -49,8 +47,7 @@ namespace ooo
ReturnInteger( sal_Int32 nValue ) : ReturnInteger_BASE( nValue ){}
};
- } // vba
-} // ooo
+} // ooo::vba
#endif
diff --git a/registry/tools/fileurl.hxx b/registry/tools/fileurl.hxx
index 684ca8c3c460..b2a68502618c 100644
--- a/registry/tools/fileurl.hxx
+++ b/registry/tools/fileurl.hxx
@@ -22,15 +22,12 @@
#include <rtl/ustring.hxx>
-namespace registry
-{
-namespace tools
+namespace registry::tools
{
OUString convertToFileUrl(char const * filename, sal_Int32 length);
-} // namespace tools
-} // namespace registry
+} // namespace registry::tools
#endif /* INCLUDED_REGISTRY_TOOLS_FILEURL_HXX */
diff --git a/registry/tools/options.hxx b/registry/tools/options.hxx
index a0ae71b499d9..6813d21fc930 100644
--- a/registry/tools/options.hxx
+++ b/registry/tools/options.hxx
@@ -23,9 +23,7 @@
#include <string>
#include <vector>
-namespace registry
-{
-namespace tools
+namespace registry::tools
{
class Options
{
@@ -52,8 +50,7 @@ protected:
virtual void printUsage_Impl() const = 0;
};
-} // namespace tools
-} // namespace registry
+} // namespace registry::tools
#endif /* INCLUDED_REGISTRY_TOOLS_OPTIONS_HXX */
diff --git a/scaddins/source/analysis/bessel.hxx
b/scaddins/source/analysis/bessel.hxx
index 7aea95707829..58086ed258ed 100644
--- a/scaddins/source/analysis/bessel.hxx
+++ b/scaddins/source/analysis/bessel.hxx
@@ -22,8 +22,7 @@
#include <sal/types.h>
-namespace sca {
-namespace analysis {
+namespace sca::analysis {
// BESSEL functions
@@ -57,8 +56,7 @@ double BesselY( double x, sal_Int32 n );
*/
double BesselK( double x, sal_Int32 n );
-} // namespace analysis
-} // namespace sca
+} // namespace sca::analysis
#endif
diff --git a/scaddins/source/pricing/pricing.hxx
b/scaddins/source/pricing/pricing.hxx
index 8acbfd4a8307..ead7296762a4 100644
--- a/scaddins/source/pricing/pricing.hxx
+++ b/scaddins/source/pricing/pricing.hxx
@@ -42,8 +42,7 @@ namespace com::sun::star::lang { class XMultiServiceFactory; }
#define RETURN_FINITE(d) if( !std::isfinite( d ) ) throw
css::lang::IllegalArgumentException(); return d;
-namespace sca {
-namespace pricing {
+namespace sca::pricing {
enum class ScaCategory
{
@@ -112,8 +111,7 @@ struct FindScaFuncData
bool operator() ( ScaFuncData const & rCandidate ) const { return
rCandidate.Is(m_rId); }
};
-} // namespace pricing
-} // namespace sca
+} // namespace sca::pricing
css::uno::Reference< css::uno::XInterface > SAL_CALL
PricingFunctionAddIn_CreateInstance(
diff --git a/sfx2/inc/thumbnailviewitem.hxx b/sfx2/inc/thumbnailviewitem.hxx
index dea5e65c1774..e20a8c0b4f6d 100644
--- a/sfx2/inc/thumbnailviewitem.hxx
+++ b/sfx2/inc/thumbnailviewitem.hxx
@@ -42,7 +42,6 @@ namespace drawinglayer {
namespace processor2d {
class BaseProcessor2D;
}
-
namespace primitive2d {
class PolygonHairlinePrimitive2D;
}
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index b22c59a7dc7b..2e46ce22eb92 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -54,10 +54,8 @@ class SfxInterface;
class BasicManager;
class SfxBasicManagerHolder;
class SfxBasicManagerCreationListener;
+namespace sfx2::sidebar { class Theme; }
-namespace sfx2 {
- namespace sidebar { class Theme; }
-}
typedef std::vector<SfxDdeDocTopic_Impl*> SfxDdeDocTopics_Impl;
diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx
index c8bfad2d5f81..4896b476c685 100644
--- a/sfx2/source/inc/partwnd.hxx
+++ b/sfx2/source/inc/partwnd.hxx
@@ -23,19 +23,7 @@
#include <sfx2/dockwin.hxx>
-namespace com
-{
- namespace sun
- {
- namespace star
- {
- namespace frame
- {
- class XFrame;
- }
- }
- }
-}
+namespace com::sun::star::frame { class XFrame; }
// forward ---------------------------------------------------------------
diff --git a/shell/source/backends/kf5be/kf5access.hxx
b/shell/source/backends/kf5be/kf5access.hxx
index 34ee7c6d3d6b..77e55fad5dda 100644
--- a/shell/source/backends/kf5be/kf5access.hxx
+++ b/shell/source/backends/kf5be/kf5access.hxx
@@ -24,19 +24,10 @@
#include <com/sun/star/beans/Optional.hpp>
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace uno
+namespace com::sun::star::uno
{
class Any;
}
-}
-}
-}
namespace kf5access
{
diff --git a/starmath/source/smdetect.hxx b/starmath/source/smdetect.hxx
index 7869146f414b..d1eceaecf940 100644
--- a/starmath/source/smdetect.hxx
+++ b/starmath/source/smdetect.hxx
@@ -27,19 +27,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
-namespace com
-{
- namespace sun
- {
- namespace star
- {
- namespace beans
- {
- struct PropertyValue;
- }
- }
- }
-}
+namespace com::sun::star::beans { struct PropertyValue; }
class SmFilterDetect : public ::cppu::WeakImplHelper<
css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
{
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index 590ef0768069..536f70e09fc2 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -25,12 +25,8 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <vcl/weld.hxx>
-namespace com {
-namespace sun {
-namespace star {
-namespace security {
- class XCertificate; }
-}}}
+namespace com::sun::star::security { class XCertificate; }
+
class MacroWarning : public weld::MessageDialogController
{
diff --git a/xmloff/inc/fasttokenhandler.hxx b/xmloff/inc/fasttokenhandler.hxx
index 8e5a1cbb1c6e..076cd90b55f4 100644
--- a/xmloff/inc/fasttokenhandler.hxx
+++ b/xmloff/inc/fasttokenhandler.hxx
@@ -18,8 +18,7 @@
#include <sal/log.hxx>
#include <xmloff/dllapi.h>
-namespace xmloff {
-namespace token {
+namespace xmloff::token {
class TokenMap
{
@@ -89,8 +88,7 @@ private:
TokenMap& mrTokenMap;
};
-} // namespace token
-} // namespace xmloff
+} // namespace xmloff::token
#endif
diff --git a/xmloff/source/chart/ColorPropertySet.hxx
b/xmloff/source/chart/ColorPropertySet.hxx
index f10d9e10ef45..c3d3d560e914 100644
--- a/xmloff/source/chart/ColorPropertySet.hxx
+++ b/xmloff/source/chart/ColorPropertySet.hxx
@@ -25,9 +25,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
-namespace xmloff
-{
-namespace chart
+namespace xmloff::chart
{
class ColorPropertySet : public ::cppu::WeakImplHelper<
@@ -76,8 +74,7 @@ private:
Color m_nDefaultColor;
};
-} // namespace chart
-} // namespace xmloff
+} // namespace xmloff::chart
// XMLOFF_COLORPROPERTYSET_HXX
#endif
diff --git a/xmlsecurity/inc/documentsignaturehelper.hxx
b/xmlsecurity/inc/documentsignaturehelper.hxx
index ccf71edd9c62..d96275a36a48 100644
--- a/xmlsecurity/inc/documentsignaturehelper.hxx
+++ b/xmlsecurity/inc/documentsignaturehelper.hxx
@@ -26,14 +26,10 @@
#include <vector>
-namespace com {
-namespace sun {
-namespace star {
-namespace io {
- class XStream; }
-namespace embed {
- class XStorage; }
-}}}
+namespace com::sun::star {
+ namespace io { class XStream; }
+ namespace embed { class XStorage; }
+}
namespace com::sun::star::xml::sax { class XDocumentHandler; }
diff --git a/xmlsecurity/inc/documentsignaturemanager.hxx
b/xmlsecurity/inc/documentsignaturemanager.hxx
index e7149c3fe195..3854571e9ac3 100644
--- a/xmlsecurity/inc/documentsignaturemanager.hxx
+++ b/xmlsecurity/inc/documentsignaturemanager.hxx
@@ -30,11 +30,7 @@
#include <com/sun/star/xml/crypto/XSEInitializer.hpp>
-namespace com
-{
-namespace sun
-{
-namespace star
+namespace com::sun::star
{
namespace beans
{
@@ -57,8 +53,6 @@ namespace uno
class XComponentContext;
}
}
-}
-}
class PDFSignatureHelper;
/// Manages signatures (addition, removal), used by DigitalSignaturesDialog.
diff --git a/xmlsecurity/inc/pdfio/pdfdocument.hxx
b/xmlsecurity/inc/pdfio/pdfdocument.hxx
index 996bb1527bb8..e72a7edd2de7 100644
--- a/xmlsecurity/inc/pdfio/pdfdocument.hxx
+++ b/xmlsecurity/inc/pdfio/pdfdocument.hxx
@@ -13,19 +13,14 @@
#include <xmlsecuritydllapi.h>
-namespace vcl
-{
-namespace filter
+namespace vcl::filter
{
class PDFObjectElement;
}
-}
struct SignatureInformation;
class SvStream;
-namespace xmlsecurity
-{
-namespace pdfio
+namespace xmlsecurity::pdfio
{
/**
* @param rInformation The actual result.
@@ -36,8 +31,7 @@ XMLSECURITY_DLLPUBLIC bool ValidateSignature(SvStream&
rStream,
vcl::filter::PDFObjectElement*
pSignature,
SignatureInformation&
rInformation, bool bLast);
-} // namespace pdfio
-} // namespace xmlsecurity
+} // namespace xmlsecurity::pdfio
#endif // INCLUDED_XMLSECURITY_INC_PDFIO_PDFDOCUMENT_HXX
diff --git a/xmlsecurity/inc/pdfsignaturehelper.hxx
b/xmlsecurity/inc/pdfsignaturehelper.hxx
index f8f1e893beb2..25b0c42e6478 100644
--- a/xmlsecurity/inc/pdfsignaturehelper.hxx
+++ b/xmlsecurity/inc/pdfsignaturehelper.hxx
@@ -15,11 +15,7 @@
#include <svl/sigstruct.hxx>
-namespace com
-{
-namespace sun
-{
-namespace star
+namespace com::sun::star
{
namespace frame
{
@@ -37,16 +33,11 @@ namespace security
{
struct DocumentSignatureInformation;
}
-namespace xml
-{
-namespace crypto
+namespace xml::crypto
{
class XSecurityEnvironment;
}
}
-}
-}
-}
/// Handles signatures of a PDF file.
class XMLSECURITY_DLLPUBLIC PDFSignatureHelper
diff --git a/xmlsecurity/inc/xmlsignaturehelper.hxx
b/xmlsecurity/inc/xmlsignaturehelper.hxx
index 2437686ea31b..85dc769d8268 100644
--- a/xmlsecurity/inc/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsignaturehelper.hxx
@@ -31,15 +31,13 @@
class DateTime;
class UriBindingHelper;
-namespace com {
-namespace sun {
-namespace star {
-namespace io {
- class XOutputStream;
- class XInputStream; }
-namespace embed {
- class XStorage; }
-}}}
+namespace com::sun::star {
+ namespace io {
+ class XOutputStream;
+ class XInputStream;
+ }
+ namespace embed { class XStorage; }
+}
namespace com::sun::star::graphic { class XGraphic; }
namespace com::sun::star::uno { class XComponentContext; }
diff --git a/xmlsecurity/inc/xmlsignaturehelper2.hxx
b/xmlsecurity/inc/xmlsignaturehelper2.hxx
index 928ea19ed3fa..2b28fa0d410d 100644
--- a/xmlsecurity/inc/xmlsignaturehelper2.hxx
+++ b/xmlsecurity/inc/xmlsignaturehelper2.hxx
@@ -26,14 +26,10 @@
#include <com/sun/star/xml/crypto/XUriBinding.hpp>
-namespace com {
-namespace sun {
-namespace star {
-namespace io {
- class XInputStream; }
-namespace embed {
- class XStorage; }
-}}}
+namespace com::sun::star {
+ namespace io { class XInputStream; }
+ namespace embed { class XStorage; }
+}
// XUriBinding
diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.hxx
b/xmlsecurity/source/helper/ooxmlsecexporter.hxx
index 5d94da2fdb6c..5f432ae8fb5f 100644
--- a/xmlsecurity/source/helper/ooxmlsecexporter.hxx
+++ b/xmlsecurity/source/helper/ooxmlsecexporter.hxx
@@ -14,11 +14,7 @@
#include <svl/sigstruct.hxx>
-namespace com
-{
-namespace sun
-{
-namespace star
+namespace com::sun::star
{
namespace embed
{
@@ -28,16 +24,11 @@ namespace uno
{
class XComponentContext;
}
-namespace xml
-{
-namespace sax
+namespace xml::sax
{
class XDocumentHandler;
}
}
-}
-}
-}
/// Writes a single OOXML digital signature.
class OOXMLSecExporter
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
