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/inc/closepreventer.hxx b/embeddedobj/source/inc/closepreventer.hxx
index 560acebd011e..892585e233d0 100644
--- a/embeddedobj/source/inc/closepreventer.hxx
+++ b/embeddedobj/source/inc/closepreventer.hxx
@@ -21,9 +21,9 @@
 #define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_CLOSEPREVENTER_HXX
 
 #include <com/sun/star/util/XCloseListener.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
-class OClosePreventer : public ::cppu::WeakImplHelper1 < ::com::sun::star::util::XCloseListener >
+class OClosePreventer : public ::cppu::WeakImplHelper < ::com::sun::star::util::XCloseListener >
 {
     virtual void SAL_CALL queryClosing( const ::com::sun::star::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index dcf196a3d4ed..7fe554989a33 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -35,13 +35,13 @@
 #include <com/sun/star/embed/XHatchWindowController.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
 
 class OCommonEmbeddedObject;
 class Interceptor;
 
 class DocumentHolder :
-    public ::cppu::WeakImplHelper6<
+    public ::cppu::WeakImplHelper<
                         ::com::sun::star::util::XCloseListener,
                           ::com::sun::star::frame::XTerminateListener,
                         ::com::sun::star::util::XModifyListener,
diff --git a/embeddedobj/source/inc/dummyobject.hxx b/embeddedobj/source/inc/dummyobject.hxx
index aeef1e09ec21..81e2c39523cb 100644
--- a/embeddedobj/source/inc/dummyobject.hxx
+++ b/embeddedobj/source/inc/dummyobject.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/XEmbedPersist.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace embed {
@@ -44,7 +44,7 @@ namespace cppu {
     class OMultiTypeInterfaceContainerHelper;
 }
 
-class ODummyEmbeddedObject : public ::cppu::WeakImplHelper2
+class ODummyEmbeddedObject : public ::cppu::WeakImplHelper
                         < ::com::sun::star::embed::XEmbeddedObject
                         , ::com::sun::star::embed::XEmbedPersist >
 {
diff --git a/embeddedobj/source/inc/intercept.hxx b/embeddedobj/source/inc/intercept.hxx
index 65782195dc92..c5d554c9c854 100644
--- a/embeddedobj/source/inc/intercept.hxx
+++ b/embeddedobj/source/inc/intercept.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_INTERCEPT_HXX
 
 #include <osl/mutex.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
 #include <com/sun/star/frame/XInterceptorInfo.hpp>
@@ -31,7 +31,7 @@
 class StatusChangeListenerContainer;
 class DocumentHolder;
 
-class Interceptor : public ::cppu::WeakImplHelper3< ::com::sun::star::frame::XDispatchProviderInterceptor,
+class Interceptor : public ::cppu::WeakImplHelper< ::com::sun::star::frame::XDispatchProviderInterceptor,
                                                        ::com::sun::star::frame::XInterceptorInfo,
                                                        ::com::sun::star::frame::XDispatch>
 {
diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx
index 06d883b83f5f..4b54ad336ee0 100644
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/embeddedobj/source/inc/oleembobj.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/util/XCloseListener.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <osl/thread.h>
 
@@ -103,7 +103,7 @@ public:
 
 class OleComponent;
 class OwnView_Impl;
-class OleEmbeddedObject : public ::cppu::WeakImplHelper5
+class OleEmbeddedObject : public ::cppu::WeakImplHelper
                         < ::com::sun::star::embed::XEmbeddedObject
                         , ::com::sun::star::embed::XEmbedPersist
                         , ::com::sun::star::embed::XLinkageSupport
diff --git a/embeddedobj/source/inc/xcreator.hxx b/embeddedobj/source/inc/xcreator.hxx
index 6d1552850efe..b01dfb503ff1 100644
--- a/embeddedobj/source/inc/xcreator.hxx
+++ b/embeddedobj/source/inc/xcreator.hxx
@@ -24,10 +24,10 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <osl/diagnose.h>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/mimeconfighelper.hxx>
 
-class UNOEmbeddedObjectCreator : public ::cppu::WeakImplHelper2<
+class UNOEmbeddedObjectCreator : public ::cppu::WeakImplHelper<
                                                 ::com::sun::star::embed::XEmbeddedObjectCreator,
                                                 ::com::sun::star::lang::XServiceInfo >
 {