tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants in dtrans.

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

8 files changed, 13 insertions, 14 deletions

diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx
index ffac848ead53..6d29d6f3959d 100644
--- a/dtrans/source/win32/dnd/source.cxx
+++ b/dtrans/source/win32/dnd/source.cxx
@@ -56,7 +56,7 @@ extern Reference< XTransferable > g_XTransferable;
 unsigned __stdcall DndOleSTAFunc(LPVOID pParams);
 
 DragSource::DragSource( const Reference<XComponentContext>& rxContext):
-    WeakComponentImplHelper3< XDragSource, XInitialization, XServiceInfo >(m_mutex),
+    WeakComponentImplHelper< XDragSource, XInitialization, XServiceInfo >(m_mutex),
     m_xContext( rxContext ),
 //  m_pcurrentContext_impl(0),
     m_hAppWindow(0),
diff --git a/dtrans/source/win32/dnd/source.hxx b/dtrans/source/win32/dnd/source.hxx
index 1cbf840b5ecd..02fa41d77e73 100644
--- a/dtrans/source/win32/dnd/source.hxx
+++ b/dtrans/source/win32/dnd/source.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <osl/mutex.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include "../../inc/DtObjFactory.hxx"
 #include "globals.hxx"
@@ -44,7 +44,7 @@ class SourceContext;
 // ALT modifier is considered to effect a user selection of effects
 class DragSource:
       public MutexDummy,
-      public WeakComponentImplHelper3<XDragSource, XInitialization, XServiceInfo>,
+      public WeakComponentImplHelper<XDragSource, XInitialization, XServiceInfo>,
       public IDropSource
 
 {
diff --git a/dtrans/source/win32/dnd/sourcecontext.cxx b/dtrans/source/win32/dnd/sourcecontext.cxx
index bbc3557a12a6..cee6c98bb4c2 100644
--- a/dtrans/source/win32/dnd/sourcecontext.cxx
+++ b/dtrans/source/win32/dnd/sourcecontext.cxx
@@ -26,7 +26,7 @@ using namespace com::sun::star::datatransfer::dnd::DNDConstants;
 
 SourceContext::SourceContext( DragSource* pSource,
                              const Reference<XDragSourceListener>& listener):
-        WeakComponentImplHelper1<XDragSourceContext>(m_mutex),
+        WeakComponentImplHelper<XDragSourceContext>(m_mutex),
         m_pDragSource( pSource),
         m_dragSource( static_cast<XDragSource*>( m_pDragSource) )
 {
diff --git a/dtrans/source/win32/dnd/sourcecontext.hxx b/dtrans/source/win32/dnd/sourcecontext.hxx
index 3682ea2a9840..937c5d9ea1bf 100644
--- a/dtrans/source/win32/dnd/sourcecontext.hxx
+++ b/dtrans/source/win32/dnd/sourcecontext.hxx
@@ -19,9 +19,8 @@
 #ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_SOURCECONTEXT_HXX
 #define INCLUDED_DTRANS_SOURCE_WIN32_DND_SOURCECONTEXT_HXX
 
-#include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 
 #include "source.hxx"
 
@@ -38,7 +37,7 @@ using namespace ::com::sun::star::lang;
 // An instance of SourceContext only lives as long as the drag and drop
 // operation lasts.
 class SourceContext: public MutexDummy,
-                     public WeakComponentImplHelper1<XDragSourceContext>
+                     public WeakComponentImplHelper<XDragSourceContext>
 {
     DragSource* m_pDragSource;
     Reference<XDragSource> m_dragSource;
diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx
index b80f6ce2c89b..cd051ba1101c 100644
--- a/dtrans/source/win32/dnd/target.cxx
+++ b/dtrans/source/win32/dnd/target.cxx
@@ -42,7 +42,7 @@ extern Reference< XTransferable > g_XTransferable;
 DWORD WINAPI DndTargetOleSTAFunc(LPVOID pParams);
 
 DropTarget::DropTarget( const Reference<XComponentContext>& rxContext):
-    WeakComponentImplHelper3<XInitialization,XDropTarget, XServiceInfo>(m_mutex),
+    WeakComponentImplHelper<XInitialization,XDropTarget, XServiceInfo>(m_mutex),
     m_hWnd( NULL),
     m_threadIdWindow(0),
     m_threadIdTarget(0),
diff --git a/dtrans/source/win32/dnd/target.hxx b/dtrans/source/win32/dnd/target.hxx
index 708f21a7e6d3..5011dfa74242 100644
--- a/dtrans/source/win32/dnd/target.hxx
+++ b/dtrans/source/win32/dnd/target.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <osl/mutex.hxx>
 
@@ -53,7 +53,7 @@ using namespace ::com::sun::star::datatransfer::dnd;
 // it is destroyed. Therefore no second instance may exist which was
 // created in the same thread and still needs OLE.
 class DropTarget: public MutexDummy,
-                  public WeakComponentImplHelper3< XInitialization, XDropTarget, XServiceInfo>
+                  public WeakComponentImplHelper< XInitialization, XDropTarget, XServiceInfo>
 
 {
 private:
diff --git a/dtrans/source/win32/dnd/targetdragcontext.hxx b/dtrans/source/win32/dnd/targetdragcontext.hxx
index 8e0ad473e33e..a271d61abbe5 100644
--- a/dtrans/source/win32/dnd/targetdragcontext.hxx
+++ b/dtrans/source/win32/dnd/targetdragcontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGETDRAGCONTEXT_HXX
 #define INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGETDRAGCONTEXT_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
 #include <com/sun/star/datatransfer/DataFlavor.hpp>
 
@@ -31,7 +31,7 @@ using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 
-class TargetDragContext: public WeakImplHelper1<XDropTargetDragContext>
+class TargetDragContext: public WeakImplHelper<XDropTargetDragContext>
 {
     // some calls to the functions of XDropTargetDragContext are delegated
     // to non-interface functions of m_pDropTarget
diff --git a/dtrans/source/win32/dnd/targetdropcontext.hxx b/dtrans/source/win32/dnd/targetdropcontext.hxx
index 4b945737cc7b..488137b62643 100644
--- a/dtrans/source/win32/dnd/targetdropcontext.hxx
+++ b/dtrans/source/win32/dnd/targetdropcontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGETDROPCONTEXT_HXX
 #define INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGETDROPCONTEXT_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/datatransfer/dnd/XDropTargetDropContext.hpp>
 
 #include "target.hxx"
@@ -30,7 +30,7 @@ using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 
-class TargetDropContext: public WeakImplHelper1<XDropTargetDropContext>
+class TargetDropContext: public WeakImplHelper<XDropTargetDropContext>
 {
     // calls to the functions of XDropTargetDropContext are delegated
     // to non-interface functions of m_pDropTarget