xmlsecurity/inc/certificatechooser.hxx | 2 -
xmlsecurity/inc/documentsignaturehelper.hxx | 2 -
xmlsecurity/inc/framework/signatureverifierimpl.hxx | 5 +--
xmlsecurity/inc/gpg/SEInitializer.hxx | 2 -
xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx | 6 +--
xmlsecurity/inc/xmlsec/saxhelper.hxx | 4 +-
xmlsecurity/inc/xsecctl.hxx | 32 +++++++++++++-------
7 files changed, 33 insertions(+), 20 deletions(-)
New commits:
commit 18ee6f65c437dd22c7097b585a40dfcfc55d029f
Author: Vasily Melenchuk <vasily.melenc...@cib.de>
AuthorDate: Fri Apr 16 22:49:37 2021 +0300
Commit: Vasily Melenchuk <vasily.melenc...@cib.de>
CommitDate: Fri Apr 16 22:49:37 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#";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
