tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants in embeddedobj.

Change-Id: I60aad1267b664825f781c085fb33612bce3f7221
Reviewed-on: https://gerrit.libreoffice.org/17474
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

6 files changed, 12 insertions, 12 deletions

diff --git a/embeddedobj/source/msole/mtnotification.hxx b/embeddedobj/source/msole/mtnotification.hxx
index 9b45e5fcd07c..faae7af6f18a 100644
--- a/embeddedobj/source/msole/mtnotification.hxx
+++ b/embeddedobj/source/msole/mtnotification.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/awt/XCallback.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <rtl/ref.hxx>
 
@@ -32,7 +32,7 @@ class OleEmbeddedObject;
 #define OLECOMP_ONVIEWCHANGE    1
 #define OLECOMP_ONCLOSE         2
 
-class MainThreadNotificationRequest :  public cppu::WeakImplHelper1< com::sun::star::awt::XCallback >
+class MainThreadNotificationRequest :  public cppu::WeakImplHelper< com::sun::star::awt::XCallback >
 {
     OleEmbeddedObject* m_pObject;
     ::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XEmbeddedObject > m_xObject;
diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx
index a152f63d9cb0..e34499895ee0 100644
--- a/embeddedobj/source/msole/olecomponent.hxx
+++ b/embeddedobj/source/msole/olecomponent.hxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
 
@@ -52,7 +52,7 @@ class OleWrapperAdviseSink;
 class OleEmbeddedObject;
 struct OleComponentNative_Impl;
 
-class OleComponent : public ::cppu::WeakImplHelper5< ::com::sun::star::util::XCloseable, ::com::sun::star::lang::XComponent,
+class OleComponent : public ::cppu::WeakImplHelper< ::com::sun::star::util::XCloseable, ::com::sun::star::lang::XComponent,
                                                      ::com::sun::star::lang::XUnoTunnel, ::com::sun::star::util::XModifiable,
                                                      ::com::sun::star::datatransfer::XTransferable >
 {
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 758e0811e0b5..cc0378cd2f32 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/document/XEventListener.hpp>
 #include <com/sun/star/document/XTypeDetection.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/mimeconfighelper.hxx>
@@ -49,7 +49,7 @@
 using namespace ::com::sun::star;
 using namespace ::comphelper;
 
-class DummyHandler_Impl : public ::cppu::WeakImplHelper1< task::XInteractionHandler >
+class DummyHandler_Impl : public ::cppu::WeakImplHelper< task::XInteractionHandler >
 {
 public:
     DummyHandler_Impl() {}
diff --git a/embeddedobj/source/msole/ownview.hxx b/embeddedobj/source/msole/ownview.hxx
index 19db69b02dc8..304fcafc4d52 100644
--- a/embeddedobj/source/msole/ownview.hxx
+++ b/embeddedobj/source/msole/ownview.hxx
@@ -26,11 +26,11 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <osl/mutex.hxx>
 
-class OwnView_Impl : public ::cppu::WeakImplHelper2 < ::com::sun::star::util::XCloseListener,
+class OwnView_Impl : public ::cppu::WeakImplHelper < ::com::sun::star::util::XCloseListener,
                                                       ::com::sun::star::document::XEventListener >
 {
     ::osl::Mutex m_aMutex;
diff --git a/embeddedobj/source/msole/xdialogcreator.hxx b/embeddedobj/source/msole/xdialogcreator.hxx
index 7f184d393c88..991920d06397 100644
--- a/embeddedobj/source/msole/xdialogcreator.hxx
+++ b/embeddedobj/source/msole/xdialogcreator.hxx
@@ -24,10 +24,10 @@
 #include <com/sun/star/embed/XEmbedObjectClipboardCreator.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
-class MSOLEDialogObjectCreator : public ::cppu::WeakImplHelper3<
+class MSOLEDialogObjectCreator : public ::cppu::WeakImplHelper<
                                                 ::com::sun::star::embed::XInsertObjectDialog,
                                                 ::com::sun::star::embed::XEmbedObjectClipboardCreator,
                                                 ::com::sun::star::lang::XServiceInfo >
diff --git a/embeddedobj/source/msole/xolefactory.hxx b/embeddedobj/source/msole/xolefactory.hxx
index 6ea005e8a777..bb3e30b72e1c 100644
--- a/embeddedobj/source/msole/xolefactory.hxx
+++ b/embeddedobj/source/msole/xolefactory.hxx
@@ -24,11 +24,11 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/diagnose.h>
 
 
-class OleEmbeddedObjectFactory : public ::cppu::WeakImplHelper2<
+class OleEmbeddedObjectFactory : public ::cppu::WeakImplHelper<
                                                 ::com::sun::star::embed::XEmbeddedObjectCreator,
                                                 ::com::sun::star::lang::XServiceInfo >
 {