xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx | 2 +-
xmlsecurity/source/component/certificatecontainer.hxx | 4
++--
xmlsecurity/source/framework/decryptorimpl.hxx | 4
++--
xmlsecurity/source/framework/encryptionengine.hxx | 4
++--
xmlsecurity/source/framework/encryptorimpl.hxx | 4
++--
xmlsecurity/source/framework/saxeventkeeperimpl.hxx | 4
++--
xmlsecurity/source/framework/securityengine.hxx | 4
++--
xmlsecurity/source/framework/signaturecreatorimpl.hxx | 4
++--
xmlsecurity/source/framework/signatureengine.hxx | 4
++--
xmlsecurity/source/framework/signatureverifierimpl.hxx | 4
++--
xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx | 4
++--
xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx | 4
++--
xmlsecurity/source/helper/xmlsignaturehelper2.hxx | 7
+++----
xmlsecurity/source/helper/xsecctl.hxx | 4
++--
xmlsecurity/source/helper/xsecparser.hxx | 4
++--
xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx | 4
++--
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx | 4
++--
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx | 4
++--
xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx | 4
++--
xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx | 4
++--
xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx | 4
++--
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx | 4
++--
xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx | 4
++--
xmlsecurity/source/xmlsec/nss/ciphercontext.hxx | 4
++--
xmlsecurity/source/xmlsec/nss/digestcontext.hxx | 4
++--
xmlsecurity/source/xmlsec/nss/nssinitializer.hxx | 4
++--
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx | 4
++--
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 4
++--
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx | 4
++--
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx | 4
++--
xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx | 4
++--
xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx | 4
++--
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx | 4
++--
xmlsecurity/source/xmlsec/serialnumberadapter.cxx | 4
++--
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx | 4
++--
xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx | 4
++--
36 files changed, 72 insertions(+), 73 deletions(-)
New commits:
commit 889d825879d1f044986c00a8038196bdb53e50dd
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Mon Sep 14 10:19:13 2015 +0900
xmlsecurity: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: Ie8f972330f6bc88e205290dcbe666895b7bad43f
Reviewed-on: https://gerrit.libreoffice.org/18557
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
Tested-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
index 21050ae..8cdecd5 100644
--- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
+++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/xml/crypto/CipherID.hpp>
#include <com/sun/star/xml/crypto/DigestID.hpp>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/weak.hxx>
diff --git a/xmlsecurity/source/component/certificatecontainer.hxx
b/xmlsecurity/source/component/certificatecontainer.hxx
index 3dcbaa1..d0907d7 100644
--- a/xmlsecurity/source/component/certificatecontainer.hxx
+++ b/xmlsecurity/source/component/certificatecontainer.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/security/XCertificateContainer.hpp>
#include <com/sun/star/security/CertificateContainerStatus.hpp>
@@ -32,7 +32,7 @@
#include <vector>
#include <map>
-class CertificateContainer : public ::cppu::WeakImplHelper2<
css::lang::XServiceInfo, css::security::XCertificateContainer >
+class CertificateContainer : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo, css::security::XCertificateContainer >
{
private:
typedef std::map< OUString, OUString > Map;
diff --git a/xmlsecurity/source/framework/decryptorimpl.hxx
b/xmlsecurity/source/framework/decryptorimpl.hxx
index 1474aef..8fc66b4 100644
--- a/xmlsecurity/source/framework/decryptorimpl.hxx
+++ b/xmlsecurity/source/framework/decryptorimpl.hxx
@@ -26,11 +26,11 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include "encryptionengine.hxx"
-typedef cppu::ImplInheritanceHelper3
+typedef cppu::ImplInheritanceHelper
<
EncryptionEngine,
com::sun::star::xml::crypto::sax::XDecryptionResultBroadcaster,
diff --git a/xmlsecurity/source/framework/encryptionengine.hxx
b/xmlsecurity/source/framework/encryptionengine.hxx
index e8cdda4..dc8e0b6 100644
--- a/xmlsecurity/source/framework/encryptionengine.hxx
+++ b/xmlsecurity/source/framework/encryptionengine.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/xml/crypto/sax/XSAXEventKeeper.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
#include <com/sun/star/xml/crypto/XXMLEncryption.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include "securityengine.hxx"
@@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star { namespace
uno {
class XComponentContext;
} } } }
-class EncryptionEngine : public cppu::ImplInheritanceHelper1
+class EncryptionEngine : public cppu::ImplInheritanceHelper
<
SecurityEngine,
com::sun::star::xml::crypto::sax::XBlockerMonitor
diff --git a/xmlsecurity/source/framework/encryptorimpl.hxx
b/xmlsecurity/source/framework/encryptorimpl.hxx
index 94b84c5..5c28b20 100644
--- a/xmlsecurity/source/framework/encryptorimpl.hxx
+++ b/xmlsecurity/source/framework/encryptorimpl.hxx
@@ -27,11 +27,11 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include "encryptionengine.hxx"
-typedef cppu::ImplInheritanceHelper4
+typedef cppu::ImplInheritanceHelper
<
EncryptionEngine,
com::sun::star::xml::crypto::sax::XEncryptionResultBroadcaster,
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
index a1d15e8..9dea041 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
#include "buffernode.hxx"
#include "elementmark.hxx"
@@ -38,7 +38,7 @@
#include <vector>
-class SAXEventKeeperImpl : public cppu::WeakImplHelper6
+class SAXEventKeeperImpl : public cppu::WeakImplHelper
<
com::sun::star::xml::crypto::sax::XSecuritySAXEventKeeper,
com::sun::star::xml::crypto::sax::XReferenceResolvedBroadcaster,
diff --git a/xmlsecurity/source/framework/securityengine.hxx
b/xmlsecurity/source/framework/securityengine.hxx
index 8f85910..7f7706c 100644
--- a/xmlsecurity/source/framework/securityengine.hxx
+++ b/xmlsecurity/source/framework/securityengine.hxx
@@ -27,9 +27,9 @@
#include <com/sun/star/xml/crypto/sax/XSAXEventKeeper.hpp>
#include <com/sun/star/xml/crypto/XXMLSignature.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
-class SecurityEngine : public cppu::WeakImplHelper3
+class SecurityEngine : public cppu::WeakImplHelper
<
com::sun::star::xml::crypto::sax::XReferenceResolvedListener,
com::sun::star::xml::crypto::sax::XKeyCollector,
diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.hxx
b/xmlsecurity/source/framework/signaturecreatorimpl.hxx
index 76653a1..f14f330 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.hxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.hxx
@@ -27,11 +27,11 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include "signatureengine.hxx"
-typedef cppu::ImplInheritanceHelper4
+typedef cppu::ImplInheritanceHelper
<
SignatureEngine,
com::sun::star::xml::crypto::sax::XBlockerMonitor,
diff --git a/xmlsecurity/source/framework/signatureengine.hxx
b/xmlsecurity/source/framework/signatureengine.hxx
index 23c7cde..d9625e7 100644
--- a/xmlsecurity/source/framework/signatureengine.hxx
+++ b/xmlsecurity/source/framework/signatureengine.hxx
@@ -32,13 +32,13 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include "securityengine.hxx"
#include <vector>
-class SignatureEngine : public cppu::ImplInheritanceHelper2
+class SignatureEngine : public cppu::ImplInheritanceHelper
<
SecurityEngine,
com::sun::star::xml::crypto::sax::XReferenceCollector,
diff --git a/xmlsecurity/source/framework/signatureverifierimpl.hxx
b/xmlsecurity/source/framework/signatureverifierimpl.hxx
index 950a9a4..89e36a3 100644
--- a/xmlsecurity/source/framework/signatureverifierimpl.hxx
+++ b/xmlsecurity/source/framework/signatureverifierimpl.hxx
@@ -27,11 +27,11 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include "signatureengine.hxx"
-typedef cppu::ImplInheritanceHelper3
+typedef cppu::ImplInheritanceHelper
<
SignatureEngine,
com::sun::star::xml::crypto::sax::XSignatureVerifyResultBroadcaster,
diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
index b76abca..1103fbb 100644
--- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
+++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -34,7 +34,7 @@
#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.hpp>
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
-class XMLEncryptionTemplateImpl : public ::cppu::WeakImplHelper2<
+class XMLEncryptionTemplateImpl : public ::cppu::WeakImplHelper<
::com::sun::star::xml::crypto::XXMLEncryptionTemplate ,
::com::sun::star::lang::XServiceInfo >
{
diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
index e6d395c..f34f3e6 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -35,7 +35,7 @@
#include <vector>
-class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper2<
+class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper<
::com::sun::star::xml::crypto::XXMLSignatureTemplate ,
::com::sun::star::lang::XServiceInfo >
{
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
index 6a705f4..844f34e 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
@@ -23,8 +23,7 @@
#include <tools/link.hxx>
#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.hpp>
@@ -41,7 +40,7 @@ namespace embed {
// MT: Not needed any more, remove later...
-class ImplXMLSignatureListener : public cppu::WeakImplHelper3
+class ImplXMLSignatureListener : public cppu::WeakImplHelper
<
com::sun::star::xml::crypto::sax::XSignatureCreationResultListener,
com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener,
@@ -99,7 +98,7 @@ public:
// XUriBinding
-class UriBindingHelper : public cppu::WeakImplHelper1
+class UriBindingHelper : public cppu::WeakImplHelper
<
com::sun::star::xml::crypto::XUriBinding
>
diff --git a/xmlsecurity/source/helper/xsecctl.hxx
b/xmlsecurity/source/helper/xsecctl.hxx
index d6aae02..f988212 100644
--- a/xmlsecurity/source/helper/xsecctl.hxx
+++ b/xmlsecurity/source/helper/xsecctl.hxx
@@ -43,7 +43,7 @@
#include <rtl/ustrbuf.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vector>
@@ -138,7 +138,7 @@ public:
}
};
-class XSecController : public cppu::WeakImplHelper4
+class XSecController : public cppu::WeakImplHelper
<
com::sun::star::xml::crypto::sax::XSecurityController,
//com::sun::star::beans::XFastPropertySet,
diff --git a/xmlsecurity/source/helper/xsecparser.hxx
b/xmlsecurity/source/helper/xsecparser.hxx
index 85a9260..0e22221 100644
--- a/xmlsecurity/source/helper/xsecparser.hxx
+++ b/xmlsecurity/source/helper/xsecparser.hxx
@@ -27,9 +27,9 @@
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
-class XSecParser: public cppu::WeakImplHelper2
+class XSecParser: public cppu::WeakImplHelper
<
com::sun::star::xml::sax::XDocumentHandler,
com::sun::star::lang::XInitialization
diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx
b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx
index 3e89ce5..17d3fa3 100644
--- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx
@@ -23,12 +23,12 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/SecurityException.hpp>
#include <com/sun/star/security/XCertificateExtension.hpp>
-class CertificateExtension_XmlSecImpl : public ::cppu::WeakImplHelper1<
+class CertificateExtension_XmlSecImpl : public ::cppu::WeakImplHelper<
::com::sun::star::security::XCertificateExtension >
{
private:
diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx
b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx
index 5abd5be..c88a68a 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx
@@ -31,14 +31,14 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/SecurityException.hpp>
#include <com/sun/star/security/XCertificateExtension.hpp>
#include <com/sun/star/security/XSanExtension.hpp>
#include <com/sun/star/security/CertAltNameEntry.hpp>
-class SanExtensionImpl : public ::cppu::WeakImplHelper1<
+class SanExtensionImpl : public ::cppu::WeakImplHelper<
::com::sun::star::security::XSanExtension >
{
private:
diff --git
a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
index 95d6671..e3b2c31 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
@@ -31,7 +31,7 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -50,7 +50,7 @@
#include <sal/types.h>
-class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper3<
+class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper<
::com::sun::star::xml::crypto::XSecurityEnvironment ,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XUnoTunnel >
diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
index 57a9af7..39d2ad7 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
@@ -26,11 +26,11 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <libxml/tree.h>
-class SEInitializer_MSCryptImpl : public cppu::WeakImplHelper2
+class SEInitializer_MSCryptImpl : public cppu::WeakImplHelper
<
com::sun::star::xml::crypto::XSEInitializer,
com::sun::star::lang::XServiceInfo
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
index d136b8b..674940b 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
@@ -31,13 +31,13 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/uno/SecurityException.hpp>
#include <com/sun/star/security/XCertificate.hpp>
-class X509Certificate_MSCryptImpl : public ::cppu::WeakImplHelper2<
+class X509Certificate_MSCryptImpl : public ::cppu::WeakImplHelper<
::com::sun::star::security::XCertificate ,
::com::sun::star::lang::XUnoTunnel >
{
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
index b36ead2..cbecf06 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -34,7 +34,7 @@
#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
-class XMLEncryption_MSCryptImpl : public ::cppu::WeakImplHelper2<
+class XMLEncryption_MSCryptImpl : public ::cppu::WeakImplHelper<
::com::sun::star::xml::crypto::XXMLEncryption ,
::com::sun::star::lang::XServiceInfo >
{
diff --git
a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
index 185787a..a51ca82 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -35,7 +35,7 @@
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
-class XMLSecurityContext_MSCryptImpl : public ::cppu::WeakImplHelper2<
+class XMLSecurityContext_MSCryptImpl : public ::cppu::WeakImplHelper<
::com::sun::star::xml::crypto::XXMLSecurityContext ,
::com::sun::star::lang::XServiceInfo >
{
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
index 13b2c16..4acbab9 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -34,7 +34,7 @@
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
-class XMLSignature_MSCryptImpl : public ::cppu::WeakImplHelper2<
+class XMLSignature_MSCryptImpl : public ::cppu::WeakImplHelper<
::com::sun::star::xml::crypto::XXMLSignature ,
::com::sun::star::lang::XServiceInfo >
{
diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx
b/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx
index 80fb67a..82572e7 100644
--- a/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx
+++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx
@@ -22,11 +22,11 @@
#include <com/sun/star/xml/crypto/XCipherContext.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
#include <pk11pub.h>
-class OCipherContext : public cppu::WeakImplHelper1<
::com::sun::star::xml::crypto::XCipherContext >
+class OCipherContext : public cppu::WeakImplHelper<
::com::sun::star::xml::crypto::XCipherContext >
{
private:
::osl::Mutex m_aMutex;
diff --git a/xmlsecurity/source/xmlsec/nss/digestcontext.hxx
b/xmlsecurity/source/xmlsec/nss/digestcontext.hxx
index e380f96..8f8454c 100644
--- a/xmlsecurity/source/xmlsec/nss/digestcontext.hxx
+++ b/xmlsecurity/source/xmlsec/nss/digestcontext.hxx
@@ -22,10 +22,10 @@
#include <com/sun/star/xml/crypto/XDigestContext.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
-class ODigestContext : public cppu::WeakImplHelper1<
::com::sun::star::xml::crypto::XDigestContext >
+class ODigestContext : public cppu::WeakImplHelper<
::com::sun::star::xml::crypto::XDigestContext >
{
private:
::osl::Mutex m_aMutex;
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
index 0e579fe..099d430 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
@@ -24,11 +24,11 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#define NSS_SERVICE_NAME "com.sun.star.xml.crypto.NSSInitializer"
-class ONSSInitializer : public cppu::WeakImplHelper2
+class ONSSInitializer : public cppu::WeakImplHelper
<
::com::sun::star::xml::crypto::XNSSInitializer,
::com::sun::star::lang::XServiceInfo
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
index 14a7d93..0097fcb 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
@@ -23,14 +23,14 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/SecurityException.hpp>
#include <com/sun/star/security/XCertificateExtension.hpp>
#include <com/sun/star/security/XSanExtension.hpp>
#include <com/sun/star/security/CertAltNameEntry.hpp>
-class SanExtensionImpl : public ::cppu::WeakImplHelper1<
+class SanExtensionImpl : public ::cppu::WeakImplHelper<
::com::sun::star::security::XSanExtension >
{
private:
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index cf48fb6..29bee41 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -45,7 +45,7 @@
#include "xmlsecurity/xmlsec-wrapper.h"
-class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper3<
+class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper<
::com::sun::star::xml::crypto::XSecurityEnvironment ,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XUnoTunnel >
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
index a811a31..8041c73 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
@@ -23,13 +23,13 @@
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
#include <com/sun/star/xml/crypto/XSEInitializer.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <libxml/tree.h>
#include "nssinitializer.hxx"
-class SEInitializer_NssImpl : public cppu::ImplInheritanceHelper1
+class SEInitializer_NssImpl : public cppu::ImplInheritanceHelper
<
ONSSInitializer,
::com::sun::star::xml::crypto::XSEInitializer
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
index bf40073..1782de3 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/uno/SecurityException.hpp>
@@ -31,7 +31,7 @@
#include "cert.h"
-class X509Certificate_NssImpl : public ::cppu::WeakImplHelper2<
+class X509Certificate_NssImpl : public ::cppu::WeakImplHelper<
::com::sun::star::security::XCertificate ,
::com::sun::star::lang::XUnoTunnel >
{
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
index 14b7aaf..3ad29ce 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -34,7 +34,7 @@
#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
-class XMLEncryption_NssImpl : public ::cppu::WeakImplHelper2<
+class XMLEncryption_NssImpl : public ::cppu::WeakImplHelper<
::com::sun::star::xml::crypto::XXMLEncryption ,
::com::sun::star::lang::XServiceInfo >
{
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
index 59a39b8..2b45376 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -36,7 +36,7 @@
#include <vector>
-class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper2<
+class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper<
::com::sun::star::xml::crypto::XXMLSecurityContext ,
::com::sun::star::lang::XServiceInfo >
{
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
index 908da34..4e2ac2a 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -34,7 +34,7 @@
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
-class XMLSignature_NssImpl : public ::cppu::WeakImplHelper2<
+class XMLSignature_NssImpl : public ::cppu::WeakImplHelper<
::com::sun::star::xml::crypto::XXMLSignature ,
::com::sun::star::lang::XServiceInfo >
{
diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
index 9ffddc0..92ba022 100644
--- a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
+++ b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
@@ -27,7 +27,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/uno/XInterface.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weak.hxx>
#include <rtl/ustring.hxx>
@@ -39,7 +39,7 @@
namespace {
class Service:
- public cppu::WeakImplHelper2<
+ public cppu::WeakImplHelper<
css::lang::XServiceInfo, css::security::XSerialNumberAdapter >,
private boost::noncopyable
{
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
index c083146..5208487 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/xml/csax/XCompressedDocumentHandler.hpp>
#include <com/sun/star/xml/crypto/sax/XSAXEventKeeper.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include "saxhelper.hxx"
@@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star { namespace
uno {
class XComponentContext;
} } } }
-class XMLDocumentWrapper_XmlSecImpl : public cppu::WeakImplHelper4
+class XMLDocumentWrapper_XmlSecImpl : public cppu::WeakImplHelper
<
com::sun::star::xml::wrapper::XXMLDocumentWrapper,
com::sun::star::xml::sax::XDocumentHandler,
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
index 4ecaf789..e406f00 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <libxml/tree.h>
@@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace
uno {
class XComponentContext;
} } } }
-class XMLElementWrapper_XmlSecImpl : public cppu::WeakImplHelper3
+class XMLElementWrapper_XmlSecImpl : public cppu::WeakImplHelper
<
com::sun::star::xml::wrapper::XXMLElementWrapper,
com::sun::star::lang::XUnoTunnel,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
