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/cnttype/mcnttfactory.hxx | 4 ++-- dtrans/source/cnttype/mcnttype.hxx | 4 ++-- dtrans/source/generic/clipboardmanager.cxx | 2 +- dtrans/source/generic/clipboardmanager.hxx | 4 ++-- dtrans/source/generic/generic_clipboard.cxx | 2 +- dtrans/source/generic/generic_clipboard.hxx | 4 ++-- dtrans/source/test/test_dtrans.cxx | 9 ++++----- dtrans/source/win32/clipb/WinClipboard.cxx | 2 +- dtrans/source/win32/clipb/WinClipboard.hxx | 4 ++-- 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 ++-- dtrans/source/win32/dtobj/DOTransferable.hxx | 4 ++-- dtrans/source/win32/ftransl/ftransl.hxx | 4 ++-- dtrans/source/win32/workbench/test_wincb.cxx | 7 +++---- dtrans/test/win32/dnd/sourcelistener.hxx | 4 ++-- dtrans/test/win32/dnd/targetlistener.hxx | 4 ++-- dtrans/test/win32/dnd/transferable.hxx | 4 ++-- 23 files changed, 43 insertions(+), 46 deletions(-) (limited to 'dtrans') diff --git a/dtrans/source/cnttype/mcnttfactory.hxx b/dtrans/source/cnttype/mcnttfactory.hxx index 19bf5501bc4a..7ce1899baf39 100644 --- a/dtrans/source/cnttype/mcnttfactory.hxx +++ b/dtrans/source/cnttype/mcnttfactory.hxx @@ -22,12 +22,12 @@ #include #include -#include +#include #include #include class CMimeContentTypeFactory : public - cppu::WeakImplHelper2< com::sun::star::datatransfer::XMimeContentTypeFactory, \ + cppu::WeakImplHelper< com::sun::star::datatransfer::XMimeContentTypeFactory, \ com::sun::star::lang::XServiceInfo > { diff --git a/dtrans/source/cnttype/mcnttype.hxx b/dtrans/source/cnttype/mcnttype.hxx index e44e12261b21..a4126c6c6a53 100644 --- a/dtrans/source/cnttype/mcnttype.hxx +++ b/dtrans/source/cnttype/mcnttype.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_DTRANS_SOURCE_CNTTYPE_MCNTTYPE_HXX #define INCLUDED_DTRANS_SOURCE_CNTTYPE_MCNTTYPE_HXX -#include +#include #include #include #include @@ -29,7 +29,7 @@ #include class CMimeContentType : public - cppu::WeakImplHelper1< com::sun::star::datatransfer::XMimeContentType > + cppu::WeakImplHelper< com::sun::star::datatransfer::XMimeContentType > { public: CMimeContentType( const OUString& aCntType ); diff --git a/dtrans/source/generic/clipboardmanager.cxx b/dtrans/source/generic/clipboardmanager.cxx index b67e6ac3e9f5..e538a7fc8525 100644 --- a/dtrans/source/generic/clipboardmanager.cxx +++ b/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")) { } diff --git a/dtrans/source/generic/clipboardmanager.hxx b/dtrans/source/generic/clipboardmanager.hxx index a65e672f36a8..2d9a1d42baeb 100644 --- a/dtrans/source/generic/clipboardmanager.hxx +++ b/dtrans/source/generic/clipboardmanager.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_DTRANS_SOURCE_GENERIC_CLIPBOARDMANAGER_HXX #define INCLUDED_DTRANS_SOURCE_GENERIC_CLIPBOARDMANAGER_HXX -#include +#include #include #include @@ -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 > diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx index 42d8fc947ec0..31eed17cebd6 100644 --- a/dtrans/source/generic/generic_clipboard.cxx +++ b/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) { } diff --git a/dtrans/source/generic/generic_clipboard.hxx b/dtrans/source/generic/generic_clipboard.hxx index cc412acaa5bc..542a847de0cd 100644 --- a/dtrans/source/generic/generic_clipboard.hxx +++ b/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 +#include #include @@ -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, \ diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx index 6c363b0abf36..5bc87e329e46 100644 --- a/dtrans/source/test/test_dtrans.cxx +++ b/dtrans/source/test/test_dtrans.cxx @@ -25,8 +25,7 @@ #include #include -#include -#include +#include #include #include @@ -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( ); diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx index 9c0531559265..e5996bb4e5a5 100644 --- a/dtrans/source/win32/clipb/WinClipboard.cxx +++ b/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 ) ); diff --git a/dtrans/source/win32/clipb/WinClipboard.hxx b/dtrans/source/win32/clipb/WinClipboard.hxx index e40defb1dd58..6e74deb21dfa 100644 --- a/dtrans/source/win32/clipb/WinClipboard.hxx +++ b/dtrans/source/win32/clipb/WinClipboard.hxx @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include @@ -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 > 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 diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/dtrans/source/win32/dtobj/DOTransferable.hxx index 3090439f5228..74064cac8155 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.hxx +++ b/dtrans/source/win32/dtobj/DOTransferable.hxx @@ -22,7 +22,7 @@ #include -#include +#include #include "DataFmtTransl.hxx" #include #include @@ -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: diff --git a/dtrans/source/win32/ftransl/ftransl.hxx b/dtrans/source/win32/ftransl/ftransl.hxx index 6bf5ec2dd18b..138b3c7e9d6a 100644 --- a/dtrans/source/win32/ftransl/ftransl.hxx +++ b/dtrans/source/win32/ftransl/ftransl.hxx @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include @@ -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 > { diff --git a/dtrans/source/win32/workbench/test_wincb.cxx b/dtrans/source/win32/workbench/test_wincb.cxx index a2d0ff9ae7a6..8eb355de6d7b 100644 --- a/dtrans/source/win32/workbench/test_wincb.cxx +++ b/dtrans/source/win32/workbench/test_wincb.cxx @@ -26,8 +26,7 @@ #include #include #include -#include -#include +#include #include #include #include @@ -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( ); diff --git a/dtrans/test/win32/dnd/sourcelistener.hxx b/dtrans/test/win32/dnd/sourcelistener.hxx index 72b1b9aa28af..686d95c11025 100644 --- a/dtrans/test/win32/dnd/sourcelistener.hxx +++ b/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 +#include #include #include #include @@ -31,7 +31,7 @@ using namespace ::cppu; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -class DragSourceListener: public WeakImplHelper1 +class DragSourceListener: public WeakImplHelper { // this is a window where dropped data are shown as text (only text) public: diff --git a/dtrans/test/win32/dnd/targetlistener.hxx b/dtrans/test/win32/dnd/targetlistener.hxx index a70a669fb3b9..5064dc7b2efd 100644 --- a/dtrans/test/win32/dnd/targetlistener.hxx +++ b/dtrans/test/win32/dnd/targetlistener.hxx @@ -27,7 +27,7 @@ #if defined _MSC_VER #pragma warning(pop) #endif -#include +#include #include #include #include @@ -39,7 +39,7 @@ using namespace ::cppu; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -class DropTargetListener: public WeakImplHelper1 +class DropTargetListener: public WeakImplHelper { // this is a window where dropped data are shown as text (only text) HWND m_hEdit; diff --git a/dtrans/test/win32/dnd/transferable.hxx b/dtrans/test/win32/dnd/transferable.hxx index c69d610a2e90..428c9f7fa98b 100644 --- a/dtrans/test/win32/dnd/transferable.hxx +++ b/dtrans/test/win32/dnd/transferable.hxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -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( ){}; -- cgit