From 14eda666492ae3c5694cf993dfe5fa547a0628ee Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 8 Mar 2012 11:58:50 +0100 Subject: WaE: initialization order --- dtrans/source/win32/dnd/source.cxx | 2 +- dtrans/source/win32/dnd/target.cxx | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'dtrans/source/win32') diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx index f242688188b7..5a1c63698c72 100644 --- a/dtrans/source/win32/dnd/source.cxx +++ b/dtrans/source/win32/dnd/source.cxx @@ -74,8 +74,8 @@ unsigned __stdcall DndOleSTAFunc(LPVOID pParams); /** Ctor */ DragSource::DragSource( const Reference& sf): - m_serviceFactory( sf), WeakComponentImplHelper3< XDragSource, XInitialization, XServiceInfo >(m_mutex), + m_serviceFactory( sf), // m_pcurrentContext_impl(0), m_hAppWindow(0), m_MouseButton(0), diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx index b16a62c1b6b7..5a33a9871a7c 100644 --- a/dtrans/source/win32/dnd/target.cxx +++ b/dtrans/source/win32/dnd/target.cxx @@ -56,17 +56,17 @@ extern rtl_StandardModuleCount g_moduleCount; DWORD WINAPI DndTargetOleSTAFunc(LPVOID pParams); DropTarget::DropTarget( const Reference& sf): + WeakComponentImplHelper3(m_mutex), m_hWnd( NULL), + m_threadIdWindow(0), + m_threadIdTarget(0), + m_hOleThread(0), + m_oleThreadId( 0), + m_pDropTarget( NULL), m_serviceFactory( sf), - WeakComponentImplHelper3(m_mutex), m_bActive(sal_True), m_nDefaultActions(ACTION_COPY|ACTION_MOVE|ACTION_LINK|ACTION_DEFAULT), m_nCurrentDropAction( ACTION_NONE), - m_oleThreadId( 0), - m_pDropTarget( NULL), - m_threadIdWindow(0), - m_threadIdTarget(0), - m_hOleThread(0), m_nLastDropAction(0) -- cgit v1.2.3