CWS changehid: resync to m89

29 files changed, 32 insertions, 1424 deletions

diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx
index 2d7664b8b69f..994418bae4b5 100644
--- a/tools/inc/bootstrp/prj.hxx
+++ b/tools/inc/bootstrp/prj.hxx
@@ -264,7 +264,7 @@ private:
 
     static Link aDBNotFoundHdl;
 protected:
-    NAMESPACE_VOS( OMutex ) aMutex;
+    vos:: OMutex  aMutex;
 
     USHORT          nStarMode;
     SolarFileList   aFileList;
diff --git a/tools/inc/poly.h b/tools/inc/poly.h
index e6678e071f28..9228715b8da7 100644
--- a/tools/inc/poly.h
+++ b/tools/inc/poly.h
@@ -39,15 +39,8 @@
 class ImplPolygonData
 {
 public:
-#ifdef WIN
-    Point huge*     mpPointAry;
-    BYTE*           mpFlagAry;
-    GLOBALHANDLE    mhPoints;
-#else
     Point*          mpPointAry;
     BYTE*           mpFlagAry;
-#endif
-
     USHORT          mnPoints;
     ULONG           mnRefCount;
 };
diff --git a/tools/inc/tools/agapi.hxx b/tools/inc/tools/agapi.hxx
deleted file mode 100644
index 9c71bd35c6cc..000000000000
--- a/tools/inc/tools/agapi.hxx
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _AGAPI_HXX
-#define _AGAPI_HXX
-
-#include <tools/solar.h>
-
-class INetURLObject;
-class ChannelList;
-class AgentItem;
-class String;
-
-class AgentApi
-{
-protected:
-    friend class ChannelList;
-
-    AgentItem*          pChannelAgent;
-    virtual BOOL        StartAgent() = 0;
-
-    AgentApi(AgentItem* pAgent) { pChannelAgent = pAgent; }
-
-public:
-    virtual ~AgentApi() {}
-
-    virtual void    InitAgent() = 0;
-    virtual void    ShutDownAgent() = 0;
-
-    virtual BOOL    NewDataPermission(const String& rChannelName) = 0;
-    virtual void    NewData(const String& rChannelName,
-                        const INetURLObject& rURL) = 0;
-    virtual void    NotifyChannelObjFile(const INetURLObject& rURL,
-                        const String& rFileName) = 0;
-    virtual void    NotifyChannelObjData(const INetURLObject& rURL,
-                        void* pBuffer, long nOffset, long nLen, long nTotalLen) = 0;
-
-    virtual void    RegisterChannels() = 0;
-    virtual void    RegisterUpdateTransmitter() = 0;
-};
-
-#endif //_AGAPI_HXX
-
diff --git a/tools/inc/tools/agitem.hxx b/tools/inc/tools/agitem.hxx
deleted file mode 100644
index 3177bdffa0a8..000000000000
--- a/tools/inc/tools/agitem.hxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _AGITEM_HXX
-#define _AGITEM_HXX
-
-#include <tools/solar.h>
-
-class String;
-class INetURLObject;
-class AgentApi;
-class ChApi;
-
-class AgentItem
-{
-public:
-    virtual const String&           GetChAgentName() const = 0;
-    virtual const INetURLObject&    GetLocation() const = 0;
-    virtual AgentApi*               GetApi() const = 0;
-    virtual ChApi*                  GetChApi() const = 0;
-
-    virtual void                    SetIsActive(BOOL bNew) = 0;
-    virtual BOOL                    IsActive() const = 0;
-};
-
-#endif //_AGITEM_HXX
-
diff --git a/tools/inc/tools/chapi.hxx b/tools/inc/tools/chapi.hxx
deleted file mode 100644
index 0acfe4cb2ca5..000000000000
--- a/tools/inc/tools/chapi.hxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _CHAPI_HXX
-#define _CHAPI_HXX
-
-#include <tools/solar.h>
-
-class ChannelAgentItem;
-class INetURLObject;
-class String;
-
-enum RequestType {
-    REQTYP_LOCAL_FILE   = 1,
-    REQTYP_MEMORY       = 2
-};
-
-class ChApi
-{
-public:
-    virtual ~ChApi() {}
-
-    virtual void    ShutDownAgent() = 0;
-    virtual void    SetLastSuccUpd() = 0;
-
-    virtual void    GetChannelObject( const INetURLObject& rURL, RequestType eStreamType,
-                            const String& rFileName ) = 0;
-    virtual void    AddChannelItem( const String& aChName, const INetURLObject& aTransmitter,
-                            const String& aChannel, USHORT nUpdPeriode,
-                            const String& rChAgentName ) = 0;
-    virtual void    DelChannelItem( const String& aChName ) = 0;
-    virtual void    SetChTransmitter( const String& aChName, const String& rNewVal ) = 0;
-    virtual void    SetChannel( const String& aChName, const String& rNewVal ) = 0;
-    virtual void    SetChannelName( const String& aChName, const String& rNewVal ) = 0;
-    virtual void    SetChUpdPeriode( const String& aChName, USHORT nUpdPeriode ) = 0;
-    virtual void    SetChannelAgentName( const String& aChName, const String& rNewVal ) = 0;
-
-    virtual void    SetUpdateTransmitter(ChannelAgentItem* pAgent, const INetURLObject& rTransmitter) = 0;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-//
-
-#endif //_CHAPI_HXX
diff --git a/tools/inc/tools/download.hxx b/tools/inc/tools/download.hxx
deleted file mode 100644
index b187433927cd..000000000000
--- a/tools/inc/tools/download.hxx
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _DOWNLOAD_HXX
-#define _DOWNLOAD_HXX
-
-// Forward declarations
-class String;
-class Link;
-
-#define DOWNLOAD_SUCCESS    0
-#define DOWNLOAD_CONNECT    1
-#define DOWNLOAD_LOCATION   2
-#define DOWNLOAD_ABORT      3
-#define DOWNLOAD_FILEACCESS 4
-#define DOWNLOAD_INSTALL    5
-#define DOWNLOAD_ERROR      6
-
-class Downloader
-/* ***************************************************************************
-Purpose: Abstract base class for a file downloader
-*************************************************************************** */
-{
-public:
-    Downloader() {};
-
-    virtual void Download(const String &rDestLocation,
-                          const String &rSourceLocation,
-                          const Link &rFinishedLink) = 0;
-};
-
-#endif
diff --git a/tools/inc/tools/eacopier.hxx b/tools/inc/tools/eacopier.hxx
deleted file mode 100644
index c80eeb0d35cc..000000000000
--- a/tools/inc/tools/eacopier.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _EACOPIER_HXX
-#define _EACOPIER_HXX
-
-#include <tools/solar.h>
-
-class SvFileStream;
-
-class EA_Copier
-{
-    static EA_Copier*   _pCopier;
-
-public:
-    static void         Register( EA_Copier* pCopier );
-    static EA_Copier*   Get();
-
-    virtual             ~EA_Copier();
-    virtual BOOL        Copy( const SvFileStream& rFrom, const SvFileStream& rTo ) const = 0;
-};
-
-#endif
-
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 880768c89d8c..5ef51803734b 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -159,21 +159,10 @@ enum FSysExact
 // - Char-Set -
 // ------------
 
-#if defined(WIN) || defined(W30)
-
-// MS-Windows has different char-sets for file-system and user-interface
-String Gui2FSys( const String& rStr );
-String FSys2Gui( const String& rStr );
-#define GUI2FSYS(s) Gui2FSys( s )
-#define FSYS2GUI(s) FSys2Gui( s )
-
-#else
-
-// all other OS have the same char-set for both
+// Was different for WIN, no longer needed...
 #define GUI2FSYS(s) s
 #define FSYS2GUI(s) s
 
-#endif
 
 // ------------
 // - FileStat -
diff --git a/tools/inc/tools/postextstl.h b/tools/inc/tools/postextstl.h
deleted file mode 100644
index 81a21e25c15b..000000000000
--- a/tools/inc/tools/postextstl.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifdef std_was_redefined_as_stlport
-//  put things back the way they were
-#   define std std_was_redefined_as_stlport
-#   undef _STLP_OUTERMOST_HEADER_ID
-//  force config to be re-read
-#   undef _STLP_NOTHROW_INHERENTLY
-#   undef _STLP_CONFIG_H
-#   include <stddef.h>
-#endif
diff --git a/tools/inc/tools/preextstl.h b/tools/inc/tools/preextstl.h
deleted file mode 100644
index 27aed38686f0..000000000000
--- a/tools/inc/tools/preextstl.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-//1. Force inclusion of a std:: using header to ensure the stlport define
-//of std as "stlport"
-#include <algorithm>
-#if defined(ADAPT_EXT_STL)
-//2. Force inclusion of stlport headers to get their stlport:: definitions
-#   include <ostream>
-#   include <istream>
-#   include <fstream>
-#   include <iostream>
-#   include <vector>
-#   include <list>
-#   include <map>
-//3. Now force inclusion of native headers to get their std:: definitions
-#   if defined(std)
-#       define std_was_redefined_as_stlport std
-#       undef std
-#       define _STLP_OUTERMOST_HEADER_ID 0xdeadbeaf
-#       if defined(_GNUC__)
-#           pragma GCC visibility push(default)
-#       endif
-#       include _STLP_NATIVE_HEADER(exception_defines.h)
-#       include _STLP_NATIVE_HEADER(limits)
-#       include _STLP_NATIVE_HEADER(memory)
-#       include _STLP_NATIVE_HEADER(exception)
-#       include _STLP_NATIVE_HEADER(iosfwd)
-#       include _STLP_NATIVE_HEADER(algorithm)
-#       include _STLP_NATIVE_HEADER(string)
-#       include _STLP_NATIVE_HEADER(streambuf)
-#       include _STLP_NATIVE_HEADER(ios)
-#       include _STLP_NATIVE_HEADER(locale)
-#       include _STLP_NATIVE_HEADER(stdexcept)
-#       include _STLP_NATIVE_HEADER(ostream)
-#       include _STLP_NATIVE_HEADER(istream)
-#       include _STLP_NATIVE_HEADER(iostream)
-#       include _STLP_NATIVE_HEADER(vector)
-#       include _STLP_NATIVE_HEADER(list)
-#       include _STLP_NATIVE_HEADER(map)
-#       if defined(_GNUC__)
-#           pragma GCC visibility pop
-#       endif
-#   endif
-#endif
-//ext_std resolves to the std that external c++ libs, e.g. Graphite were built
-//against regardless of whether that is stlport or system stl
-namespace ext_std = std;
diff --git a/tools/inc/tools/pstm.hxx b/tools/inc/tools/pstm.hxx
index 0d14385e5f08..2575ccae8f3e 100644
--- a/tools/inc/tools/pstm.hxx
+++ b/tools/inc/tools/pstm.hxx
@@ -60,16 +60,7 @@ public:
 };
 
 /************************** S v R t t i B a s e **************************/
-/*
-#if defined (DOS) && defined (STC)
-#ifdef WIN
-#error Fuer Win muss der Kram virtual sein (MM/MH)
-#endif
-class SvRttiBase : public SvRefBase
-#else
-class SvRttiBase : virtual public SvRefBase
-#endif
-*/
+
 class TOOLS_DLLPUBLIC SvRttiBase : public SvRefBase
 {
 public:
diff --git a/tools/inc/tools/simplerm.hxx b/tools/inc/tools/simplerm.hxx
index c16fe41abc0b..6b8f31147f96 100644
--- a/tools/inc/tools/simplerm.hxx
+++ b/tools/inc/tools/simplerm.hxx
@@ -46,7 +46,7 @@ class InternalResMgr;
 class TOOLS_DLLPUBLIC SimpleResMgr
 {
 protected:
-    NAMESPACE_VOS(OMutex)   m_aAccessSafety;
+    vos::OMutex m_aAccessSafety;
     InternalResMgr*         m_pResImpl;
 
 public:
diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index 096d34d05b9e..cc7c189fbf84 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -275,42 +275,6 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
 
 /* dll file extensions *******************************************************/
 
-/* many of these platforms are historic */
-#define SYSTEM_WINMSCI       1
-#define SYSTEM_WNTMSCI       2
-#define SYSTEM_WNTMSCA       3
-#define SYSTEM_WNTMSCP       4
-#define SYSTEM_WNTMSCM       5
-#define SYSTEM_OS2BLCI       6
-#define SYSTEM_OS2ICCI       7
-#define SYSTEM_OS2ICCI3      8
-#define SYSTEM_UNXLNXI       9
-#define SYSTEM_UNXSOLS      10
-#define SYSTEM_UNXBSDI      11
-#define SYSTEM_UNXBSDA      12
-#define SYSTEM_UNXSCOI      13
-#define SYSTEM_UNXAIXP      14
-#define SYSTEM_UNXHPXR      15
-#define SYSTEM_UNXSNIM      16
-#define SYSTEM_UNXMVSG      17
-#define SYSTEM_UNXIRXM      18
-// #define SYSTEM_MACOSP        19
-#define SYSTEM_UNXFBSDI     20
-#define SYSTEM_UNXSOLI      21
-#define SYSTEM_WINBLCI      22
-#define SYSTEM_UNXMACXP     23
-#define SYSTEM_UNXLNXP      24
-#define SYSTEM_UNXBSDS      25
-#define SYSTEM_UNXLNXR      26
-#define SYSTEM_UNXLNX3      28
-#define SYSTEM_UNXLNXS      29
-#define SYSTEM_UNXLNXX      30
-#define SYSTEM_UNXSOGS      31
-#define SYSTEM_UNXSOGI      32
-#define SYSTEM_UNXMACXI     33
-#define SYSTEM_OS2GCCI      34
-#define SYSTEM_WNTGCCI      99
-
 #if defined WNT
 #if defined(__MINGW32__)
   #define __DLLEXTENSION    "gi"
@@ -383,7 +347,6 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
 
 // -----------------------------------------------------------------------
 
-#define NOOLDSTRING
 #ifndef NOREPLACESTRING
 #define UniString       String
 #define XubString       String
@@ -409,7 +372,7 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
 #define LIBRARY_CONCAT4( s1, s2, s3, s4 ) \
     s1 s2 s3 s4
 
-#if defined WIN || defined WNT || defined OS2
+#if defined WNT || defined OS2
 #define SVLIBRARY( Base ) \
     LIBRARY_CONCAT3( Base, __DLLEXTENSION, ".DLL" )
 #define SVLIBRARYLANG( Base, Lang ) \
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 8b86a1835596..1e438a1296b6 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -441,14 +441,6 @@ typedef struct _UniStringData
 #pragma pack()
 #endif
 
-// -------------------
-// - UniString-Types -
-// -------------------
-
-#ifndef NOOLDSTRING
-#define WSTRING_MAXLEN      STRING_MAXLEN
-#endif
-
 // -------------
 // - UniString -
 // -------------
diff --git a/tools/inc/tools/urlkeys.hxx b/tools/inc/tools/urlkeys.hxx
deleted file mode 100644
index 28122657b7d4..000000000000
--- a/tools/inc/tools/urlkeys.hxx
+++ /dev/null
@@ -1,77 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __URLKEYS_HXX
-#define __URLKEYS_HXX
-
-// Defines for common keys in URL files
-
-// ANSI version
-
-#define A_URLSECTION_SHORTCUT   "InternetShortcut"
-#define A_URLKEY_URL            "URL"
-#define A_URLKEY_TITLE          "Title"
-#define A_URLKEY_TARGET         "Target"
-#define A_URLKEY_FRAME          "Frame"
-#define A_URLKEY_OPENAS         "OpenAs"
-#define A_URLKEY_SOICON         "SOIcon"
-#define A_URLKEY_WIN_ICONFILE   "IconFile"
-#define A_URLKEY_WIN_ICONINDEX  "IconIndex"
-#define A_URLKEY_WORKDIR        "WorkingDirectory"
-#define A_URLKEY_ARGUMENTS      "Arguments"
-#define A_URLKEY_INTERN_ORIGURL "[URL]"
-
-// Unicode version
-
-#define U_URLSECTION_SHORTCUT   L"InternetShortcut"
-#define U_URLKEY_URL            L"URL"
-#define U_URLKEY_TITLE          L"Title"
-#define U_URLKEY_TARGET         L"Target"
-#define U_URLKEY_FRAME          L"Frame"
-#define U_URLKEY_OPENAS         L"OpenAs"
-#define U_URLKEY_SOICON         L"SOIcon"
-#define U_URLKEY_WIN_ICONFILE   L"IconFile"
-#define U_URLKEY_WIN_ICONINDEX  L"IconIndex"
-#define U_URLKEY_WORKDIR        L"WorkingDirectory"
-#define U_URLKEY_ARGUMENTS      L"Arguments"
-#define U_URLKEY_INTERN_ORIGURL L"[URL]"
-
-#   define URLSECTION_SHORTCUT  U_URLSECTION_SHORTCUT
-#   define URLKEY_URL           U_URLKEY_URL
-#   define URLKEY_TITLE         U_URLKEY_TITLE
-#   define URLKEY_TARGET        U_URLKEY_TARGET
-#   define URLKEY_FRAME         U_URLKEY_FRAME
-#   define URLKEY_OPENAS        U_URLKEY_OPENAS
-#   define URLKEY_SOICON        U_URLKEY_SOICON
-#   define URLKEY_WIN_ICONFILE  U_URLKEY_WIN_ICONFILE
-#   define URLKEY_WIN_ICONINDEX U_URLKEY_WIN_ICONINDEX
-#   define URLKEY_WORKDIR       U_URLKEY_WORKDIR
-#   define URLKEY_ARGUMENTS     U_URLKEY_ARGUMENTS
-#   define URLKEY_INTERN_ORIGURL U_URLKEY_INTERN_ORIGURL
-
-#endif // __URLKEYS_HXX
-
diff --git a/tools/prj/d.lst b/tools/prj/d.lst
index e0291c2f8ad0..f2c508342015 100644
--- a/tools/prj/d.lst
+++ b/tools/prj/d.lst
@@ -34,9 +34,6 @@ mkdir: %_DEST%\inc%_EXT%\bootstrp
 ..\inc\tools\postx.h %_DEST%\inc%_EXT%\tools\postx.h
 ..\inc\tools\prex.h %_DEST%\inc%_EXT%\tools\prex.h
 
-..\inc\tools\postextstl.h %_DEST%\inc%_EXT%\tools\postextstl.h
-..\inc\tools\preextstl.h %_DEST%\inc%_EXT%\tools\preextstl.h
-
 ..\inc\tools\svlibrary.hxx %_DEST%\inc%_EXT%\tools\svlibrary.hxx
 ..\inc\tools\solarmutex.hxx %_DEST%\inc%_EXT%\tools\solarmutex.hxx
 ..\inc\tools\wintypes.hxx %_DEST%\inc%_EXT%\tools\wintypes.hxx
@@ -48,7 +45,6 @@ mkdir: %_DEST%\inc%_EXT%\bootstrp
 ..\inc\tools\appendunixshellword.hxx %_DEST%\inc%_EXT%\tools\appendunixshellword.hxx
 ..\inc\tools\bigint.hxx %_DEST%\inc%_EXT%\tools\bigint.hxx
 ..\inc\tools\cachestr.hxx %_DEST%\inc%_EXT%\tools\cachestr.hxx
-..\inc\tools\chapi.hxx %_DEST%\inc%_EXT%\tools\chapi.hxx
 ..\inc\tools\color.hxx %_DEST%\inc%_EXT%\tools\color.hxx
 ..\inc\tools\contnr.hxx %_DEST%\inc%_EXT%\tools\contnr.hxx
 ..\inc\tools\date.hxx %_DEST%\inc%_EXT%\tools\date.hxx
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 1bd43bffc4e7..74a2142db692 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -136,13 +136,13 @@ BOOL bInRedirection = TRUE;
 #else
 BOOL bInRedirection = FALSE;
 #endif
-static NAMESPACE_VOS( OMutex )* pRedirectMutex = 0;
+static vos:: OMutex * pRedirectMutex = 0;
 
 //------------------------------------------------------------------------
 void FSysRedirector::Register( FSysRedirector *pRedirector )
 {
         if ( pRedirector )
-                pRedirectMutex = new NAMESPACE_VOS( OMutex );
+                pRedirectMutex = new vos:: OMutex ;
         else
                 DELETEZ( pRedirectMutex );
         _pRedirector = pRedirector;
@@ -165,7 +165,7 @@ void FSysRedirector::DoRedirect( String &rPath )
         // Redirection is acessible only by one thread per time
         // dont move the guard behind the bInRedirection check!!!
         // think of nested calls (when called from callback)
-        NAMESPACE_VOS( OGuard ) aGuard( pRedirectMutex );
+        vos:: OGuard  aGuard( pRedirectMutex );
 
         // if already in redirection, dont redirect
         if ( bInRedirection )
@@ -1040,8 +1040,8 @@ DirEntry* DirEntry::ImpChangeParent( DirEntry* pNewParent, BOOL bNormalize )
 BOOL DirEntry::Exists( FSysAccess nAccess ) const
 {
 #ifndef BOOTSTRAP
-    static NAMESPACE_VOS(OMutex) aLocalMutex;
-    NAMESPACE_VOS(OGuard) aGuard( aLocalMutex );
+    static vos::OMutex aLocalMutex;
+    vos::OGuard aGuard( aLocalMutex );
 #endif
         if ( !IsValid() )
                 return FALSE;
diff --git a/tools/source/fsys/fstat.cxx b/tools/source/fsys/fstat.cxx
index acdbe6bae510..a55c56b6efbb 100644
--- a/tools/source/fsys/fstat.cxx
+++ b/tools/source/fsys/fstat.cxx
@@ -28,11 +28,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_tools.hxx"
 
-#if defined( WIN)
-#include <stdio.h>
-#include <dos.h>
-#endif
-
 #ifdef UNX
 #include <errno.h>
 #endif
diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx
index 37e9dedf9259..5dc41f292668 100644
--- a/tools/source/generic/color.cxx
+++ b/tools/source/generic/color.cxx
@@ -244,8 +244,8 @@ ColorData Color::HSBtoRGB( USHORT nHue, USHORT nSat, USHORT nBri )
         f = dH - n;
 
         UINT8 a = (UINT8) ( nB * ( 100 - nSat ) / 100 );
-        UINT8 b = (UINT8) ( nB * ( 100 - ( (double)nSat * f + 0.5 ) ) / 100 );
-        UINT8 c = (UINT8) ( nB * ( 100 - ( (double)nSat * ( 1.0 - f ) + 0.5 ) ) / 100 );
+        UINT8 b = (UINT8) ( nB * ( 100 - ( (double)nSat * f ) ) / 100 );
+        UINT8 c = (UINT8) ( nB * ( 100 - ( (double)nSat * ( 1.0 - f ) ) ) / 100 );
 
         switch( n )
         {
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 2290cfdbe7c2..e9f98b07adbd 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -243,6 +243,11 @@ void ImplPolygon::ImplSetSize( USHORT nNewSize, BOOL bResize )
 void ImplPolygon::ImplSplit( USHORT nPos, USHORT nSpace, ImplPolygon* pInitPoly )
 {
     const ULONG     nSpaceSize = nSpace * sizeof( Point );
+
+    //Can't fit this in :-(, throw ?
+    if (mnPoints + nSpace > USHRT_MAX)
+        return;
+
     const USHORT    nNewSize = mnPoints + nSpace;
 
     if( nPos >= mnPoints )
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 44ea4024f211..2e6401f5a19f 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -838,18 +838,18 @@ void ResMgr::RscError_Impl( const sal_Char* pMessage, ResMgr* pResMgr,
 
 static void RscException_Impl()
 {
-    switch ( NAMESPACE_VOS(OSignalHandler)::raise( OSL_SIGNAL_USER_RESOURCEFAILURE, (void*)"" ) )
+    switch ( vos::OSignalHandler::raise( OSL_SIGNAL_USER_RESOURCEFAILURE, (void*)"" ) )
     {
-        case NAMESPACE_VOS(OSignalHandler)::TAction_CallNextHandler:
+        case vos::OSignalHandler::TAction_CallNextHandler:
             abort();
 
-        case NAMESPACE_VOS(OSignalHandler)::TAction_Ignore:
+        case vos::OSignalHandler::TAction_Ignore:
             return;
 
-        case NAMESPACE_VOS(OSignalHandler)::TAction_AbortApplication:
+        case vos::OSignalHandler::TAction_AbortApplication:
             abort();
 
-        case NAMESPACE_VOS(OSignalHandler)::TAction_KillApplication:
+        case vos::OSignalHandler::TAction_KillApplication:
             exit(-1);
     }
 }
@@ -1965,7 +1965,7 @@ SimpleResMgr* SimpleResMgr::Create( const sal_Char* pPrefixName, com::sun::star:
 // -----------------------------------------------------------------------
 bool SimpleResMgr::IsAvailable( RESOURCE_TYPE _resourceType, sal_uInt32 _resourceId )
 {
-    NAMESPACE_VOS(OGuard) aGuard(m_aAccessSafety);
+    vos::OGuard aGuard(m_aAccessSafety);
 
     if ( ( RSC_STRING != _resourceType ) && ( RSC_RESOURCE != _resourceType ) )
         return false;
@@ -1977,7 +1977,7 @@ bool SimpleResMgr::IsAvailable( RESOURCE_TYPE _resourceType, sal_uInt32 _resourc
 // -----------------------------------------------------------------------
 UniString SimpleResMgr::ReadString( sal_uInt32 nId )
 {
-    NAMESPACE_VOS(OGuard) aGuard(m_aAccessSafety);
+    vos::OGuard aGuard(m_aAccessSafety);
 
     DBG_ASSERT( m_pResImpl, "SimpleResMgr::ReadString : have no impl class !" );
     // perhaps constructed with an invalid filename ?
@@ -2048,7 +2048,7 @@ const ::com::sun::star::lang::Locale& SimpleResMgr::GetLocale() const
 
 sal_uInt32 SimpleResMgr::ReadBlob( sal_uInt32 nId, void** pBuffer )
 {
-    NAMESPACE_VOS(OGuard) aGuard(m_aAccessSafety);
+    vos::OGuard aGuard(m_aAccessSafety);
 
     DBG_ASSERT( m_pResImpl, "SimpleResMgr::ReadBlob : have no impl class !" );
 
diff --git a/tools/source/solar/makefile.mk b/tools/source/solar/makefile.mk
deleted file mode 100644
index 6f5dd85c608b..000000000000
--- a/tools/source/solar/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=tools
-TARGET=mksvconf
-TARGETTYPE=CUI
-
-LIBSALCPPRT=$(0)
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-CFILES=		solar.c
-
-OBJFILES=   $(OBJ)$/solar.obj
-
-APP1TARGET=	$(TARGET)
-APP1OBJS=	$(OBJFILES)
-APP1STDLIBS=
-APP1DEPN=
-APP1DEF=
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(L10N-framework)"==""
-ALLTAR : $(INCCOM)$/svconf.h
-.ENDIF			# "$(L10N-framework)"==""
-
-$(INCCOM)$/svconf.h : $(BIN)$/$(TARGET)
-    $(BIN)$/$(TARGET) $@
-
diff --git a/tools/source/solar/solar.c b/tools/source/solar/solar.c
deleted file mode 100644
index 608f0baf5129..000000000000
--- a/tools/source/solar/solar.c
+++ /dev/null
@@ -1,562 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/* POSIX defines that a program is undefined after a SIG_SEGV.  The
- * code stopped working on Linux Kernel 2.6 so I have moved this back to
- * use FORK.
- * If at a later time the signals work correctly with the Linux Kernel 2.6
- * then this change may be reverted although not strictly posix safe. */
-#define USE_FORK_TO_CHECK 1
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-
-#include <unistd.h>
-#include <sys/types.h>
-
-#define I_STDARG
-#ifdef I_STDARG
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-#define NO_USE_FORK_TO_CHECK
-#ifdef USE_FORK_TO_CHECK
-#include <sys/wait.h>
-#else
-#include <signal.h>
-#include <setjmp.h>
-#endif
-
-#define printTypeSize(Type,Name)    printf( "sizeof(%s)\t= %d\n", Name, sizeof (Type) )
-
-#define isSignedType(Type)  (((Type)-1) < 0)
-#define printTypeSign(Type,Name)    printf( "%s\t= %s %s\n", Name, ( isSignedType(Type) ? "signed" : "unsigned" ), Name )
-
-
-/*************************************************************************
-|*
-|*  IsBigEndian()
-|*
-|*  Beschreibung        True, wenn CPU BigEndian ist
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-int IsBigEndian()
-{
-  long l = 1;
-  return ! *(char*)&l;
-}
-
-/*************************************************************************
-|*
-|*  IsStackGrowingDown()
-|*
-|*  Beschreibung        True, wenn der Stack nach unten waechst
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-int IsStackGrowingDown_2( int * pI )
-{
-  int i = 1;
-  return ((unsigned long)&i) < (unsigned long)pI;
-}
-
-int IsStackGrowingDown()
-{
-  int i = 1;
-  return IsStackGrowingDown_2(&i);
-}
-
-/*************************************************************************
-|*
-|*  GetStackAlignment()
-|*
-|*  Beschreibung        Alignment von char Parametern, die (hoffentlich)
-|*                      ueber den Stack uebergeben werden
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-int GetStackAlignment_3( char*p, long l, int i, short s, char b, char c, ... )
-{
-  if ( IsStackGrowingDown() )
-    return &c - &b;
-  else
-    return &b - &c;
-}
-
-int GetStackAlignment_2( char*p, long l, int i, short s, char b, char c )
-{
-  if ( IsStackGrowingDown() )
-    return &c - &b;
-  else
-    return &b - &c;
-}
-
-int GetStackAlignment()
-{
-  int nStackAlignment = GetStackAlignment_3(0,1,2,3,4,5);
-  if ( nStackAlignment != GetStackAlignment_2(0,1,2,3,4,5) )
-    printf( "Pascal calling convention\n" );
-  return nStackAlignment;
-}
-
-
-/*************************************************************************
-|*
-|*  Typdeclarations for memory access test functions
-|*
-*************************************************************************/
-typedef enum { t_char, t_short, t_int, t_long, t_double } Type;
-typedef int (*TestFunc)( Type, void* );
-
-
-/*************************************************************************
-|*
-|*  PrintArgs()
-|*
-|*  Beschreibung        Testfunktion fuer variable Parameter
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-#ifdef I_STDARG
-void PrintArgs( int p, ... )
-#else
-void PrintArgs( p, va_alist )
-int p;
-va_dcl
-#endif
-{
-    int value;
-    va_list ap;
-
-#ifdef I_STDARG
-    va_start( ap, p );
-#else
-    va_start( ap );
-#endif
-
-    printf( "value = %d", p );
-
-    while ( ( value = va_arg(ap, int) ) != 0 )
-      printf( " %d", value );
-
-    printf( "\n" );
-    va_end(ap);
-}
-
-#ifndef USE_FORK_TO_CHECK
-/*************************************************************************
-|*
-|*  SignalHdl()
-|*
-|*  Beschreibung        faengt SIGBUS und SIGSEGV in check() ab
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-static jmp_buf check_env;
-static int bSignal;
-void SignalHdl( int sig )
-{
-  bSignal = 1;
-
-  fprintf( stderr, "Signal %d caught\n", sig );
-  signal( SIGSEGV,  SIG_DFL );
-  signal( SIGBUS,   SIG_DFL );
-  siglongjmp( check_env, sig );
-}
-#endif
-
-/*************************************************************************
-|*
-|*  check()
-|*
-|*  Beschreibung        Testet MemoryZugriff (read/write)
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-int check( TestFunc func, Type eT, void* p )
-{
-#ifdef USE_FORK_TO_CHECK
-  pid_t nChild = fork();
-  if ( nChild )
-  {
-    int exitVal;
-    wait( &exitVal );
-    if ( exitVal & 0xff )
-      return -1;
-    else
-      return exitVal >> 8;
-  }
-  else
-  {
-    exit( func( eT, p ) );
-  }
-#else
-  int result;
-
-  bSignal = 0;
-
-  if ( !sigsetjmp( check_env, 1 ) )
-  {
-    signal( SIGSEGV,    SignalHdl );
-    signal( SIGBUS,     SignalHdl );
-    result = func( eT, p );
-    signal( SIGSEGV,    SIG_DFL );
-    signal( SIGBUS,     SIG_DFL );
-  }
-
-  if ( bSignal )
-    return -1;
-  else
-    return 0;
-#endif
-}
-
-/*************************************************************************
-|*
-|*  GetAtAddress()
-|*
-|*  Beschreibung        memory read access
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-int GetAtAddress( Type eT, void* p )
-{
-  switch ( eT )
-  {
-  case t_char:      return *((char*)p);
-  case t_short:     return *((short*)p);
-  case t_int:       return *((int*)p);
-  case t_long:      return *((long*)p);
-  case t_double:    return *((double*)p);
-  }
-  abort();
-}
-
-/*************************************************************************
-|*
-|*  SetAtAddress()
-|*
-|*  Beschreibung        memory write access
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-int SetAtAddress( Type eT, void* p )
-{
-  switch ( eT )
-  {
-  case t_char:      return *((char*)p)  = 0;
-  case t_short:     return *((short*)p) = 0;
-  case t_int:       return *((int*)p)   = 0;
-  case t_long:      return *((long*)p)  = 0;
-  case t_double:    return *((double*)p)= 0;
-  }
-  abort();
-}
-
-char* TypeName( Type eT )
-{
-  switch ( eT )
-  {
-  case t_char:      return "char";
-  case t_short:     return "short";
-  case t_int:       return "int";
-  case t_long:      return "long";
-  case t_double:    return "double";
-  }
-  abort();
-}
-
-/*************************************************************************
-|*
-|*  Check(Get|Set)Access()
-|*
-|*  Beschreibung        Testet MemoryZugriff (read/write)
-|*                      Zugriffsverletzungen werden abgefangen
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-int CheckGetAccess( Type eT, void* p )
-{
-  int b;
-  b = -1 != check( (TestFunc)GetAtAddress, eT, p );
-#if OSL_DEBUG_LEVEL > 1
-  fprintf( stderr,
-           "%s read %s at %p\n",
-           (b? "can" : "can not" ), TypeName(eT), p );
-#endif
-  return b;
-}
-int CheckSetAccess( Type eT, void* p )
-{
-  int b;
-
-  b = -1 != check( (TestFunc)SetAtAddress, eT, p );
-#if OSL_DEBUG_LEVEL > 1
-  fprintf( stderr,
-           "%s write %s at %p\n",
-           (b? "can" : "can not" ), TypeName(eT), p );
-#endif
-  return b;
-}
-
-/*************************************************************************
-|*
-|*  GetAlignment()
-|*
-|*  Beschreibung        Bestimmt das Alignment verschiedener Typen
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-int GetAlignment( Type eT )
-{
-  char  a[ 16*8 ];
-  long  p = (long)(void*)a;
-  int   i;
-
-  /* clear a[...] to set legal value for double access */
-  for ( i = 0; i < 16*8; i++ )
-    a[i] = 0;
-
-  p = ( p + 0xF ) & ~0xF;
-  for ( i = 1; i < 16; i++ )
-    if ( CheckGetAccess( eT, (void*)(p+i) ) )
-      return i;
-  return 0;
-}
-
-/*************************************************************************
-|*
-|*  struct Description
-|*
-|*  Beschreibung        Beschreibt die Parameter der Architektur
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-struct Description
-{
-  int   bBigEndian;
-  int   bStackGrowsDown;
-  int   nStackAlignment;
-  int   nAlignment[3];  /* 2,4,8 */
-};
-
-/*************************************************************************
-|*
-|*  Description_Ctor()
-|*
-|*  Beschreibung        Bestimmt die Parameter der Architektur
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-void Description_Ctor( struct Description* pThis )
-{
-  pThis->bBigEndian         = IsBigEndian();
-  pThis->bStackGrowsDown    = IsStackGrowingDown();
-  pThis->nStackAlignment    = GetStackAlignment();
-
-  if ( sizeof(short) != 2 )
-    abort();
-  pThis->nAlignment[0] = GetAlignment( t_short );
-  if ( sizeof(int) != 4 )
-    abort();
-  pThis->nAlignment[1] = GetAlignment( t_int );
-
-  if      ( sizeof(long) == 8 )
-    pThis->nAlignment[2] = GetAlignment( t_long );
-  else if ( sizeof(double) == 8 )
-    pThis->nAlignment[2] = GetAlignment( t_double );
-  else
-    abort();
-}
-
-/*************************************************************************
-|*
-|*  Description_Print()
-|*
-|*  Beschreibung        Schreibt die Parameter der Architektur als Header
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-void Description_Print( struct Description* pThis, char* name )
-{
-  int i;
-  FILE* f = fopen( name, "w" );
-  if( ! f ) {
-      fprintf( stderr, "Unable to open file %s: %s\n", name, strerror( errno ) );
-      exit( 99 );
-  }
-  fprintf( f, "#define __%s\n",
-           pThis->bBigEndian ? "BIGENDIAN" : "LITTLEENDIAN" );
-  for ( i = 0; i < 3; i++ )
-    fprintf( f, "#define __ALIGNMENT%d\t%d\n",
-             1 << (i+1), pThis->nAlignment[i] );
-  fprintf( f, "/* Stack alignment is not used... */\n" );
-  fprintf( f, "#define __STACKALIGNMENT\t%d\n", pThis->nStackAlignment );
-  fprintf( f, "#define __STACKDIRECTION\t%d\n",
-           pThis->bStackGrowsDown ? -1 : 1 );
-  fprintf( f, "#define __SIZEOFCHAR\t%d\n", sizeof( char ) );
-  fprintf( f, "#define __SIZEOFSHORT\t%d\n", sizeof( short ) );
-  fprintf( f, "#define __SIZEOFINT\t%d\n", sizeof( int ) );
-  fprintf( f, "#define __SIZEOFLONG\t%d\n", sizeof( long ) );
-  fprintf( f, "#define __SIZEOFPOINTER\t%d\n", sizeof( void* ) );
-  fprintf( f, "#define __SIZEOFDOUBLE\t%d\n", sizeof( double ) );
-  fprintf( f, "#define __IEEEDOUBLE\n" );
-  fclose( f );
-}
-
-/*************************************************************************
-|*
-|*  InfoMemoryAccess()
-|*
-|*  Beschreibung        Informeller Bytezugriffstest
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-void InfoMemoryAccess( char* p )
-{
-  if ( CheckGetAccess( t_char, p ) )
-    printf( "can read address %p\n", p );
-  else
-    printf( "can not read address %p\n", p );
-
-  if ( CheckSetAccess( t_char, p ) )
-    printf( "can write address %p\n", p );
-  else
-    printf( "can not write address %p\n", p );
-}
-
-/*************************************************************************
-|*
-|*  InfoMemoryTypeAccess()
-|*
-|*  Beschreibung        Informeller Zugriffstest verschiedener Typen
-|*
-|*  Ersterstellung      EG 15.08.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-void InfoMemoryTypeAccess( Type eT )
-{
-  char  a[64];
-  int   i;
-
-  /* clear a[...] to set legal value for double access */
-  for ( i = 0; i < 64; i++ )
-    a[i] = 0;
-
-  for ( i = 56; i >= 7; i >>= 1 )
-  {
-    printf( "Zugriff %s auf %i-Aligned Adresse : ", TypeName( eT ), i / 7 );
-    printf( ( CheckGetAccess( eT, (long*)&a[i] ) ? "OK\n" : "ERROR\n" ) );
-  }
-}
-/************************************************************************
- *
- *  Use C code to determine the characteristics of the building platform.
- *
- ************************************************************************/
-int main( int argc, char* argv[] )
-{
-  printTypeSign( char, "char" );
-  printTypeSign( short, "short" );
-  printTypeSign( int, "int" );
-  printTypeSign( long, "long" );
-
-  printTypeSize( char, "char" );
-  printTypeSize( short, "short" );
-  printTypeSize( int, "int" );
-  printTypeSize( long, "long" );
-  printTypeSize( float, "float" );
-  printTypeSize( double, "double" );
-  printTypeSize( void *, "void *" );
-
-  if ( IsBigEndian() )
-    printf( "BIGENDIAN (Sparc, MC680x0, RS6000, IP22, IP32, g3)\n" );
-  else
-    printf( "LITTLEENDIAN (Intel, VAX, PowerPC)\n" );
-
-  if( IsStackGrowingDown() )
-    printf( "Stack waechst nach unten\n" );
-  else
-    printf( "Stack waechst nach oben\n" );
-
-  printf( "STACKALIGNMENT   : %d\n", GetStackAlignment() );
-
-  /* PrintArgs( 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 ); */
-
-  if ( argc > 1 )
-  {
-    struct Description description;
-    Description_Ctor( &description );
-    Description_Print( &description, argv[1] );
-  }
-  {
-    char* p = NULL;
-    InfoMemoryAccess( p );
-    p = (char*)&p;
-    InfoMemoryAccess( p );
-    InfoMemoryTypeAccess( t_short );
-    InfoMemoryTypeAccess( t_int );
-    InfoMemoryTypeAccess( t_long );
-    InfoMemoryTypeAccess( t_double );
-  }
-
-  exit( 0 );
-}
diff --git a/tools/source/stream/strmos2.cxx b/tools/source/stream/strmos2.cxx
index d211d7790b08..a35fc7731767 100644
--- a/tools/source/stream/strmos2.cxx
+++ b/tools/source/stream/strmos2.cxx
@@ -757,108 +757,4 @@ void SvFileStream::SetSize( ULONG nSize )
     }
 }
 
-#if 0
-/*************************************************************************
-|*
-|*    SvSharedMemoryStream::AllocateMemory()
-|*
-|*    Beschreibung      STREAM.SDW
-|*    Ersterstellung    CL 05.05.95
-|*    Letzte Aenderung  CL 05.05.95
-|*
-*************************************************************************/
-
-sal_Bool SvSharedMemoryStream::AllocateMemory( ULONG nNewSize )
-{
-        DBG_ASSERT(aHandle==0,"Keine Handles unter OS/2");
-        DBG_ASSERT(nNewSize,"Cannot allocate zero Bytes");
-        APIRET nRet = DosAllocSharedMem( (void**)&pBuf, (PSZ)NULL, nNewSize,
-                                     PAG_READ | PAG_WRITE | PAG_COMMIT |
-                                     OBJ_GIVEABLE | OBJ_GETTABLE | OBJ_ANY);
-    return( nRet == 0 );
-}
-
-/*************************************************************************
-|*
-|*    SvSharedMemoryStream::ReAllocateMemory()   (Bozo-Algorithmus)
-|*
-|*    Beschreibung      STREAM.SDW
-|*    Ersterstellung    CL 05.05.95
-|*    Letzte Aenderung  CL 05.05.95
-|*
-*************************************************************************/
-
-sal_Bool SvSharedMemoryStream::ReAllocateMemory( long nDiff )
-{
-    DBG_ASSERT(aHandle==0,"Keine Handles unter OS/2");
-    sal_Bool bRetVal    = FALSE;
-    ULONG nNewSize  = nSize + nDiff;
-        if( nNewSize )
-        {
-                // neuen Speicher nicht ueber AllocateMemory holen, da wir den
-                // alten Speicher behalten wollen, falls nicht genuegend Platz
-                // fuer den neuen Block da ist
-                char* pNewBuf;
-            APIRET nRet = DosAllocSharedMem( (void**)&pNewBuf,(PSZ)NULL,nNewSize,
-                                PAG_READ | PAG_WRITE | PAG_COMMIT |
-                                OBJ_GIVEABLE | OBJ_GETTABLE | OBJ_ANY);
-            DBG_ASSERT(!nRet,"DosAllocSharedMem failed");
-
-            if( !nRet )
-            {
-                bRetVal = TRUE; // Success!
-                if( nNewSize < nSize )      // Verkleinern ?
-                {
-                    memcpy( pNewBuf, pBuf, (size_t)nNewSize );
-                    if( nPos > nNewSize )
-                        nPos = 0L;
-                    if( nEndOfData >= nNewSize )
-                        nEndOfData = nNewSize-1L;
-                }
-                else
-                    memcpy( pNewBuf, pBuf, (size_t)nSize );
-
-                FreeMemory(); // den alten Block loeschen ...
 
-                // und den neuen Block in Dienst stellen
-                pBuf  = (sal_uInt8*)pNewBuf;
-                nSize = nNewSize;
-            }
-        }
-        else
-        {
-                bRetVal = TRUE;
-                FreeMemory();
-                pBuf = 0;
-                nSize = 0;
-                nEndOfData = 0;
-        }
-    return bRetVal;
-}
-
-void SvSharedMemoryStream::FreeMemory()
-{
-    DBG_ASSERT(aHandle==0,"Keine Handles unter OS/2");
-    DosFreeMem( pBuf );
-}
-
-/*************************************************************************
-|*
-|*    SvSharedMemoryStream::SetHandle()
-|*
-|*    Beschreibung      STREAM.SDW
-|*    Ersterstellung    OV 05.10.95
-|*    Letzte Aenderung  OV 05.10.95
-|*
-*************************************************************************/
-
-void* SvSharedMemoryStream::SetHandle( void* aNewHandle, sal_Size nSize,
-                                       sal_Bool bOwnsData, sal_Size nEOF )
-{
-    DBG_ERROR("OS/2 does not support memory handles");
-    // return SetBuffer(aNewHandle, nSize, bOwnsData, nEOF );
-    return 0;
-}
-
-
-#endif // 0
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 88ccb2113e0d..f3c5d642ed6e 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -60,7 +60,7 @@ DECLARE_LIST( InternalStreamLockList, InternalStreamLock* )
 namespace { struct LockList : public rtl::Static< InternalStreamLockList, LockList > {}; }
 
 #ifndef BOOTSTRAP
-namespace { struct LockMutex : public rtl::Static< NAMESPACE_VOS(OMutex), LockMutex > {}; }
+namespace { struct LockMutex : public rtl::Static< vos::OMutex, LockMutex > {}; }
 #endif
 
 class InternalStreamLock
@@ -111,7 +111,7 @@ InternalStreamLock::~InternalStreamLock()
 sal_Bool InternalStreamLock::LockFile( sal_Size nStart, sal_Size nEnd, SvFileStream* pStream )
 {
 #ifndef BOOTSTRAP
-    NAMESPACE_VOS( OGuard ) aGuard( LockMutex::get() );
+    vos:: OGuard  aGuard( LockMutex::get() );
 #endif
     ByteString aFileName(pStream->GetFileName(), osl_getThreadTextEncoding());
     struct stat aStat;
@@ -161,7 +161,7 @@ sal_Bool InternalStreamLock::LockFile( sal_Size nStart, sal_Size nEnd, SvFileStr
 void InternalStreamLock::UnlockFile( sal_Size nStart, sal_Size nEnd, SvFileStream* pStream )
 {
 #ifndef BOOTSTRAP
-    NAMESPACE_VOS( OGuard ) aGuard( LockMutex::get() );
+    vos:: OGuard  aGuard( LockMutex::get() );
 #endif
     InternalStreamLock* pLock = NULL;
     InternalStreamLockList &rLockList = LockList::get();
diff --git a/tools/source/testtoolloader/testtoolloader.cxx b/tools/source/testtoolloader/testtoolloader.cxx
index ca269ef6eea2..21a1a715dc08 100644
--- a/tools/source/testtoolloader/testtoolloader.cxx
+++ b/tools/source/testtoolloader/testtoolloader.cxx
@@ -56,16 +56,16 @@ static bool bLoggerStarted = false;
 
 sal_uInt32 GetCommandLineParamCount()
 {
-    NAMESPACE_VOS( OStartupInfo ) aStartInfo;
+    vos:: OStartupInfo  aStartInfo;
     return aStartInfo.getCommandArgCount();
 }
 
 String GetCommandLineParam( sal_uInt32 nParam )
 {
-    NAMESPACE_VOS( OStartupInfo ) aStartInfo;
+    vos:: OStartupInfo  aStartInfo;
     ::rtl::OUString aParam;
-    NAMESPACE_VOS( OStartupInfo )::TStartupError eError = aStartInfo.getCommandArg( nParam, aParam );
-    if ( eError == NAMESPACE_VOS( OStartupInfo )::E_None )
+    vos:: OStartupInfo ::TStartupError eError = aStartInfo.getCommandArg( nParam, aParam );
+    if ( eError == vos:: OStartupInfo ::E_None )
         return String( aParam );
     else
     {
diff --git a/tools/win/inc/dll.hxx b/tools/win/inc/dll.hxx
index 2a91aefc0fa9..f28b07974c61 100644
--- a/tools/win/inc/dll.hxx
+++ b/tools/win/inc/dll.hxx
@@ -28,31 +28,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 -
-// -------------------------------
-
 // Um Resourcen wieder freizugeben
 inline void ImpDeInitWinTools() {}
 
diff --git a/tools/win/inc/toolsdll.hxx b/tools/win/inc/toolsdll.hxx
deleted file mode 100644
index a6b1546763bc..000000000000
--- a/tools/win/inc/toolsdll.hxx
+++ /dev/null
@@ -1,88 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _TOOLSDLL_HXX
-#define _TOOLSDLL_HXX
-
-#ifdef WIN
-
-#ifndef _STRING_H
-#include <string.h>
-#endif
-#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
-
-#endif // _DLL_HXX
diff --git a/tools/win/source/dll/toolsdll.cxx b/tools/win/source/dll/toolsdll.cxx
index 8fc9888021bb..3d934edfe71d 100644
--- a/tools/win/source/dll/toolsdll.cxx
+++ b/tools/win/source/dll/toolsdll.cxx
@@ -29,7 +29,6 @@
 #include "precompiled_tools.hxx"
 #include <tools/svwin.h>
 #include <dll.hxx>
-#include <toolsdll.hxx>
 #include <tools/shl.hxx>
 
 // =======================================================================