summaryrefslogtreecommitdiffstats
path: root/tools/win
diff options
context:
space:
mode:
authorth <th@openoffice.org>2001-07-06 12:56:19 +0000
committerth <th@openoffice.org>2001-07-06 12:56:19 +0000
commitbd7fee2bb03f9d879994ccd0c64919e538da6774 (patch)
tree1c63d5884212f143b8c139a8d8e7257682d01296 /tools/win
parent#81268# add GetTable() and GetFontCodeRanges() (diff)
downloadcore-bd7fee2bb03f9d879994ccd0c64919e538da6774.tar.gz
core-bd7fee2bb03f9d879994ccd0c64919e538da6774.zip
remove Enter/IsMultiThread()
Diffstat (limited to 'tools/win')
-rw-r--r--tools/win/inc/dll.hxx8
-rw-r--r--tools/win/source/dll/toolsdll.cxx94
2 files changed, 4 insertions, 98 deletions
diff --git a/tools/win/inc/dll.hxx b/tools/win/inc/dll.hxx
index fbcb6478acc2..96695ed0478a 100644
--- a/tools/win/inc/dll.hxx
+++ b/tools/win/inc/dll.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: dll.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:03:11 $
+ * last change: $Author: th $ $Date: 2001-07-06 13:56:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -89,10 +89,6 @@ void SetSVData( SVDATA* pSVData );
// - Sonstige Funktionen fuer SV -
// -------------------------------
-// MultiThread-Sicherung aktivieren
-void EnterMultiThread( int bEnter );
-int IsMultiThread();
-
// Um Resourcen wieder freizugeben
#ifdef WNT
void ImpDeInitWinTools();
diff --git a/tools/win/source/dll/toolsdll.cxx b/tools/win/source/dll/toolsdll.cxx
index 293544e26136..09753c7a45f7 100644
--- a/tools/win/source/dll/toolsdll.cxx
+++ b/tools/win/source/dll/toolsdll.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: toolsdll.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:03:11 $
+ * last change: $Author: th $ $Date: 2001-07-06 13:56:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -75,92 +75,6 @@
// =======================================================================
-#ifdef WIN
-
-extern "C" int CALLBACK LibMain( HINSTANCE, WORD, WORD nHeap, LPSTR )
-{
- if ( nHeap )
- UnlockData( 0 );
-
- return TRUE;
-}
-
-// -----------------------------------------------------------------------
-
-extern "C" int CALLBACK WEP( int )
-{
- return 1;
-}
-
-// -----------------------------------------------------------------------
-
-ToolsData* ImpGetToolsData()
-{
- ToolsData* pData = ImpGetAppData();
-
- // Tools-Init
- if ( !pData )
- {
- // Speicher anlegen
- HANDLE hMem = GlobalAlloc( GMEM_MOVEABLE | GMEM_ZEROINIT,
- (DWORD)sizeof( ToolsData ) );
-
- if ( !hMem )
- return NULL;
-
- pData = (ToolsData*)GlobalLock( hMem );
-
- if ( !pData )
- {
- GlobalFree( hMem );
- return NULL;
- }
-
- // ToolsData setzen
- ImpSetAppData( pData );
- }
-
- return pData;
-}
-
-// -----------------------------------------------------------------------
-
-void** GetAppData( USHORT nSharedLib )
-{
- ToolsData* pData = ImpGetToolsData();
- return &(pData->aAppData[nSharedLib]);
-}
-
-// -----------------------------------------------------------------------
-
-void SetSVData( SVDATA* pSVData )
-{
- ToolsData* pData = ImpGetToolsData();
- pData->pSVData = pSVData;
-}
-
-// -----------------------------------------------------------------------
-
-void EnterMultiThread( int bEnter )
-{
- ToolsData* pData = ImpGetToolsData();
- if ( bEnter )
- pData->aMemD.nMultiThread++;
- else if ( pData->aMemD.nMultiThread )
- pData->aMemD.nMultiThread--;
-}
-
-// -----------------------------------------------------------------------
-
-int IsMultiThread()
-{
- return (ImpGetToolsData()->aMemD.nMultiThread != 0);
-}
-
-#endif
-
-// =======================================================================
-
#ifdef WNT
static void* aAppData[SHL_COUNT];
@@ -172,8 +86,4 @@ void** GetAppData( USHORT nSharedLib )
return &(aAppData[nSharedLib]);
}
-// -----------------------------------------------------------------------
-
-// EnterMultiThread()/IsMultiThread()/... in MEMWNT.CXX, damit inline
-
#endif