[Libreoffice-commits] .: tools/source tools/win

[Tor Lillqvist]

 tools/source/generic/bigint.cxx |    5 ---
 tools/win/inc/dll.hxx           |   21 --------------
 tools/win/inc/toolsdll.hxx      |   57 ++--------------------------------------
 3 files changed, 3 insertions(+), 80 deletions(-)

New commits:
commit 0c3d975e0a9599c2daf14e7fd54acad559850c1d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Feb 18 11:54:37 2011 +0200

    Drop 16-bit Windows code

diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx
index 02ae545..920c024 100644
--- a/tools/source/generic/bigint.cxx
+++ b/tools/source/generic/bigint.cxx
@@ -78,12 +78,7 @@ void BigInt::MakeBigInt( const BigInt& rVal )
 
         nNum[0] = (sal_uInt16)(nTmp & 0xffffL);
         nNum[1] = (sal_uInt16)(nTmp >> 16);
-#ifndef _WIN16
         if ( nTmp & 0xffff0000L )
-#else
-        long l = 0xffff0000L;
-        if ( nTmp & l )
-#endif
             nLen = 2;
         else
             nLen = 1;
diff --git a/tools/win/inc/dll.hxx b/tools/win/inc/dll.hxx
index a85cc0d..3191b8b 100644
--- a/tools/win/inc/dll.hxx
+++ b/tools/win/inc/dll.hxx
@@ -29,27 +29,6 @@
 #ifndef _DLL_HXX
 #define _DLL_HXX
 
-#ifdef WIN
-
-#include <tools/svwin.h>
-
-// ----------------------
-// - Zugriffsfunktionen -
-// ----------------------
-
-struct SVDATA;
-
-extern "C"
-{
-// IN APPDATA.ASM
-SVDATA* FAR PASCAL GetSVData();
-}
-
-// IN TOOLSDLL.CXX
-void SetSVData( SVDATA* pSVData );
-
-#endif
-
 // -------------------------------
 // - Sonstige Funktionen fuer SV -
 // -------------------------------
diff --git a/tools/win/inc/toolsdll.hxx b/tools/win/inc/toolsdll.hxx
index 0fef277..4ff1e7a 100644
--- a/tools/win/inc/toolsdll.hxx
+++ b/tools/win/inc/toolsdll.hxx
@@ -29,60 +29,9 @@
 #ifndef _TOOLSDLL_HXX
 #define _TOOLSDLL_HXX
 
-#ifdef WIN
-
-#include <string.h>
-#include <tools/svwin.h>
-#include <tools/solar.h>
-#include <tools/shl.hxx>
-
-// ----------------
-// - MemMgr-Daten -
-// ----------------
-
-// Anzahl Freispeicherlisten
-#define MEM_FREELIST_COUNT  15
-
-
-// --------------
-// - Tools-Data -
-// --------------
-
-struct SVDATA;
-struct FreeBlock;
-
-struct MemData
-{
-    FreeBlock*  pFirstBlocks[MEM_FREELIST_COUNT];   // Erste Bloecke in Freispeicherlisten
-    void*       pNewHandler;                        // New-Handler
-    int         nMultiThread;                       // MultiThread an/aus
-};
-
-struct ToolsData
-{
-    // !!! SVDATA muss in jedem Fall ganz vorne in der Struktur stehen !!!
-    SVDATA*     pSVData;                // Pointer auf StarView-Daten
-    HANDLE      hMem;                   // Handler der Tools-Daten
-    MemData     aMemD;                  // Daten der Speicherverwaltung
-    void*       aAppData[SHL_COUNT];    // Daten fuer andere Shared Libs
-};
-
-
-// ----------------------
-// - Zugriffsfunktionen -
-// ----------------------
-
-// IN APPDATA.ASM
-extern "C"
-{
-ToolsData*  FAR PASCAL ImpGetAppData();
-void        FAR PASCAL ImpSetAppData( ToolsData* pData );
-}
-
-// IN TOOLSDLL.CXX
-ToolsData* ImpGetToolsData();
-
-#endif
+/* Yes, this file is now effectively empty. Remove it completely in a
+ * later commit.
+ */
 
 #endif // _DLL_HXX