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

with the variadic variants.

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

package/inc/ZipPackage.hxx

@@ -19,7 +19,7 @@
 #ifndef INCLUDED_PACKAGE_INC_ZIPPACKAGE_HXX
 #define INCLUDED_PACKAGE_INC_ZIPPACKAGE_HXX
 
-#include <cppuhelper/implbase7.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
@@ -63,7 +63,7 @@ enum InitialisationMode
     e_IMode_XStream
 };
 
-class ZipPackage : public cppu::WeakImplHelper7
+class ZipPackage : public cppu::WeakImplHelper
                     <
                        com::sun::star::lang::XInitialization,
                        com::sun::star::lang::XSingleServiceFactory,

package/inc/ZipPackageBuffer.hxx

@@ -22,9 +22,9 @@
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
-class ZipPackageBuffer : public ::cppu::WeakImplHelper3
+class ZipPackageBuffer : public ::cppu::WeakImplHelper
 <
     com::sun::star::io::XInputStream,
     com::sun::star::io::XOutputStream,

package/inc/ZipPackageEntry.hxx

@@ -28,7 +28,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <ZipEntry.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <vector>
 
@@ -36,7 +36,7 @@ typedef void* rtlRandomPool;
 class ZipOutputStream;
 class ZipPackageFolder;
 
-class ZipPackageEntry : public cppu::WeakImplHelper5
+class ZipPackageEntry : public cppu::WeakImplHelper
 <
     com::sun::star::container::XNamed,
     com::sun::star::container::XChild,

package/inc/ZipPackageFolder.hxx

@@ -25,13 +25,13 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <HashMaps.hxx>
 #include <ZipPackageEntry.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <vector>
 
 class ZipOutputStream;
 struct ZipEntry;
 
-class ZipPackageFolder : public cppu::ImplInheritanceHelper2
+class ZipPackageFolder : public cppu::ImplInheritanceHelper
 <
     ZipPackageEntry,
     ::com::sun::star::container::XNameContainer,

package/inc/ZipPackageStream.hxx

@@ -26,7 +26,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <ZipPackageEntry.hxx>
 #include <rtl/ref.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <EncryptionData.hxx>
 #include <mutexholder.hxx>
@@ -39,7 +39,7 @@
 
 class ZipPackage;
 struct ZipEntry;
-class ZipPackageStream : public cppu::ImplInheritanceHelper2
+class ZipPackageStream : public cppu::ImplInheritanceHelper
 <
     ZipPackageEntry,
     ::com::sun::star::io::XActiveDataSink,

package/inc/pch/precompiled_package2.hxx

@@ -75,7 +75,7 @@
 #include <comphelper/storagehelper.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <cstring>

package/inc/zipfileaccess.hxx

@@ -29,14 +29,14 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 
 #include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <mutexholder.hxx>
 
 #include <ZipFile.hxx>
 #include <HashMaps.hxx>
 
-class OZipFileAccess : public ::cppu::WeakImplHelper4<
+class OZipFileAccess : public ::cppu::WeakImplHelper<
                         ::com::sun::star::packages::zip::XZipFileAccess2,
                         ::com::sun::star::lang::XInitialization,
                         ::com::sun::star::lang::XComponent,

package/source/manifest/ManifestImport.hxx

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_PACKAGE_SOURCE_MANIFEST_MANIFESTIMPORT_HXX
 #define INCLUDED_PACKAGE_SOURCE_MANIFEST_MANIFESTIMPORT_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <vector>
 
@@ -51,7 +51,7 @@ struct ManifestScopeEntry
 
 typedef ::std::vector< ManifestScopeEntry > ManifestStack;
 
-class ManifestImport : public cppu::WeakImplHelper1 < com::sun::star::xml::sax::XDocumentHandler >
+class ManifestImport : public cppu::WeakImplHelper < com::sun::star::xml::sax::XDocumentHandler >
 {
 protected:
     std::vector< com::sun::star::beans::PropertyValue > aSequence;

package/source/manifest/ManifestReader.hxx

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_PACKAGE_SOURCE_MANIFEST_MANIFESTREADER_HXX
 #define INCLUDED_PACKAGE_SOURCE_MANIFEST_MANIFESTREADER_HXX
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/packages/manifest/XManifestReader.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star {
     namespace uno { class XComponentContext; }
 } } }
 
-class ManifestReader: public ::cppu::WeakImplHelper2
+class ManifestReader: public ::cppu::WeakImplHelper
 <
     ::com::sun::star::packages::manifest::XManifestReader,
     ::com::sun::star::lang::XServiceInfo

package/source/manifest/ManifestWriter.hxx

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_PACKAGE_SOURCE_MANIFEST_MANIFESTWRITER_HXX
 #define INCLUDED_PACKAGE_SOURCE_MANIFEST_MANIFESTWRITER_HXX
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/packages/manifest/XManifestWriter.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star {
     namespace uno { class XComponentContext;  }
 } } }
 
-class ManifestWriter: public ::cppu::WeakImplHelper2
+class ManifestWriter: public ::cppu::WeakImplHelper
 <
     ::com::sun::star::packages::manifest::XManifestWriter,
     ::com::sun::star::lang::XServiceInfo

package/source/xstor/disposelistener.hxx

@@ -21,11 +21,11 @@
 #define INCLUDED_PACKAGE_SOURCE_XSTOR_DISPOSELISTENER_HXX
 
 #include <com/sun/star/lang/XEventListener.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
 
 class OStorage;
-class OChildDispListener_Impl : public ::cppu::WeakImplHelper1 < ::com::sun::star::lang::XEventListener >
+class OChildDispListener_Impl : public ::cppu::WeakImplHelper < ::com::sun::star::lang::XEventListener >
 {
     ::osl::Mutex m_aMutex;
     OStorage* m_pStorage;

package/source/xstor/ocompinstream.hxx

@@ -27,14 +27,14 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/embed/XExtendedStorageStream.hpp>
 #include <com/sun/star/embed/XRelationshipAccess.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.h>
 
 #include "mutexholder.hxx"
 
 struct OWriteStream_Impl;
 
-class OInputCompStream : public cppu::WeakImplHelper4 < ::com::sun::star::io::XInputStream
+class OInputCompStream : public cppu::WeakImplHelper < ::com::sun::star::io::XInputStream
                                                         ,::com::sun::star::embed::XExtendedStorageStream
                                                         ,::com::sun::star::embed::XRelationshipAccess
                                                         ,::com::sun::star::beans::XPropertySet >

package/source/xstor/ohierarchyholder.hxx

@@ -23,7 +23,7 @@
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/XTransactionListener.hpp>
 #include <com/sun/star/embed/XExtendedStorageStream.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <comphelper/sequenceashashmap.hxx>
 
@@ -52,7 +52,7 @@ typedef ::std::vector< OUString > OStringList_Impl;
 typedef ::std::list< ::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XExtendedStorageStream > >
                         OWeakStorRefList_Impl;
 
-struct OHierarchyElement_Impl : public cppu::WeakImplHelper1< ::com::sun::star::embed::XTransactionListener >
+struct OHierarchyElement_Impl : public cppu::WeakImplHelper< ::com::sun::star::embed::XTransactionListener >
 {
     ::osl::Mutex m_aMutex;
 

package/source/xstor/owriteablestream.hxx

@@ -40,7 +40,6 @@
 #include <com/sun/star/beans/StringPair.hpp>
 #include <com/sun/star/logging/XSimpleLogRing.hpp>
 
-#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/interfacecontainer.h>
 

package/source/xstor/selfterminatefilestream.hxx

@@ -23,11 +23,11 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
 #include <com/sun/star/ucb/XSimpleFileAccess3.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 struct OWriteStream_Impl;
 
-class OSelfTerminateFileStream : public cppu::WeakImplHelper2< ::com::sun::star::io::XInputStream,
+class OSelfTerminateFileStream : public cppu::WeakImplHelper< ::com::sun::star::io::XInputStream,
                                                                ::com::sun::star::io::XSeekable >
 {
 protected:

package/source/xstor/switchpersistencestream.hxx

@@ -32,7 +32,7 @@
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <com/sun/star/io/XAsyncOutputMonitor.hpp>
 #include <osl/mutex.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
 
 // SwitchablePersistenceStream
 
@@ -42,7 +42,7 @@
 
 struct SPStreamData_Impl;
 class SwitchablePersistenceStream
-        : public ::cppu::WeakImplHelper6 <
+        : public ::cppu::WeakImplHelper <
                                         ::com::sun::star::io::XStream,
                                         ::com::sun::star::io::XInputStream,
                                         ::com::sun::star::io::XOutputStream,

package/source/xstor/xfactory.hxx

@@ -23,9 +23,9 @@
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
-class OStorageFactory : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XSingleServiceFactory,
+class OStorageFactory : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XSingleServiceFactory,
                                                 ::com::sun::star::lang::XServiceInfo >
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;

package/source/zipapi/XUnbufferedStream.hxx

@@ -25,7 +25,7 @@
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/xml/crypto/XCipherContext.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 #include <package/Inflater.hxx>
 #include <ZipEntry.hxx>
@@ -41,7 +41,7 @@ namespace com { namespace sun { namespace star { namespace uno {
 #define UNBUFF_STREAM_WRAPPEDRAW    2
 
 class EncryptionData;
-class XUnbufferedStream : public cppu::WeakImplHelper1
+class XUnbufferedStream : public cppu::WeakImplHelper
 <
     com::sun::star::io::XInputStream
 >

package/source/zipapi/blowfishcontext.hxx

@@ -21,10 +21,10 @@
 
 #include <com/sun/star/xml/crypto/XCipherContext.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
 
-class BlowfishCFB8CipherContext : public cppu::WeakImplHelper1< ::com::sun::star::xml::crypto::XCipherContext >
+class BlowfishCFB8CipherContext : public cppu::WeakImplHelper< ::com::sun::star::xml::crypto::XCipherContext >
 {
     ::osl::Mutex m_aMutex;
     void* m_pCipher;

package/source/zipapi/sha1context.hxx

@@ -21,10 +21,10 @@
 
 #include <com/sun/star/xml/crypto/XDigestContext.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
 
-class SHA1DigestContext : public cppu::WeakImplHelper1< ::com::sun::star::xml::crypto::XDigestContext >
+class SHA1DigestContext : public cppu::WeakImplHelper< ::com::sun::star::xml::crypto::XDigestContext >
 {
     ::osl::Mutex m_aMutex;
     void* m_pDigest;

package/source/zippackage/ZipPackage.cxx

@@ -58,7 +58,7 @@
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/xml/crypto/DigestID.hpp>
 #include <com/sun/star/xml/crypto/CipherID.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <ContentInfo.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <rtl/uri.hxx>
@@ -104,7 +104,7 @@ using namespace com::sun::star::packages::zip::ZipConstants;
 #define THROW_WHERE ""
 #endif
 
-class ActiveDataStreamer : public ::cppu::WeakImplHelper1< XActiveDataStreamer >
+class ActiveDataStreamer : public ::cppu::WeakImplHelper< XActiveDataStreamer >
 {
     uno::Reference< XStream > mStream;
 public:
@@ -118,7 +118,7 @@ public:
             { mStream = stream; }
 };
 
-class DummyInputStream : public ::cppu::WeakImplHelper1< XInputStream >
+class DummyInputStream : public ::cppu::WeakImplHelper< XInputStream >
 {
     virtual sal_Int32 SAL_CALL readBytes( uno::Sequence< sal_Int8 >&, sal_Int32 )
             throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) SAL_OVERRIDE

package/source/zippackage/ZipPackageFolderEnumeration.hxx

@@ -19,12 +19,12 @@
 #ifndef INCLUDED_PACKAGE_SOURCE_ZIPPACKAGE_ZIPPACKAGEFOLDERENUMERATION_HXX
 #define INCLUDED_PACKAGE_SOURCE_ZIPPACKAGE_ZIPPACKAGEFOLDERENUMERATION_HXX
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <HashMaps.hxx>
 
-class ZipPackageFolderEnumeration : public cppu::WeakImplHelper2
+class ZipPackageFolderEnumeration : public cppu::WeakImplHelper
 <
     com::sun::star::container::XEnumeration,
     com::sun::star::lang::XServiceInfo

package/source/zippackage/ZipPackageSink.hxx

@@ -20,9 +20,9 @@
 #define INCLUDED_PACKAGE_SOURCE_ZIPPACKAGE_ZIPPACKAGESINK_HXX
 
 #include <com/sun/star/io/XActiveDataSink.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
-class ZipPackageSink : public ::cppu::WeakImplHelper1
+class ZipPackageSink : public ::cppu::WeakImplHelper
 <
     com::sun::star::io::XActiveDataSink
 >

package/source/zippackage/wrapstreamforshare.hxx

@@ -22,11 +22,11 @@
 
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <mutexholder.hxx>
 
-class WrapStreamForShare : public cppu::WeakImplHelper2 < ::com::sun::star::io::XInputStream
+class WrapStreamForShare : public cppu::WeakImplHelper < ::com::sun::star::io::XInputStream
                                                         , ::com::sun::star::io::XSeekable >
 {
 protected: