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

with the variadic variants.

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

7 files changed, 12 insertions, 13 deletions

diff --git a/package/source/xstor/disposelistener.hxx b/package/source/xstor/disposelistener.hxx
index 31ce20b5f779..75d02ad2e027 100644
--- a/package/source/xstor/disposelistener.hxx
+++ b/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;
diff --git a/package/source/xstor/ocompinstream.hxx b/package/source/xstor/ocompinstream.hxx
index 6fb15ac550ac..20db4035f609 100644
--- a/package/source/xstor/ocompinstream.hxx
+++ b/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 >
diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx
index 680b30c4eb37..46846d24bb10 100644
--- a/package/source/xstor/ohierarchyholder.hxx
+++ b/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;
 
diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx
index 2438e260bc61..df1b442aa50e 100644
--- a/package/source/xstor/owriteablestream.hxx
+++ b/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>
 
diff --git a/package/source/xstor/selfterminatefilestream.hxx b/package/source/xstor/selfterminatefilestream.hxx
index 173432b7c9ce..1c303bcd2bd2 100644
--- a/package/source/xstor/selfterminatefilestream.hxx
+++ b/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:
diff --git a/package/source/xstor/switchpersistencestream.hxx b/package/source/xstor/switchpersistencestream.hxx
index 6fec12acd5a2..92685bd27175 100644
--- a/package/source/xstor/switchpersistencestream.hxx
+++ b/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,
diff --git a/package/source/xstor/xfactory.hxx b/package/source/xstor/xfactory.hxx
index 8ec725b3928f..59ec46e920eb 100644
--- a/package/source/xstor/xfactory.hxx
+++ b/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;