summaryrefslogtreecommitdiff
path: root/dtrans
diff options
context:
space:
mode:
Diffstat (limited to 'dtrans')
-rw-r--r--dtrans/source/win32/dnd/idroptarget.cxx5
-rw-r--r--dtrans/source/win32/dnd/source.cxx16
-rw-r--r--dtrans/source/win32/dnd/sourcecontext.cxx4
-rw-r--r--dtrans/source/win32/dnd/target.cxx11
-rw-r--r--dtrans/source/win32/dnd/targetdragcontext.cxx5
-rw-r--r--dtrans/source/win32/dnd/targetdropcontext.cxx5
6 files changed, 0 insertions, 46 deletions
diff --git a/dtrans/source/win32/dnd/idroptarget.cxx b/dtrans/source/win32/dnd/idroptarget.cxx
index 25ece152127d..b0e4ad970c55 100644
--- a/dtrans/source/win32/dnd/idroptarget.cxx
+++ b/dtrans/source/win32/dnd/idroptarget.cxx
@@ -18,7 +18,6 @@
*/
#include "idroptarget.hxx"
-#include <rtl/unload.h>
#ifdef __MINGW32__
#if defined __uuidof
@@ -27,17 +26,13 @@
#define __uuidof(I) IID_##I
#endif
-extern rtl_StandardModuleCount g_moduleCount;
-
IDropTargetImpl::IDropTargetImpl( DropTarget& pTarget): m_nRefCount( 0),
m_rDropTarget( pTarget)
{
- g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
}
IDropTargetImpl::~IDropTargetImpl()
{
- g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
}
diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx
index 1c3e6fd88538..882c72b84416 100644
--- a/dtrans/source/win32/dnd/source.cxx
+++ b/dtrans/source/win32/dnd/source.cxx
@@ -21,7 +21,6 @@
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/awt/MouseButton.hpp>
#include <com/sun/star/awt/MouseEvent.hpp>
-#include <rtl/unload.h>
#include <process.h>
#include <memory>
@@ -51,20 +50,10 @@ using namespace com::sun::star::awt::MouseButton;
using namespace com::sun::star::awt;
using namespace com::sun::star::lang;
-
-extern rtl_StandardModuleCount g_moduleCount;
-
-//--> TRA
-
extern Reference< XTransferable > g_XTransferable;
-//<-- TRA
-
unsigned __stdcall DndOleSTAFunc(LPVOID pParams);
-//----------------------------------------------------
-/** Ctor
-*/
DragSource::DragSource( const Reference<XComponentContext>& rxContext):
WeakComponentImplHelper3< XDragSource, XInitialization, XServiceInfo >(m_mutex),
m_xContext( rxContext ),
@@ -73,15 +62,10 @@ DragSource::DragSource( const Reference<XComponentContext>& rxContext):
m_MouseButton(0),
m_RunningDndOperationCount(0)
{
- g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
}
-//----------------------------------------------------
-/** Dtor
-*/
DragSource::~DragSource()
{
- g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
}
//----------------------------------------------------
diff --git a/dtrans/source/win32/dnd/sourcecontext.cxx b/dtrans/source/win32/dnd/sourcecontext.cxx
index 413e9471e9e7..a9f1c090dac1 100644
--- a/dtrans/source/win32/dnd/sourcecontext.cxx
+++ b/dtrans/source/win32/dnd/sourcecontext.cxx
@@ -20,11 +20,9 @@
#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
#include "sourcecontext.hxx"
-#include <rtl/unload.h>
using namespace com::sun::star::datatransfer::dnd;
using namespace com::sun::star::datatransfer::dnd::DNDConstants;
-extern rtl_StandardModuleCount g_moduleCount;
SourceContext::SourceContext( DragSource* pSource,
const Reference<XDragSourceListener>& listener):
@@ -32,7 +30,6 @@ SourceContext::SourceContext( DragSource* pSource,
m_pDragSource( pSource),
m_dragSource( static_cast<XDragSource*>( m_pDragSource) )
{
- g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
#if OSL_DEBUG_LEVEL > 1
if( listener.is())
#endif
@@ -41,7 +38,6 @@ SourceContext::SourceContext( DragSource* pSource,
SourceContext::~SourceContext()
{
- g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
}
void SAL_CALL SourceContext::addDragSourceListener(
diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx
index 21c20a8a2e3b..e127b3d5e7fd 100644
--- a/dtrans/source/win32/dnd/target.cxx
+++ b/dtrans/source/win32/dnd/target.cxx
@@ -19,7 +19,6 @@
#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
#include <com/sun/star/datatransfer/XTransferable.hpp>
-#include <rtl/unload.h>
#include <stdio.h>
#include "target.hxx"
@@ -37,12 +36,8 @@ using namespace com::sun::star::datatransfer::dnd::DNDConstants;
#define WM_REGISTERDRAGDROP WM_USER + 1
#define WM_REVOKEDRAGDROP WM_USER + 2
-//--> TRA
extern Reference< XTransferable > g_XTransferable;
-//<-- TRA
-
-extern rtl_StandardModuleCount g_moduleCount;
DWORD WINAPI DndTargetOleSTAFunc(LPVOID pParams);
DropTarget::DropTarget( const Reference<XComponentContext>& rxContext):
@@ -59,17 +54,11 @@ DropTarget::DropTarget( const Reference<XComponentContext>& rxContext):
m_nCurrentDropAction( ACTION_NONE),
m_nLastDropAction(0),
m_bDropComplete(false)
-
-
{
- g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
}
-
DropTarget::~DropTarget()
{
- g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
-
}
// called from WeakComponentImplHelperX::dispose
// WeakComponentImplHelper calls disposing before it destroys
diff --git a/dtrans/source/win32/dnd/targetdragcontext.cxx b/dtrans/source/win32/dnd/targetdragcontext.cxx
index 284f0b1a373d..425f9d38707d 100644
--- a/dtrans/source/win32/dnd/targetdragcontext.cxx
+++ b/dtrans/source/win32/dnd/targetdragcontext.cxx
@@ -17,14 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <rtl/unload.h>
-
#include "targetdragcontext.hxx"
-extern rtl_StandardModuleCount g_moduleCount;
TargetDragContext::TargetDragContext( DropTarget* p)
{
- g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
m_pDropTarget= p;
p->acquire();
}
@@ -32,7 +28,6 @@ TargetDragContext::TargetDragContext( DropTarget* p)
TargetDragContext::~TargetDragContext()
{
m_pDropTarget->release();
- g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
}
void SAL_CALL TargetDragContext::acceptDrag( sal_Int8 dragOperation )
diff --git a/dtrans/source/win32/dnd/targetdropcontext.cxx b/dtrans/source/win32/dnd/targetdropcontext.cxx
index 63be68989d1f..93705a2dba9d 100644
--- a/dtrans/source/win32/dnd/targetdropcontext.cxx
+++ b/dtrans/source/win32/dnd/targetdropcontext.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <rtl/unload.h>
-
#include "targetdropcontext.hxx"
using namespace ::com::sun::star::datatransfer::dnd;
@@ -26,10 +24,8 @@ using namespace ::cppu;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-extern rtl_StandardModuleCount g_moduleCount;
TargetDropContext::TargetDropContext( DropTarget* p)
{
- g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
m_pDropTarget= p;
p->acquire();
}
@@ -37,7 +33,6 @@ TargetDropContext::TargetDropContext( DropTarget* p)
TargetDropContext::~TargetDropContext()
{
m_pDropTarget->release();
- g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
}
void SAL_CALL TargetDropContext::acceptDrop( sal_Int8 dropOperation )