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 <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

10 files changed, 20 insertions, 20 deletions

diff --git a/xmlsecurity/source/framework/decryptorimpl.hxx b/xmlsecurity/source/framework/decryptorimpl.hxx
index 1474aef4511f..8fc66b4d5086 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 e8cdda4b7303..dc8e0b6a381a 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 94b84c5b2c32..5c28b20efefc 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 a1d15e87f967..9dea0418e807 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 8f859104eb76..7f7706c4bb4a 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 76653a111e29..f14f330bdc45 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 23c7cdedf3c4..d9625e73e014 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 950a9a499e83..89e36a308c7e 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 b76abcab09ae..1103fbb2259e 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 e6d395c247bb..f34f3e657178 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 >
 {