xmlsecurity: tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants.

Change-Id: Ie8f972330f6bc88e205290dcbe666895b7bad43f
Reviewed-on: https://gerrit.libreoffice.org/18557Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

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>

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;

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,

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

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,

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,

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,

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,

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,

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,

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 >
 {

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 >
 {

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
 >

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,

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

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:

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:

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 >

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

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 >
 {

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 >
 {

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 >
 {

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 >
 {

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;

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;

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

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:

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 >

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

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 >
 {

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 >
 {

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 >
 {

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 >
 {

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
 {

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,

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,