tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants in dtrans.

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

dtrans/source/cnttype/mcnttfactory.hxx

@@ -22,12 +22,12 @@
 
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
 
 class CMimeContentTypeFactory : public
-    cppu::WeakImplHelper2< com::sun::star::datatransfer::XMimeContentTypeFactory, \
+    cppu::WeakImplHelper< com::sun::star::datatransfer::XMimeContentTypeFactory, \
     com::sun::star::lang::XServiceInfo >
 {
 

dtrans/source/cnttype/mcnttype.hxx

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_DTRANS_SOURCE_CNTTYPE_MCNTTYPE_HXX
 #define INCLUDED_DTRANS_SOURCE_CNTTYPE_MCNTTYPE_HXX
 
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -29,7 +29,7 @@
 #include <map>
 
 class CMimeContentType : public
-    cppu::WeakImplHelper1< com::sun::star::datatransfer::XMimeContentType >
+    cppu::WeakImplHelper< com::sun::star::datatransfer::XMimeContentType >
 {
 public:
     CMimeContentType( const OUString& aCntType );

dtrans/source/generic/clipboardmanager.cxx

@@ -33,7 +33,7 @@ using namespace std;
 using ::dtrans::ClipboardManager;
 
 ClipboardManager::ClipboardManager():
-    WeakComponentImplHelper3< XClipboardManager, XEventListener, XServiceInfo > (m_aMutex),
+    WeakComponentImplHelper< XClipboardManager, XEventListener, XServiceInfo > (m_aMutex),
     m_aDefaultName(OUString("default"))
 {
 }

dtrans/source/generic/clipboardmanager.hxx

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_DTRANS_SOURCE_GENERIC_CLIPBOARDMANAGER_HXX
 #define INCLUDED_DTRANS_SOURCE_GENERIC_CLIPBOARDMANAGER_HXX
 
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
 
 #include <com/sun/star/datatransfer/clipboard/XClipboardManager.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -35,7 +35,7 @@ typedef ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star
 namespace dtrans
 {
 
-    class ClipboardManager : public ::cppu::WeakComponentImplHelper3 <
+    class ClipboardManager : public ::cppu::WeakComponentImplHelper <
       ::com::sun::star::datatransfer::clipboard::XClipboardManager,
       ::com::sun::star::lang::XEventListener,
       ::com::sun::star::lang::XServiceInfo >

dtrans/source/generic/generic_clipboard.cxx

@@ -32,7 +32,7 @@ using namespace osl;
 using ::dtrans::GenericClipboard;
 
 GenericClipboard::GenericClipboard() :
-    WeakComponentImplHelper4< XClipboardEx, XClipboardNotifier, XServiceInfo, XInitialization > (m_aMutex),
+    WeakComponentImplHelper< XClipboardEx, XClipboardNotifier, XServiceInfo, XInitialization > (m_aMutex),
     m_bInitialized(sal_False)
 {
 }

dtrans/source/generic/generic_clipboard.hxx

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_DTRANS_SOURCE_GENERIC_GENERIC_CLIPBOARD_HXX
 #define INCLUDED_DTRANS_SOURCE_GENERIC_GENERIC_CLIPBOARD_HXX
 
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
 
 #include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>
 
@@ -34,7 +34,7 @@
 namespace dtrans
 {
 
-    class GenericClipboard : public ::cppu::WeakComponentImplHelper4 < \
+    class GenericClipboard : public ::cppu::WeakComponentImplHelper < \
     ::com::sun::star::datatransfer::clipboard::XClipboardEx, \
     ::com::sun::star::datatransfer::clipboard::XClipboardNotifier, \
     ::com::sun::star::lang::XServiceInfo, \

dtrans/source/test/test_dtrans.cxx

@@ -25,8 +25,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 
 #include <cppuhelper/servicefactory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ustring.hxx>
 #include <osl/diagnose.h>
 
@@ -64,7 +63,7 @@ const char * app = NULL;
 
 //  ClipboardOwner
 
-class ClipboardOwner : public WeakImplHelper1< XClipboardOwner >
+class ClipboardOwner : public WeakImplHelper< XClipboardOwner >
 {
     Reference< XClipboard >    m_xClipboard;
     Reference< XTransferable > m_xTransferable;
@@ -102,7 +101,7 @@ void SAL_CALL ClipboardOwner::lostOwnership( const Reference< XClipboard >& xCli
 
 //  ClipboardListener
 
-class ClipboardListener : public WeakImplHelper1< XClipboardListener >
+class ClipboardListener : public WeakImplHelper< XClipboardListener >
 {
     Reference< XClipboard >    m_xClipboard;
     Reference< XTransferable > m_xTransferable;
@@ -151,7 +150,7 @@ void SAL_CALL ClipboardListener::disposing( const EventObject& event )
 
 //  StringTransferable
 
-class StringTransferable : public WeakImplHelper2< XClipboardOwner, XTransferable >
+class StringTransferable : public WeakImplHelper< XClipboardOwner, XTransferable >
 {
 public:
     StringTransferable( );

dtrans/source/win32/clipb/WinClipboard.cxx

@@ -54,7 +54,7 @@ namespace
 
 /*XEventListener,*/
 CWinClipboard::CWinClipboard( const Reference< XComponentContext >& rxContext, const OUString& aClipboardName ) :
-    WeakComponentImplHelper3< XSystemClipboard, XFlushableClipboard, XServiceInfo >( m_aCbListenerMutex ),
+    WeakComponentImplHelper< XSystemClipboard, XFlushableClipboard, XServiceInfo >( m_aCbListenerMutex ),
     m_xContext( rxContext )
 {
     m_pImpl.reset( new CWinClipbImpl( aClipboardName, this ) );

dtrans/source/win32/clipb/WinClipboard.hxx

@@ -22,7 +22,7 @@
 
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
@@ -60,7 +60,7 @@ protected:
 
 class CWinClipboard :
     public CWinClipboardDummy,
-    public cppu::WeakComponentImplHelper3<
+    public cppu::WeakComponentImplHelper<
         ::com::sun::star::datatransfer::clipboard::XSystemClipboard,
         ::com::sun::star::datatransfer::clipboard::XFlushableClipboard,
         ::com::sun::star::lang::XServiceInfo >

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),

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
 
 {

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) )
 {

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;

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),

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:

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

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

dtrans/source/win32/dtobj/DOTransferable.hxx

@@ -22,7 +22,7 @@
 
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include "DataFmtTransl.hxx"
 #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
 #include <com/sun/star/datatransfer/XMimeContentType.hpp>
@@ -34,7 +34,7 @@
 class CDTransObjFactory;
 class CFormatEtc;
 
-class CDOTransferable : public ::cppu::WeakImplHelper2< ::com::sun::star::datatransfer::XTransferable,
+class CDOTransferable : public ::cppu::WeakImplHelper< ::com::sun::star::datatransfer::XTransferable,
                         ::com::sun::star::datatransfer::XSystemTransferable>
 {
 public:

dtrans/source/win32/ftransl/ftransl.hxx

@@ -22,7 +22,7 @@
 
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/datatransfer/XDataFormatTranslator.hpp>
 #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
@@ -59,7 +59,7 @@ struct FormatEntry
 // CDataFormatTranslator
 
 class CDataFormatTranslator : public
-    cppu::WeakImplHelper2< com::sun::star::datatransfer::XDataFormatTranslator, \
+    cppu::WeakImplHelper< com::sun::star::datatransfer::XDataFormatTranslator, \
     com::sun::star::lang::XServiceInfo >
 {
 

dtrans/source/win32/workbench/test_wincb.cxx

@@ -26,8 +26,7 @@
 #include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>
 #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <osl/diagnose.h>
@@ -71,7 +70,7 @@ using namespace ::com::sun::star::lang;
 Reference< XTransferable > rXTransfRead;
 HANDLE  g_hEvtThreadWakeup;
 
-class CClipboardListener : public WeakImplHelper1 < XClipboardListener >
+class CClipboardListener : public WeakImplHelper < XClipboardListener >
 {
 public:
     ~CClipboardListener( );
@@ -96,7 +95,7 @@ void SAL_CALL CClipboardListener::changedContents( const ClipboardEvent& event )
     //MessageBox( NULL, TEXT("Clipboard content changed"), TEXT("Info"), MB_OK | MB_ICONINFORMATION );
 }
 
-class CTransferable : public WeakImplHelper2< XClipboardOwner, XTransferable >
+class CTransferable : public WeakImplHelper< XClipboardOwner, XTransferable >
 {
 public:
     CTransferable( );

dtrans/test/win32/dnd/sourcelistener.hxx

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_DTRANS_TEST_WIN32_DND_SOURCELISTENER_HXX
 #define INCLUDED_DTRANS_TEST_WIN32_DND_SOURCELISTENER_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
 #include <com/sun/star/datatransfer/dnd/DragSourceDropEvent.hpp>
 #include <com/sun/star/datatransfer/dnd/DragSourceDragEvent.hpp>
@@ -31,7 +31,7 @@ using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 
-class DragSourceListener: public WeakImplHelper1<XDragSourceListener>
+class DragSourceListener: public WeakImplHelper<XDragSourceListener>
 {
     // this is a window where dropped data are shown as text (only text)
 public:

dtrans/test/win32/dnd/targetlistener.hxx

@@ -27,7 +27,7 @@
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
 #include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
 #include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
@@ -39,7 +39,7 @@ using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 
-class DropTargetListener: public WeakImplHelper1<XDropTargetListener>
+class DropTargetListener: public WeakImplHelper<XDropTargetListener>
 {
     // this is a window where dropped data are shown as text (only text)
     HWND m_hEdit;

dtrans/test/win32/dnd/transferable.hxx

@@ -25,7 +25,7 @@
 #include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <osl/diagnose.h>
@@ -66,7 +66,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 
-class CTransferable : public WeakImplHelper2< XClipboardOwner, XTransferable >
+class CTransferable : public WeakImplHelper< XClipboardOwner, XTransferable >
 {
 public:
     CTransferable( ){};