CWS gnumake: resync to m91; conflicts unresolved

19 files changed, 202 insertions, 554 deletions

diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx
index 4b1ff91feb7b..a6ef7338472b 100644
--- a/tools/inc/bootstrp/prj.hxx
+++ b/tools/inc/bootstrp/prj.hxx
@@ -55,4 +55,188 @@ public:
     ByteString          GetCleanedNextLine( BOOL bReadComments = FALSE );
 };
 
+<<<<<<< local
+=======
+#define ENV_GUI     0x00000000
+#define ENV_OS      0x00000001
+#define ENV_UPD     0x00000002
+#define ENV_UPDMIN  0x00000004
+#define ENV_INPATH  0x00000008
+#define ENV_OUTPATH 0x00000010
+#define ENV_GUIBASE 0x00000020
+#define ENV_CVER    0x00000040
+#define ENV_GVER    0x00000080
+#define ENV_GUIENV  0x00000100
+#define ENV_CPU     0x00000200
+#define ENV_CPUNAME 0x00000400
+#define ENV_DLLSUFF 0x00000800
+#define ENV_COMEX   0x00001000
+#define ENV_COMPATH 0x00002000
+#define ENV_INCLUDE 0x00004000
+#define ENV_LIB     0x00008000
+#define ENV_PATH    0x00010000
+#define ENV_SOLVER  0x00020000
+#define ENV_SOLENV  0x00040000
+#define ENV_SOLROOT 0x00080000
+#define ENV_DEVROOT 0x00100000
+#define ENV_EMERG   0x00200000
+#define ENV_STAND   0x00400000
+
+/*********************************************************************
+*
+*   class Prj
+*   alle Daten eines Projektes werden hier gehalten
+*
+*********************************************************************/
+
+DECL_DEST_LIST ( PrjList_tmp, PrjList, CommandData * )
+
+class Star;
+class Prj : public PrjList
+{
+friend class Star;
+private:
+    BOOL            bVisited;
+
+    ByteString          aPrjPath;
+    ByteString          aProjectName;
+    ByteString          aProjectPrefix;     // max. 2-buchstabige Abk.
+    SByteStringList*    pPrjInitialDepList;
+    SByteStringList*    pPrjDepList;
+    BOOL            bHardDependencies;
+    BOOL            bSorted;
+
+public:
+                    Prj();
+                    Prj( ByteString aName );
+                    ~Prj();
+    void            SetPreFix( ByteString aPre ){aProjectPrefix = aPre;}
+    ByteString          GetPreFix(){return aProjectPrefix;}
+    ByteString          GetProjectName()
+                            {return aProjectName;}
+    void            SetProjectName(ByteString aName)
+                            {aProjectName = aName;}
+    BOOL            InsertDirectory( ByteString aDirName , USHORT aWhat,
+                                    USHORT aWhatOS, ByteString aLogFileName,
+                                    const ByteString &rClientRestriction );
+    CommandData*    RemoveDirectory( ByteString aLogFileName );
+    CommandData*    GetDirectoryList ( USHORT nWhatOs, USHORT nCommand );
+    CommandData*    GetDirectoryData( ByteString aLogFileName );
+    inline CommandData* GetData( ByteString aLogFileName )
+                            { return GetDirectoryData( aLogFileName ); };
+
+    SByteStringList*    GetDependencies( BOOL bExpanded = TRUE );
+    void            AddDependencies( ByteString aStr );
+    void            HasHardDependencies( BOOL bHard ) { bHardDependencies = bHard; }
+    BOOL            HasHardDependencies() { return bHardDependencies; }
+};
+
+/*********************************************************************
+*
+*   class Star
+*   Diese Klasse liest die Projectstruktur aller StarDivision Projekte
+*   aus \\dev\data1\upenv\data\config\solar.lst aus
+*
+*********************************************************************/
+
+DECL_DEST_LIST ( StarList_tmp, StarList, Prj* )
+DECLARE_LIST ( SolarFileList, String* )
+
+class StarFile
+{
+private:
+    String aFileName;
+    Date aDate;
+    Time aTime;
+
+    BOOL bExists;
+
+public:
+    StarFile( const String &rFile );
+    const String &GetName() { return aFileName; }
+    Date GetDate() { return aDate; }
+    Time GetTime() { return aTime; }
+
+    BOOL NeedsUpdate();
+    BOOL Exists() { return bExists; }
+};
+
+DECLARE_LIST( StarFileList, StarFile * )
+
+#define STAR_MODE_SINGLE_PARSE          0x0000
+#define STAR_MODE_RECURSIVE_PARSE       0x0001
+#define STAR_MODE_MULTIPLE_PARSE        0x0002
+
+class Star : public StarList
+{
+private:
+    ByteString      aStarName;
+
+    static Link aDBNotFoundHdl;
+protected:
+    vos:: OMutex  aMutex;
+
+    USHORT          nStarMode;
+    SolarFileList   aFileList;
+    StarFileList    aLoadedFilesList;
+    String          sSourceRoot;
+
+    void InsertSolarList( String sProject );
+    String CreateFileName( String sProject );
+
+    void            Expand_Impl();
+    void            ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj );
+
+private:
+    void            Read( String &rFileName );
+    void            Read( SolarFileList *pSOlarFiles );
+
+public:
+                    Star();
+                    Star( String aFileName, USHORT nMode = STAR_MODE_SINGLE_PARSE );
+                    Star( SolarFileList *pSolarFiles );
+                    Star( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE,
+                        const char *pSourceRoot = NULL  );
+
+                    ~Star();
+
+    static          void SetDBNotFoundHdl( const Link &rLink ) { aDBNotFoundHdl = rLink; }
+
+    ByteString      GetName(){ return aStarName; };
+
+    BOOL            HasProject( ByteString aProjectName );
+    Prj*            GetPrj( ByteString aProjectName );
+    ByteString          GetPrjName( DirEntry &rPath );
+
+    void            InsertToken( char *pChar );
+    BOOL            NeedsUpdate();
+
+    USHORT          GetMode() { return nStarMode; }
+};
+
+class StarWriter : public Star
+{
+private:
+    USHORT          WritePrj( Prj *pPrj, SvFileStream& rStream );
+
+public:
+                    StarWriter( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE );
+                    StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE );
+                    StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE,
+                        const char *pSourceRoot = NULL );
+
+    void            CleanUp();
+
+    BOOL            InsertProject ( Prj* pNewPrj );
+    Prj*            RemoveProject ( ByteString aProjectName );
+
+    USHORT          Read( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE  );
+       USHORT           Read( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE );
+    USHORT          Write( String aFileName );
+    USHORT          WriteMultiple( String rSourceRoot );
+
+    void            InsertTokenLine( ByteString& rString );
+};
+
+>>>>>>> other
 #endif
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/rc.h b/tools/inc/tools/rc.h
index bd499717a3a4..e11aed2937fd 100644
--- a/tools/inc/tools/rc.h
+++ b/tools/inc/tools/rc.h
@@ -50,6 +50,7 @@ typedef short RSWND_STYLE;
 #define WINDOW_EXTRALONG                0x0800
 #define WINDOW_UNIQUEID                 0x1000
 #define WINDOW_BORDER_STYLE             0x2000
+#define WINDOW_HELPID                   0x4000
 
 // Definition der Struktur die alle "WorkWindow"-Resourcen haben
 #define WORKWIN_SHOWNORMAL              0
diff --git a/tools/inc/tools/rc.hxx b/tools/inc/tools/rc.hxx
index 4bf1827a1ab6..15e077c3c62c 100644
--- a/tools/inc/tools/rc.hxx
+++ b/tools/inc/tools/rc.hxx
@@ -87,6 +87,9 @@ class TOOLS_DLLPUBLIC Resource
     // read a string from resource data and increment pointer
     UniString ReadStringRes()
     { return m_pResMgr->ReadString(); }
+    // read a byte string from resource data and increment pointer
+    rtl::OString ReadByteStringRes()
+    { return m_pResMgr->ReadByteString(); }
 
     // Gibt die Resource frei (this-Zeiger fuer Fehlerueberpruefung)
     // free the resource from m_pResMgr's stack (pass this ptr for validation)
diff --git a/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx
index b19524139078..4b79040921b3 100644
--- a/tools/inc/tools/resmgr.hxx
+++ b/tools/inc/tools/resmgr.hxx
@@ -181,13 +181,15 @@ public:
     static sal_uInt32   GetObjSize( RSHEADER_TYPE* pHT )
                             { return( pHT->GetGlobOff() ); }
 
-    // Liefert einen String aus der Resource
+    // returns a string and its length out of the resource
     static sal_uInt32   GetString( UniString& rStr, const BYTE* pStr );
+    // returns a byte string and its length out of the resource
+    static sal_uInt32   GetByteString( rtl::OString& rStr, const BYTE* pStr );
 
     // Groesse eines Strings in der Resource
     static sal_uInt32   GetStringSize( sal_uInt32 nLen )
                             { nLen++; return (nLen + nLen%2); }
-    static sal_uInt32   GetStringSize( const BYTE* pStr );
+    static sal_uInt32   GetStringSize( const BYTE* pStr, sal_uInt32& nLen );
 
     // return a int64
     static sal_uInt64   GetUInt64( void* pDatum );
@@ -209,9 +211,10 @@ public:
     INT16               ReadShort();
     INT32               ReadLong();
     UniString           ReadString();
+    rtl::OString        ReadByteString();
 
-     // generate auto help id for current resource stack
-    ULONG               GetAutoHelpId();
+    // generate auto help id for current resource stack
+    rtl::OString        GetAutoHelpId();
 
     static void         SetReadStringHook( ResHookProc pProc );
     static ResHookProc  GetReadStringHook();
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/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index 17d52432e206..cb9c7e407bcc 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.hxx
@@ -81,6 +81,7 @@ namespace com { namespace sun { namespace star { namespace util {
 #define INET_DB_SCHEME "db:"
 #define INET_BUGID_SCHEME "bugid:"
 #define INET_TELNET_SCHEME "telnet://"
+#define INET_HID_SCHEME "hid:"
 
 #define URL_PREFIX_PRIV_SOFFICE "private:"
 enum
@@ -139,7 +140,8 @@ enum INetProtocol
     INET_PROT_VND_SUN_STAR_TDOC = 29,
     INET_PROT_GENERIC = 30,
     INET_PROT_SMB = 31,
-    INET_PROT_END = 32
+    INET_PROT_HID = 32,
+    INET_PROT_END = 33
 };
 
 //============================================================================