From 7e495e2b9e7b52ed169c936b63d960958db310cd Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Thu, 23 Jul 2015 16:20:52 +0900 Subject: 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 Reviewed-by: Noel Grandin --- dtrans/source/win32/dnd/source.cxx | 2 +- dtrans/source/win32/dnd/source.hxx | 4 ++-- dtrans/source/win32/dnd/sourcecontext.cxx | 2 +- dtrans/source/win32/dnd/sourcecontext.hxx | 5 ++--- dtrans/source/win32/dnd/target.cxx | 2 +- dtrans/source/win32/dnd/target.hxx | 4 ++-- dtrans/source/win32/dnd/targetdragcontext.hxx | 4 ++-- dtrans/source/win32/dnd/targetdropcontext.hxx | 4 ++-- 8 files changed, 13 insertions(+), 14 deletions(-) (limited to 'dtrans/source/win32/dnd') 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& 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 #include #include -#include +#include #include #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, + public WeakComponentImplHelper, 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& listener): - WeakComponentImplHelper1(m_mutex), + WeakComponentImplHelper(m_mutex), m_pDragSource( pSource), m_dragSource( static_cast( 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 #include -#include +#include #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 + public WeakComponentImplHelper { DragSource* m_pDragSource; Reference 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& rxContext): - WeakComponentImplHelper3(m_mutex), + WeakComponentImplHelper(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 #include -#include +#include #include #include @@ -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 +#include #include #include @@ -31,7 +31,7 @@ using namespace ::cppu; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -class TargetDragContext: public WeakImplHelper1 +class TargetDragContext: public WeakImplHelper { // 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 +#include #include #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 +class TargetDropContext: public WeakImplHelper { // calls to the functions of XDropTargetDropContext are delegated // to non-interface functions of m_pDropTarget -- cgit