[Libreoffice-commits] core.git: Branch 'feature/cib_contract138c' - xmlsecurity/inc xmlsecurity/source
Vasily Melenchuk (via logerrit)
logerrit at kemper.freedesktop.org
Sat Apr 17 05:12:29 UTC 2021
Rebased ref, commits from common ancestor:
commit eaf2c981ef5878fdff838a5c9fba618a62f4fff9
Author: Vasily Melenchuk <vasily.melenchuk at cib.de>
AuthorDate: Fri Apr 16 22:49:37 2021 +0300
Commit: Vasily Melenchuk <vasily.melenchuk at cib.de>
CommitDate: Sat Apr 17 08:11:47 2021 +0300
xmlsecurity: downgrade to support gcc 4.8.2
pre stdcxx17 compilers do not support nested namespaces
Change-Id: I2c99ababa16de76549c976c79c6a8ab7927ad200
diff --git a/xmlsecurity/inc/certificatechooser.hxx b/xmlsecurity/inc/certificatechooser.hxx
index 7eec11407250..e0c9035ce902 100644
--- a/xmlsecurity/inc/certificatechooser.hxx
+++ b/xmlsecurity/inc/certificatechooser.hxx
@@ -41,7 +41,7 @@ namespace xml { namespace crypto {
class XSecurityEnvironment; }}
}}}
-namespace com::sun::star::xml::crypto { class XXMLSecurityContext; }
+namespace com { namespace sun { namespace star { namespace xml { namespace crypto { class XXMLSecurityContext; } } } } }
struct UserData
{
diff --git a/xmlsecurity/inc/documentsignaturehelper.hxx b/xmlsecurity/inc/documentsignaturehelper.hxx
index ccf71edd9c62..faf7b95601b3 100644
--- a/xmlsecurity/inc/documentsignaturehelper.hxx
+++ b/xmlsecurity/inc/documentsignaturehelper.hxx
@@ -35,7 +35,7 @@ namespace embed {
class XStorage; }
}}}
-namespace com::sun::star::xml::sax { class XDocumentHandler; }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XDocumentHandler; }}}}}
enum class DocumentSignatureMode
{
diff --git a/xmlsecurity/inc/framework/signatureverifierimpl.hxx b/xmlsecurity/inc/framework/signatureverifierimpl.hxx
index 7b022afd1f0c..b7ce73ae249c 100644
--- a/xmlsecurity/inc/framework/signatureverifierimpl.hxx
+++ b/xmlsecurity/inc/framework/signatureverifierimpl.hxx
@@ -28,8 +28,9 @@
#include <xmlsecuritydllapi.h>
#include <framework/signatureengine.hxx>
-namespace com::sun::star::xml::crypto::sax { class XSignatureVerifyResultListener; }
-namespace com::sun::star::xml::crypto { class XXMLSecurityContext; }
+namespace com { namespace sun { namespace star { namespace xml { namespace crypto { namespace sax { class XSignatureVerifyResultListener; } } } } }}
+namespace com { namespace sun { namespace star { namespace xml { namespace crypto { class XXMLSecurityContext; } } } } }
+
typedef cppu::ImplInheritanceHelper
<
diff --git a/xmlsecurity/inc/gpg/SEInitializer.hxx b/xmlsecurity/inc/gpg/SEInitializer.hxx
index db00a3a0a03a..1af17d1af765 100644
--- a/xmlsecurity/inc/gpg/SEInitializer.hxx
+++ b/xmlsecurity/inc/gpg/SEInitializer.hxx
@@ -18,7 +18,7 @@
#include <xsecgpgdllapi.h>
#include <cppuhelper/implbase.hxx>
-namespace com::sun::star::xml::crypto { class XXMLSecurityContext; }
+namespace com { namespace sun { namespace star { namespace xml { namespace crypto { class XXMLSecurityContext; } } } } }
class XSECGPG_DLLPUBLIC SEInitializerGpg : public cppu::WeakImplHelper
<
diff --git a/xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx b/xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx
index 0052c3ec7de7..361736964e01 100644
--- a/xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx
+++ b/xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx
@@ -31,10 +31,10 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/xml/crypto/XXMLSignature.hpp>
-namespace com::sun::star::xml::crypto { class XXMLSignatureTemplate; }
-namespace com::sun::star::xml::crypto { class XXMLSecurityContext; }
-namespace com::sun::star::lang { class XMultiServiceFactory; }
+namespace com { namespace sun { namespace star { namespace xml { namespace crypto { class XXMLSignatureTemplate; } } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace crypto { class XXMLSecurityContext; } } } } }
+namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
class XSECGPG_DLLPUBLIC XMLSignature_GpgImpl : public ::cppu::WeakImplHelper<
css::xml::crypto::XXMLSignature ,
diff --git a/xmlsecurity/inc/xmlsec/saxhelper.hxx b/xmlsecurity/inc/xmlsec/saxhelper.hxx
index e1eed377d6fa..d9a4a917bc00 100644
--- a/xmlsecurity/inc/xmlsec/saxhelper.hxx
+++ b/xmlsecurity/inc/xmlsec/saxhelper.hxx
@@ -24,8 +24,8 @@
#include <rtl/ustring.hxx>
-namespace com::sun::star::xml::csax { struct XMLAttribute; }
-namespace com::sun::star::uno { template <typename > class Sequence; }
+namespace com { namespace sun { namespace star { namespace xml { namespace csax { struct XMLAttribute; }}}}}
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; }}}}
/** This class represents a SAX handler which simply forwards to
the corresponding libxml API and translates parameter if necessary.
diff --git a/xmlsecurity/inc/xsecctl.hxx b/xmlsecurity/inc/xsecctl.hxx
index 4d00cc83c4a1..c10b9dd1e9a0 100644
--- a/xmlsecurity/inc/xsecctl.hxx
+++ b/xmlsecurity/inc/xsecctl.hxx
@@ -33,16 +33,28 @@
#include "xmlsignaturehelper2.hxx"
-namespace com::sun::star::embed { class XStorage; }
-namespace com::sun::star::graphic { class XGraphic; }
-namespace com::sun::star::io { class XInputStream; }
-namespace com::sun::star::lang { class XInitialization; }
-namespace com::sun::star::uno { class XComponentContext; }
-namespace com::sun::star::xml::crypto { class XXMLSecurityContext; }
-namespace com::sun::star::xml::crypto { class XXMLSignature; }
-namespace com::sun::star::xml::crypto:: sax { class XReferenceResolvedListener; }
-namespace com::sun::star::xml::sax { class XDocumentHandler; }
-
+namespace com {
+namespace sun {
+namespace star {
+namespace embed { class XStorage; }
+namespace graphic { class XGraphic; }
+namespace io { class XInputStream; }
+namespace lang { class XInitialization; }
+namespace uno { class XComponentContext; }
+namespace xml
+{
+namespace crypto {
+ class XXMLSecurityContext;
+ class XXMLSignature;
+}
+namespace sax {
+ class XReferenceResolvedListener;
+ class XDocumentHandler;
+}
+}
+}
+}
+}
#define NS_XMLDSIG "http://www.w3.org/2000/09/xmldsig#"
#define NS_DC "http://purl.org/dc/elements/1.1/"
#define NS_XD "http://uri.etsi.org/01903/v1.3.2#"
diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx
index 5c9318ce07a3..04a7f341cb85 100644
--- a/xmlsecurity/source/component/certificatecontainer.cxx
+++ b/xmlsecurity/source/component/certificatecontainer.cxx
@@ -28,7 +28,7 @@
#include <sal/config.h>
-namespace com::sun::star::uno { class XComponentContext; }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
diff --git a/xmlsecurity/source/framework/buffernode.hxx b/xmlsecurity/source/framework/buffernode.hxx
index 1b8e6f8574e9..9f3c16bee34d 100644
--- a/xmlsecurity/source/framework/buffernode.hxx
+++ b/xmlsecurity/source/framework/buffernode.hxx
@@ -25,7 +25,7 @@
#include <memory>
#include <vector>
-namespace com::sun::star::xml::wrapper { class XXMLElementWrapper; }
+namespace com { namespace sun { namespace star { namespace xml { namespace wraper { class XXMLElementWrapper; } } } } }
class ElementMark;
class ElementCollector;
diff --git a/xmlsecurity/source/framework/elementcollector.hxx b/xmlsecurity/source/framework/elementcollector.hxx
index 8af12f246b60..4a61fde78322 100644
--- a/xmlsecurity/source/framework/elementcollector.hxx
+++ b/xmlsecurity/source/framework/elementcollector.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/xml/crypto/sax/ElementMarkPriority.hpp>
#include <com/sun/star/uno/Reference.hxx>
-namespace com::sun::star::xml::crypto::sax { class XReferenceResolvedListener; }
+namespace com { namespace sun { namespace star { namespace xml { namespace crypto { namespace sax { class XReferenceResolvedListener; }}}}}}
class ElementCollector : public ElementMark
/****** elementcollector.hxx/CLASS ElementCollector ***************************
diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
index 95e17b646cb0..257abf218df0 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
@@ -25,7 +25,7 @@
#include <osl/diagnose.h>
#include <rtl/ref.hxx>
-namespace com::sun::star::xml::wrapper { class XXMLElementWrapper; }
+namespace com { namespace sun { namespace star { namespace xml { namespace wraper { class XXMLElementWrapper; } } } } }
using namespace com::sun::star::uno;
namespace cssu = com::sun::star::uno;
diff --git a/xmlsecurity/source/framework/signatureengine.cxx b/xmlsecurity/source/framework/signatureengine.cxx
index 3e74a7b25452..dd729c47345f 100644
--- a/xmlsecurity/source/framework/signatureengine.cxx
+++ b/xmlsecurity/source/framework/signatureengine.cxx
@@ -22,7 +22,7 @@
#include <framework/xmlsignaturetemplateimpl.hxx>
#include <rtl/ref.hxx>
-namespace com::sun::star::xml::wrapper { class XXMLElementWrapper; }
+namespace com { namespace sun { namespace star { namespace xml { namespace wraper { class XXMLElementWrapper; } } } } }
using namespace com::sun::star::uno;
namespace cssu = com::sun::star::uno;
diff --git a/xmlsecurity/source/gpg/SEInitializer.cxx b/xmlsecurity/source/gpg/SEInitializer.cxx
index f11ad59d8ba1..96ab97321b4e 100644
--- a/xmlsecurity/source/gpg/SEInitializer.cxx
+++ b/xmlsecurity/source/gpg/SEInitializer.cxx
@@ -14,7 +14,7 @@
#include <global.h>
-namespace com::sun::star::uno { class XComponentContext; }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
using namespace css;
using namespace css::lang;
diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.hxx b/xmlsecurity/source/gpg/SecurityEnvironment.hxx
index a8aacfa5a10b..79f68d9c5b57 100644
--- a/xmlsecurity/source/gpg/SecurityEnvironment.hxx
+++ b/xmlsecurity/source/gpg/SecurityEnvironment.hxx
@@ -18,7 +18,7 @@
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-namespace com::sun::star::security { class XCertificate; }
+namespace com { namespace sun { namespace star { namespace security { class XCertificate; }}}}
namespace GpgME { class Context; }
class SecurityEnvironmentGpg : public cppu::WeakImplHelper< css::xml::crypto::XSecurityEnvironment,
diff --git a/xmlsecurity/source/gpg/XMLEncryption.hxx b/xmlsecurity/source/gpg/XMLEncryption.hxx
index 168128b40a9c..b25b26640667 100644
--- a/xmlsecurity/source/gpg/XMLEncryption.hxx
+++ b/xmlsecurity/source/gpg/XMLEncryption.hxx
@@ -16,8 +16,8 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/xml/crypto/XXMLEncryption.hpp>
-namespace com::sun::star::xml::crypto { class XXMLEncryptionTemplate; }
-namespace com::sun::star::xml::crypto { class XXMLSecurityContext; }
+namespace com { namespace sun { namespace star { namespace xml { namespace crypto { class XXMLEncryptionTemplate; }}}}}
+namespace com { namespace sun { namespace star { namespace xml { namespace crypto { class XXMLSecurityContext; }}}}}
class XMLEncryptionGpg : public cppu::WeakImplHelper< css::xml::crypto::XXMLEncryption >
{
diff --git a/xmlsecurity/source/gpg/XMLSecurityContext.hxx b/xmlsecurity/source/gpg/XMLSecurityContext.hxx
index 3ca399f2be2d..ea383050b61b 100644
--- a/xmlsecurity/source/gpg/XMLSecurityContext.hxx
+++ b/xmlsecurity/source/gpg/XMLSecurityContext.hxx
@@ -20,7 +20,7 @@
#include <vector>
-namespace com::sun::star::xml::crypto { class XSecurityEnvironment; }
+namespace com { namespace sun { namespace star { namespace xml { namespace crypto { class XSecurityEnvironment; }}}}}
class XMLSecurityContextGpg : public cppu::WeakImplHelper< css::xml::crypto::XXMLSecurityContext,
css::lang::XServiceInfo>
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx
index fd33a320d9bd..39f9583894cd 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -28,7 +28,7 @@
#include <framework/signaturecreatorimpl.hxx>
#include <framework/saxeventkeeperimpl.hxx>
-namespace com::sun::star::graphic { class XGraphic; }
+namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; }}}}
using namespace css;
using namespace css::uno;
diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx
index d8dedeb52d8c..9d7a42dd58c4 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -42,7 +42,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/seqstream.hxx>
-namespace com::sun::star::graphic { class XGraphic; }
+namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; }}}}
using namespace css;
using namespace css::uno;
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
index 7e1b7ff50537..d1a69a40bd5f 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
@@ -25,7 +25,7 @@
#include <cppuhelper/implbase.hxx>
-namespace com::sun::star::uno { class XComponentContext; }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
#define NSS_SERVICE_NAME "com.sun.star.xml.crypto.NSSInitializer"
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
index ec6742529306..c53656ba7836 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
@@ -26,7 +26,7 @@
#include "nssinitializer.hxx"
-namespace com::sun::star::xml::crypto { class XXMLSecurityContext; }
+namespace com { namespace sun { namespace star { namespace xml { namespace crypto { class XXMLSecurityContext; } } } } }
class SEInitializer_NssImpl : public cppu::ImplInheritanceHelper
<
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
index 1ed575e92300..bf11783b0057 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
@@ -24,7 +24,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
-namespace com::sun::star::uno { class XComponentContext; }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; }}}}
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index 18c7c1e5c4ff..e50daa47e868 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/xml/crypto/XXMLSignature.hpp>
#include <memory>
-namespace com::sun::star::uno { class XComponentContext; }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; }}}}
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno ;
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
index 60b9714256b7..4d06bf687019 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
@@ -23,7 +23,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
-namespace com::sun::star::uno { class XComponentContext; }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; }}}}
using namespace com::sun::star;
More information about the Libreoffice-commits
mailing list