Merge branch 'master' into feature/gnumake4

Conflicts:
connectivity/source/cpool/Zregistration.cxx
connectivity/source/drivers/evoab/LCatalog.cxx
connectivity/source/drivers/evoab/LColumnAlias.cxx
connectivity/source/drivers/evoab/LColumnAlias.hxx
connectivity/source/drivers/evoab/LColumns.cxx
connectivity/source/drivers/evoab/LColumns.hxx
connectivity/source/drivers/evoab/LConfigAccess.cxx
connectivity/source/drivers/evoab/LConfigAccess.hxx
connectivity/source/drivers/evoab/LConnection.cxx
connectivity/source/drivers/evoab/LConnection.hxx
connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
connectivity/source/drivers/evoab/LDriver.cxx
connectivity/source/drivers/evoab/LDriver.hxx
connectivity/source/drivers/evoab/LFolderList.cxx
connectivity/source/drivers/evoab/LFolderList.hxx
connectivity/source/drivers/evoab/LNoException.cxx
connectivity/source/drivers/evoab/LPreparedStatement.cxx
connectivity/source/drivers/evoab/LPreparedStatement.hxx
connectivity/source/drivers/evoab/LResultSet.cxx
connectivity/source/drivers/evoab/LResultSet.hxx
connectivity/source/drivers/evoab/LServices.cxx
connectivity/source/drivers/evoab/LStatement.cxx
connectivity/source/drivers/evoab/LStatement.hxx
connectivity/source/drivers/evoab/LTable.cxx
connectivity/source/drivers/evoab/LTable.hxx
connectivity/source/drivers/evoab/LTables.cxx
connectivity/source/drivers/evoab/LTables.hxx
connectivity/source/drivers/evoab/evoab.xml
connectivity/source/drivers/evoab/makefile.mk
editeng/Library_editeng.mk
framework/Library_fwe.mk
framework/test/test.cxx
idl/prj/d.lst
idl/util/idlpch.cxx
linguistic/Makefile
linguistic/Module_linguistic.mk
linguistic/inc/linguistic/lngdllapi.h
linguistic/inc/linguistic/lngprophelp.hxx
linguistic/inc/linguistic/misc.hxx
linguistic/prj/build.lst
linguistic/prj/d.lst
linguistic/qa/unoapi/Test.java
linguistic/source/grammarchecker.cxx
linguistic/source/grammarchecker.hxx
linguistic/source/hyphdta.cxx
linguistic/source/lngprophelp.cxx
linguistic/source/makefile.mk
linguistic/source/spelldta.cxx
sfx2/Library_qstart.mk
sfx2/Library_sfx.mk
sfx2/inc/sfx2/qswin32.h
sfx2/prj/build.lst
sfx2/qa/cppunit/makefile.mk
xmlscript/inc/xmlscript/xcrdllapi.h
xmlscript/prj/d.lst
xmlscript/util/makefile.mk

15 files changed, 123 insertions, 255 deletions

diff --git a/idl/inc/attrib.hxx b/idl/inc/attrib.hxx
deleted file mode 100644
index 1dfbaea7f4bb..000000000000
--- a/idl/inc/attrib.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 _ATTRIB_HXX
-#define _ATTRIB_HXX
-
-#ifdef IDL_COMPILER
-#include <hash.hxx>
-#include <object.hxx>
-
-/******************** class SvAttribute **********************************/
-class SvAttribute
-{
-    SvStringHashEntryRef    aName;
-    CreateMetaObjectType    pCreateMethod;
-    SvMetaObjectRef         aTmpClass;
-public:
-                        SvAttribute( SvStringHashEntry * pAttribName,
-                                     CreateMetaObjectType pMethod )
-                            : aName( pAttribName ),
-                              pCreateMethod( pMethod ) {}
-
-    SvMetaObjectRef     CreateClass()
-                        {
-                            if( aTmpClass.Is() )
-                            {
-                                SvMetaObjectRef aTmp( aTmpClass );
-                                aTmpClass.Clear();
-                                return aTmp;
-                            }
-                            return pCreateMethod();
-                        }
-};
-
-#define SV_ATTRIBUTE( AttributeName, PostfixClassName )                 \
-        SvAttribute( SvHash_##AttributeName(),                          \
-                     SvMeta##PostfixClassName::Create )
-
-/******************** class SvAttributeList ******************************/
-DECLARE_LIST(SvAttributeListImpl,SvAttribute*)
-class SvAttributeList : public SvAttributeListImpl
-{
-public:
-            SvAttributeList() : SvAttributeListImpl() {}
-
-    void    Append( SvAttribute * pObj )
-            { Insert( pObj, LIST_APPEND ); }
-};
-
-
-#endif // IDL_COMPILER
-#endif // _ATTRIB_HXX
-
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 32a05d2a4c6b..ff1d7b48b569 100755..100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,45 +59,20 @@ enum
 };
 typedef int WriteAttribute;
 
-/******************** Meta Factory **************************************/
-#ifdef IDL_COMPILER
-
-#define PRV_SV_DECL_META_FACTORY( Class )                               \
-    static SvAttributeList * pAttribList;                               \
-    static SvMetaObject * Create() { return new Class; }                \
-    static const char *   GetClassName() { return #Class; }
-
-#define PRV_SV_IMPL_META_FACTORY( Class )                               \
-    SvAttributeList * Class::pAttribList = NULL;
-
-#else
-
-#define PRV_SV_DECL_META_FACTORY( Class )
-
-#define PRV_SV_IMPL_META_FACTORY( Class )
-
-#endif // IDL_COMPILER
-
 #define SV_DECL_META_FACTORY( Class, CLASS_ID )                         \
-    SV_DECL_PERSIST( Class, CLASS_ID )                                  \
-    PRV_SV_DECL_META_FACTORY( Class )
+    SV_DECL_PERSIST( Class, CLASS_ID )
 
 
 #define SV_DECL_META_FACTORY1( Class, Super1, CLASS_ID )                \
-    SV_DECL_PERSIST1( Class, Super1, CLASS_ID )                         \
-    PRV_SV_DECL_META_FACTORY( Class )
+    SV_DECL_PERSIST1( Class, Super1, CLASS_ID )
 
 #define SV_IMPL_META_FACTORY( Class )                                   \
-    PRV_SV_IMPL_META_FACTORY( Class )                                   \
     SV_IMPL_PERSIST( Class )
 
 
 #define SV_IMPL_META_FACTORY1( Class, Super1 )                          \
-    PRV_SV_IMPL_META_FACTORY( Class )                                   \
     SV_IMPL_PERSIST1( Class, Super1 )
 
-
-/******************** class SvMetaObject ********************************/
 class SvMetaObject : public SvPersistBase
 {
 public:
@@ -120,7 +96,6 @@ public:
 #endif
 };
 SV_DECL_IMPL_REF(SvMetaObject)
-//SV_DECL_IMPL_PERSIST_LIST(SvMetaObject,SvMetaObject *)
 SV_DECL_PERSIST_LIST(SvMetaObject,SvMetaObject *)
 SV_IMPL_PERSIST_LIST(SvMetaObject,SvMetaObject *)
 
@@ -151,7 +126,6 @@ public:
                     }
 };
 
-/******************** class SvMetaName **********************************/
 class SvMetaName : public SvMetaObject
 {
     SvString      aName;
@@ -203,7 +177,6 @@ SV_DECL_IMPL_REF(SvMetaName)
 SV_DECL_IMPL_PERSIST_LIST(SvMetaName,SvMetaName *)
 
 
-/******************** class SvMetaReference *****************************/
 SV_DECL_REF(SvMetaReference)
 class SvMetaReference : public SvMetaName
 {
@@ -252,11 +225,10 @@ SV_IMPL_REF(SvMetaReference)
 SV_DECL_IMPL_PERSIST_LIST(SvMetaReference,SvMetaReference *)
 
 
-/******************** class SvMetaExtern *********************************/
 class SvMetaModule;
 class SvMetaExtern : public SvMetaReference
 {
-    SvMetaModule *          pModule;    // in welchem Modul enthalten
+    SvMetaModule *          pModule;    // included in which module
 
     SvUUId                  aUUId;
     SvVersion               aVersion;
@@ -292,3 +264,4 @@ SV_DECL_IMPL_PERSIST_LIST(SvMetaExtern,SvMetaExtern *)
 #endif // _BASOBJ_HXX
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 0fe59e2c86eb..a95114954eab 100755..100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,7 +40,6 @@ class SvStringHashEntry;
 class SvIdlDataBase;
 class SvTokenStream;
 
-/******************** class SvUINT32 **********************************/
 class SvUINT32
 {
     sal_uInt32  nVal;
@@ -60,7 +60,6 @@ public:
 };
 
 
-/******************** class SvINT16 **********************************/
 class SvINT16
 {
     short   nVal;
@@ -78,7 +77,6 @@ public:
 };
 
 
-/******************** class SvUINT16 **********************************/
 class SvUINT16
 {
     sal_uInt16  nVal;
@@ -96,7 +94,6 @@ public:
 };
 
 
-/******************** class SvINT32 **********************************/
 class SvINT32
 {
     sal_Int32   nVal;
@@ -114,7 +111,6 @@ public:
 };
 
 
-/******************** class Svint **********************************/
 class Svint
 {
     int     nVal;
@@ -135,7 +131,6 @@ public:
 };
 
 
-/******************** class SvBOOL **********************************/
 class SvBOOL
 {
     sal_Bool  nVal:1,
@@ -164,7 +159,6 @@ public:
 };
 
 
-/******************** class SvIdentifier **********************************/
 class SvIdentifier : public ByteString
 {
 public:
@@ -183,11 +177,10 @@ public:
 };
 
 
-/******************** class SvIdentifier **********************************/
 class SvNumberIdentifier : public SvIdentifier
 {
     sal_uInt32  nValue;
-    // darf nicht benutzt werden
+    // must not be used
     sal_Bool    ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
 public:
                 SvNumberIdentifier() : nValue( 0 ) {};
@@ -208,7 +201,6 @@ public:
 };
 
 
-/******************** class SvString **********************************/
 class SvString : public ByteString
 {
 public:
@@ -227,7 +219,6 @@ public:
 };
 
 
-/******************** class SvHelpText **********************************/
 class SvHelpText : public SvString
 {
 public:
@@ -240,12 +231,10 @@ public:
 };
 
 
-/******************** class SvHelpContext *******************************/
 class SvHelpContext : public SvNumberIdentifier
 {
 };
 
-/******************** class SvUUId *************************************/
 class SvUUId : public SvGlobalName
 {
 public:
@@ -257,7 +246,6 @@ public:
 };
 
 
-/******************** class SvVersion **********************************/
 class SvVersion
 {
     sal_uInt16  nMajorVersion;
@@ -288,3 +276,4 @@ public:
 
 #endif // _BASTYPE_HXX
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/char.hxx b/idl/inc/char.hxx
index fc8045f0ba54..0c0528d08a98 100644
--- a/idl/inc/char.hxx
+++ b/idl/inc/char.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,6 @@
 
 #include <tools/string.hxx>
 
-/******************* T y p e s *******************************************/
 class SvChar
 {
 public:
@@ -39,3 +39,5 @@ public:
 
 
 #endif // _CHAR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index 5a9577178193..f8ea98a5e63f 100755..100644
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,18 +29,16 @@
 #ifndef _COMMAND_HXX
 #define _COMMAND_HXX
 
-
-#include <tools/list.hxx>
 #include <tools/string.hxx>
+#include <vector>
 
 #ifndef STRING_LIST
 #define STRING_LIST
-DECLARE_LIST( StringList, String * )
+typedef ::std::vector< String* > StringList;
 #endif
 
-DECLARE_LIST( ByteStringList, ByteString* )
+typedef ::std::vector< ByteString* > ByteStringList;
 
-/******************** class SvCommand ************************************/
 class SvCommand
 {
 public:
@@ -76,3 +75,4 @@ void DeInit();
 
 #endif // _COMMAND_HXX
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index b3f9ca5b154f..74ccbd575354 100755..100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,13 +34,10 @@
 #include <lex.hxx>
 #include <tools/pstm.hxx>
 
-/*************************************************************************
-*************************************************************************/
-
 class SvCommand;
 
 #ifdef IDL_COMPILER
-/******************** class SvIdlError ***********************************/
+
 class SvIdlError
 {
     ByteString  aText;
@@ -63,7 +61,6 @@ public:
 };
 #endif
 
-/******************** class SvIdlDataBase ********************************/
 class SvIdlDataBase
 {
     sal_Bool                        bExport;
@@ -81,7 +78,7 @@ class SvIdlDataBase
     SvMetaClassMemberList       aClassList;
     SvMetaModuleMemberList      aModuleList;
     SvMetaAttributeMemberList   aAttrList;
-    SvMetaTypeMemberList        aTmpTypeList; // nicht Persistent
+    SvMetaTypeMemberList        aTmpTypeList; // not persistent
 
 protected:
 #ifdef IDL_COMPILER
@@ -110,7 +107,7 @@ public:
     SvMetaModuleMemberList &  GetModuleList() { return aModuleList; }
     SvMetaModule *            GetModule( const ByteString & rName );
 
-    // Liste der benutzten Typen beim Schreiben
+    // list of used types while writing
     SvMetaTypeMemberList    aUsedTypes;
     ByteString                  aIFaceName;
     SvNumberIdentifier      aStructSlotId;
@@ -180,3 +177,4 @@ public:
 
 #endif // _DATABASE_HXX
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index c3e841df05d6..525c2a9e27e2 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -240,3 +241,4 @@ HASH_INLINE(UnoName)
 #endif // IDL_COMPILER
 #endif // _GLOBALS_HXX
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index ec97a12a8fce..6449dfd7b9e6 100755..100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,18 +29,16 @@
 #ifndef _HASH_HXX
 #define _HASH_HXX
 
-
-
 #include <tools/ref.hxx>
 #include <tools/string.hxx>
+#include <vector>
 
-/****************** H a s h - T a b l e **********************************/
 class SvHashTable
 {
     sal_uInt32       nMax;                 // size of hash-tabel
     sal_uInt32       nFill;                // elements in hash-tabel
-    sal_uInt32       lAsk;                 // Anzahl der Anfragen
-    sal_uInt32       lTry;                 // Anzahl der Versuche
+    sal_uInt32       lAsk;                 // number of requests
+    sal_uInt32       lTry;                 // number of tries
 protected:
     sal_Bool        Test_Insert( const void *, sal_Bool bInsert, sal_uInt32 * pInsertPos );
 
@@ -56,7 +55,6 @@ public:
     virtual sal_Bool            IsEntry( sal_uInt32 ) const = 0;
 };
 
-/************** S t r i n g H a s h T a b l e E n t r y ******************/
 class SvStringHashTable;
 class SvStringHashEntry : public SvRefBase
 {
@@ -97,12 +95,11 @@ public:
 
 SV_DECL_IMPL_REF(SvStringHashEntry)
 
-/****************** S t r i n g H a s h T a b l e ************************/
-DECLARE_LIST(SvStringHashList,SvStringHashEntry *)
+typedef ::std::vector< SvStringHashEntry* > SvStringHashList;
 
 class SvStringHashTable : public SvHashTable
 {
-    SvStringHashEntry * pEntries;
+    SvStringHashEntry*      pEntries;
 protected:
     virtual sal_uInt32          HashFunc( const void * pElement ) const;
     virtual StringCompare   Compare( const void * pElement, sal_uInt32 nIndex ) const;
@@ -123,3 +120,5 @@ public:
 };
 
 #endif // _RSCHASH_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 9c7ecdd95f3a..3aa22139a4dd 100755..100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,18 +29,18 @@
 #ifndef _LEX_HXX
 #define _LEX_HXX
 
+#include <boost/ptr_container/ptr_vector.hpp>
+
 #include <hash.hxx>
 #include <tools/gen.hxx>
 #include <tools/stream.hxx>
 
-/******************** enum ***********************************************/
 enum SVTOKEN_ENUM { SVTOKEN_EMPTY,      SVTOKEN_COMMENT,
                     SVTOKEN_INTEGER,    SVTOKEN_STRING,
                     SVTOKEN_BOOL,       SVTOKEN_IDENTIFIER,
                     SVTOKEN_CHAR,       SVTOKEN_RTTIBASE,
                     SVTOKEN_EOF,        SVTOKEN_HASHID };
 
-/******************** class SvToken **************************************/
 class BigInt;
 class SvToken
 {
@@ -52,7 +53,6 @@ friend class SvTokenStream;
         sal_uLong               nLong;
         sal_Bool                bBool;
         char                cChar;
-//      SvRttiBase *        pComplexObj;
         SvStringHashEntry * pHash;
     };
 public:
@@ -62,7 +62,6 @@ public:
             SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b );
             SvToken( char c );
             SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr );
-//            SvToken( SvRttiBase * pComplexObj );
             SvToken( SVTOKEN_ENUM nTypeP );
 
     SvToken & operator = ( const SvToken & rObj );
@@ -101,7 +100,6 @@ public:
     sal_uLong       GetNumber() const       { return nLong;         }
     sal_Bool        GetBool() const         { return bBool;         }
     char        GetChar() const         { return cChar;         }
-//    SvRttiBase *GetObject() const       { return pComplexObj;   }
 
     void        SetHash( SvStringHashEntry * pHashP )
                 { pHash = pHashP; nType = SVTOKEN_HASHID; }
@@ -127,26 +125,17 @@ inline SvToken::SvToken( char c )
 inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr )
     : nType( nTypeP ), aString( rStr ) {}
 
-/*
-inline SvToken::SvToken( SvRttiBase * pObj )
-    : nType( SVTOKEN_RTTIBASE ), pComplexObj( pObj )
-        { pObj->AddRef(); }
-*/
-
 inline SvToken::SvToken( SVTOKEN_ENUM nTypeP )
 : nType( nTypeP ) {}
 
-DECLARE_LIST( SvTokenList, SvToken * )
-
-/******************** class SvTokenStream ********************************/
 class SvTokenStream
 {
     sal_uLong       nLine, nColumn;
     int         nBufPos;
-    int         c;          // naechstes Zeichen
+    int         c;          // next character
     CharSet     nCharSet;
-    char *      pCharTab;   // Zeiger auf die Konverierungstabelle
-    sal_uInt16      nTabSize;   // Tabulator Laenge
+    char *      pCharTab;   // pointer to conversion table
+    sal_uInt16      nTabSize;   // length of tabulator
     ByteString      aStrTrue;
     ByteString      aStrFalse;
     sal_uLong       nMaxPos;
@@ -154,8 +143,8 @@ class SvTokenStream
     SvFileStream *  pInStream;
     SvStream &      rInStream;
     String          aFileName;
-    SvTokenList     aTokList;
-    SvToken *       pCurToken;
+    boost::ptr_vector<SvToken> aTokList;
+    boost::ptr_vector<SvToken>::iterator pCurToken;
 
     void        InitCtor();
 
@@ -178,7 +167,7 @@ class SvTokenStream
                     }
     void            CalcColumn()
                     {
-                        // wenn Zeilenende berechnung sparen
+                        // if end of line spare calculation
                         if( 0 != c )
                         {
                             sal_uInt16 n = 0;
@@ -202,30 +191,37 @@ public:
                     { nTabSize = nTabSizeP; }
     sal_uInt16          GetTabSize() const { return nTabSize; }
 
-    SvToken *       GetToken_PrevAll()
-                    {
-                        SvToken * pRetToken = pCurToken;
-                        if( NULL == (pCurToken = aTokList.Prev()) )
-                            // Current Zeiger nie Null
-                            pCurToken = pRetToken;
+    SvToken* GetToken_PrevAll()
+    {
+        boost::ptr_vector<SvToken>::iterator pRetToken = pCurToken;
+
+        // current iterator always valid
+        if(pCurToken != aTokList.begin())
+            --pCurToken;
+
+        return &(*pRetToken);
+    }
+
+    SvToken* GetToken_NextAll()
+    {
+        boost::ptr_vector<SvToken>::iterator pRetToken = pCurToken++;
+
+        if (pCurToken == aTokList.end())
+            pCurToken = pRetToken;
+
+        SetMax();
+
+        return &(*pRetToken);
+    }
+
+    SvToken* GetToken_Next()
+    {
+        // comments get removed initially
+        return GetToken_NextAll();
+    }
+
+    SvToken* GetToken() const { return &(*pCurToken); }
 
-                        return pRetToken;
-                    }
-    SvToken *       GetToken_NextAll()
-                    {
-                        SvToken * pRetToken = pCurToken;
-                        if( NULL == (pCurToken = aTokList.Next()) )
-                            // Current Zeiger nie Null
-                            pCurToken = pRetToken;
-                        SetMax();
-                        return pRetToken;
-                    }
-    SvToken *       GetToken_Next()
-                    {
-                        // Kommentare werden initial entfernt
-                        return GetToken_NextAll();
-                    }
-    SvToken *       GetToken() const { return pCurToken; }
     sal_Bool            Read( char cChar )
                     {
                         if( pCurToken->IsChar()
@@ -237,6 +233,7 @@ public:
                         else
                             return sal_False;
                     }
+
     void            ReadDelemiter()
                     {
                         if( pCurToken->IsChar()
@@ -247,25 +244,33 @@ public:
                         }
                     }
 
-    sal_uInt32          Tell() const
-                    { return aTokList.GetCurPos(); }
-    void            Seek( sal_uInt32 nPos )
-                    {
-                        pCurToken = aTokList.Seek( nPos );
-                        SetMax();
-                    }
-    void            SeekRel( sal_Int32 nRelPos )
-                    {
-                        pCurToken = aTokList.Seek( Tell() + nRelPos );
-                        SetMax();
-                    }
-    void            SeekEnd()
-                    {
-                        pCurToken = aTokList.Seek( nMaxPos );
-                    }
+    sal_uInt32 Tell() const { return pCurToken-aTokList.begin(); }
+
+    void Seek( sal_uInt32 nPos )
+    {
+        pCurToken = aTokList.begin() + nPos;
+        SetMax();
+    }
+
+    void SeekRel( sal_uInt32 nRelPos )
+    {
+        sal_uInt32 relIdx = Tell() + nRelPos;
+
+        if ( relIdx < aTokList.size())
+        {
+            pCurToken = aTokList.begin()+ (Tell() + nRelPos );
+            SetMax();
+        }
+    }
+
+    void SeekEnd()
+    {
+        pCurToken = aTokList.begin()+nMaxPos;
+    }
 };
 
 
 
 #endif // _LEX_HXX
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 5ffd670d6202..964cf148b87a 100755..100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,15 +40,13 @@ struct SvNamePos
         : aUUId( rName )
         , nStmPos( nPos ) {}
 };
-DECLARE_LIST( SvNamePosList, SvNamePos *)
 
-/******************** class SvMetaModule *********************************/
 class SvMetaModule : public SvMetaExtern
 {
     SvMetaClassMemberList       aClassList;
     SvMetaTypeMemberList        aTypeList;
     SvMetaAttributeMemberList   aAttrList;
-// Browser
+// browser
     String                  aIdlFileName;
     SvString                aHelpFileName;
     SvString                aSlotIdFile;
@@ -96,7 +95,6 @@ public:
     virtual void        WriteAttributes( SvIdlDataBase & rBase,
                                         SvStream & rOutStm, sal_uInt16 nTab,
                                             WriteType, WriteAttribute = 0 );
-//    virtual void        WriteSbx( SvIdlDataBase & rBase, SvStream & rOutStm, SvNamePosList & rList );
     virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                     WriteType, WriteAttribute = 0 );
     virtual void        WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
@@ -115,3 +113,4 @@ SV_DECL_IMPL_PERSIST_LIST(SvMetaModule,SvMetaModule *)
 
 #endif // _MODULE_HXX
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 5f4b44c8d7fb..a39c7e917d60 100755..100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,9 +30,9 @@
 #define _OBJECT_HXX
 
 #define _SVSTDARR_ULONGS
-//#include <svtools/svstdarr.hxx>
 #include <types.hxx>
 #include <slot.hxx>
+#include <vector>
 
 struct SvSlotElement
 {
@@ -42,19 +43,11 @@ struct SvSlotElement
                 , aPrefix( rPrefix )
              {}
 };
-DECLARE_LIST( SvSlotElementList, SvSlotElement* )
-class SvMetaClass;
-DECLARE_LIST( SvMetaClassList, SvMetaClass* )
+typedef std::vector< SvSlotElement* > SvSlotElementList;
 
-class SvULongs : public List
-{
-public:
-    void    Insert( sal_uLong& rId, sal_uLong nPos ) { sal_uLong nId(rId ); List::Insert( (void*) nId, nPos ); }
-    void    Remove( sal_uLong& rId ){ sal_uLong nId(rId ); List::Remove( (void*) nId ); }
-    sal_uLong   GetObject( sal_uLong nPos ){ return (sal_uLong) List::GetObject( nPos ); }
-};
+class SvMetaClass;
+typedef ::std::vector< SvMetaClass* > SvMetaClassList;
 
-/******************** class SvClassElement *******************************/
 SV_DECL_REF(SvMetaClass)
 class SvClassElement : public SvPersistBase
 {
@@ -84,7 +77,6 @@ public:
 SV_DECL_IMPL_REF(SvClassElement)
 SV_DECL_IMPL_PERSIST_LIST(SvClassElement,SvClassElement *)
 
-/******************** class SvMetaClass *********************************/
 class SvMetaModule;
 SV_DECL_PERSIST_LIST(SvMetaClass,SvMetaClass *)
 class SvMetaClass : public SvMetaType
@@ -95,9 +87,6 @@ class SvMetaClass : public SvMetaType
     SvBOOL                      aAutomation;
     SvMetaClassRef              xAutomationInterface;
 
-//    void                FillSbxMemberObject( SvIdlDataBase & rBase,
-//                                            SbxObject *, StringList &,
-//                                            sal_Bool bVariable );
     sal_Bool                TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
                                      SvMetaAttribute & rAttr ) const;
 #ifdef IDL_COMPILER
@@ -113,7 +102,7 @@ class SvMetaClass : public SvMetaType
                                     SvIdlDataBase & rBase,
                                     SvStream & rOutStm );
 
-    void                InsertSlots( SvSlotElementList& rList, SvULongs& rSuperList,
+    void                InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>& rSuperList,
                                     SvMetaClassList & rClassList,
                                     const ByteString & rPrefix, SvIdlDataBase& rBase );
 
@@ -141,7 +130,6 @@ public:
                         { return aSuperClass; }
 
     void                FillClasses( SvMetaClassList & rList );
-//    virtual void        FillSbxObject( SvIdlDataBase & rBase, SbxObject * );
 
     const SvClassElementMemberList&
                         GetClassList() const
@@ -168,3 +156,4 @@ SV_IMPL_PERSIST_LIST(SvMetaClass,SvMetaClass *)
 
 #endif // _OBJECT_HXX
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/pch/precompiled_idl.cxx b/idl/inc/pch/precompiled_idl.cxx
index 7ab1f99c4750..7515c4ededbc 100644
--- a/idl/inc/pch/precompiled_idl.cxx
+++ b/idl/inc/pch/precompiled_idl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
 
 #include "precompiled_idl.hxx"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/pch/precompiled_idl.hxx b/idl/inc/pch/precompiled_idl.hxx
index 3f2ba013434e..977fd5d3b09e 100644
--- a/idl/inc/pch/precompiled_idl.hxx
+++ b/idl/inc/pch/precompiled_idl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,3 +31,4 @@
 #ifdef PRECOMPILED_HEADERS
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 95d4051026be..b4036ea2ff2d 100755..100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,8 +32,6 @@
 #include <types.hxx>
 #include <command.hxx>
 
-/******************** class SvMetaSlot **********************************/
-//class SbxObject;
 class SvMetaSlotMemberList;
 class SvMetaSlot : public SvMetaAttribute
 {
@@ -48,15 +47,15 @@ class SvMetaSlot : public SvMetaAttribute
     SvBOOL          aGet;
     SvBOOL          aSet;
 
-    SvBOOL          aCachable;  // exclusiv
+    SvBOOL          aCachable;  // exclusive
     SvBOOL          aVolatile;
     SvBOOL          aToggle;
     SvBOOL          aAutoUpdate;
 
-    SvBOOL          aSynchron;  // exclusiv
+    SvBOOL          aSynchron;  // exclusive
     SvBOOL          aAsynchron;
 
-    SvBOOL          aRecordPerItem;// exclusiv
+    SvBOOL          aRecordPerItem;// exclusive
     SvBOOL          aRecordPerSet;
     SvBOOL          aRecordManual;
     SvBOOL          aNoRecord;
@@ -83,6 +82,7 @@ class SvMetaSlot : public SvMetaAttribute
     void            WriteSlot( const ByteString & rShellName,
                             sal_uInt16 nCount, const ByteString & rSlotId,
                             SvSlotElementList &rList,
+                            size_t nStart,
                             const ByteString & rPrefix,
                                SvIdlDataBase & rBase, SvStream & rOutStm );
     virtual void    Write( SvIdlDataBase & rBase,
@@ -201,10 +201,6 @@ public:
     const ByteString &      GetDefault() const;
     const ByteString &      GetDisableFlags() const;
     sal_Bool                GetPseudoSlots() const;
-    /*
-    sal_Bool                GetGet() const;
-    sal_Bool                GetSet() const;
-    */
     sal_Bool                GetCachable() const;
     sal_Bool                GetVolatile() const;
     sal_Bool                GetToggle() const;
@@ -241,7 +237,6 @@ public:
     void                ResetSlotPointer()
                         { pNextSlot = pLinkedSlot = 0; }
 
-//    void                FillSbxObject( SvIdlDataBase & rBase, SbxObject *, sal_Bool bProp );
 #ifdef IDL_COMPILER
     SvMetaEnumValue*    GetEnumValue() const
                         { return pEnumValue; }
@@ -261,6 +256,7 @@ public:
     sal_uInt16              WriteSlotMap( const ByteString & rShellName,
                                     sal_uInt16 nCount,
                                     SvSlotElementList&,
+                                    size_t nStart,
                                     const ByteString &,
                                     SvIdlDataBase & rBase,
                                     SvStream & rOutStm );
@@ -277,3 +273,5 @@ SV_DECL_IMPL_REF(SvMetaSlot)
 SV_DECL_IMPL_PERSIST_LIST(SvMetaSlot,SvMetaSlot *)
 
 #endif // _SLOT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index bb12b9291b27..e4f405d9e693 100755..100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,10 +32,9 @@
 #include <tools/ref.hxx>
 #include <basobj.hxx>
 
-class SvSlotElementList;
 struct SvSlotElement;
+typedef std::vector< SvSlotElement* > SvSlotElementList;
 
-/******************** class SvMetaAttribute *****************************/
 SV_DECL_REF(SvMetaType)
 SV_DECL_REF(SvMetaAttribute)
 SV_DECL_PERSIST_LIST(SvMetaAttribute,SvMetaAttribute *)
@@ -104,8 +104,6 @@ public:
     virtual sal_Bool        IsVariable() const;
     virtual ByteString      GetMangleName( sal_Bool bVariable ) const;
 
-//    void                FillSbxObject( SbxInfo * pInfo, sal_uInt16 nSbxFlags = 0 );
-//    virtual void        FillSbxObject( SvIdlDataBase & rBase, SbxObject * pObj, sal_Bool bVariable );
 
 #ifdef IDL_COMPILER
     virtual sal_Bool        Test( SvIdlDataBase &, SvTokenStream & rInStm );
@@ -134,14 +132,13 @@ SV_IMPL_REF(SvMetaAttribute)
 SV_IMPL_PERSIST_LIST(SvMetaAttribute,SvMetaAttribute *)
 
 
-/******************** class SvType *********************************/
 enum { CALL_VALUE, CALL_POINTER, CALL_REFERENCE };
 enum { TYPE_METHOD, TYPE_STRUCT, TYPE_BASE, TYPE_ENUM, TYPE_UNION,
       TYPE_CLASS, TYPE_POINTER };
 class SvMetaType : public SvMetaExtern
 {
-    SvBOOL                      aIn;    // Eingangsparameter
-    SvBOOL                      aOut;   // Returnparameter
+    SvBOOL                      aIn;    // input parameter
+    SvBOOL                      aOut;   // return parameter
     Svint                       aCall0, aCall1;
     Svint                       aSbxDataType;
     SvIdentifier                aSvName;
@@ -185,7 +182,7 @@ public:
             SvMetaType( const ByteString & rTypeName, const ByteString & rSbxName,
                         const ByteString & rOdlName, char cParserChar,
                         const ByteString & rCName, const ByteString & rBasicName,
-                        const ByteString & rBasicPostfix/*, SbxDataType nT = SbxEMPTY */);
+                        const ByteString & rBasicPostfix );
 
     SvMetaAttributeMemberList & GetAttrList() const;
     sal_uLong               GetAttrCount() const
@@ -204,10 +201,6 @@ public:
     sal_Bool                IsItem() const { return bIsItem; }
     sal_Bool                IsShell() const { return bIsShell; }
 
-//    void                SetSbxDataType( SbxDataType nT )
-//                        { aSbxDataType = (int)nT; }
-//    SbxDataType         GetSbxDataType() const;
-
     void                SetIn( sal_Bool b ) { aIn = b; }
     sal_Bool                GetIn() const;
 
@@ -233,7 +226,6 @@ public:
 
     virtual sal_Bool        SetName( const ByteString & rName, SvIdlDataBase * = NULL );
 
-//    void                FillSbxObject( SbxVariable * pObj, sal_Bool bVariable );
 
 #ifdef IDL_COMPILER
     virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
@@ -248,7 +240,6 @@ public:
 
     sal_uLong               MakeSfx( ByteString * pAtrrArray );
     virtual void        WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
-    //sal_Bool              ReadTypePrefix( SvIdlDataBase &, SvTokenStream & rInStm );
     sal_Bool                ReadMethodArgs( SvIdlDataBase & rBase,
                                              SvTokenStream & rInStm );
     void                WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
@@ -260,11 +251,9 @@ public:
 #endif
 };
 SV_IMPL_REF(SvMetaType)
-DECLARE_LIST(SvMetaTypeList,SvMetaType *)
 SV_DECL_IMPL_PERSIST_LIST(SvMetaType,SvMetaType *)
 
 
-/******************** class SvTypeString *********************************/
 class SvMetaTypeString : public SvMetaType
 {
 public:
@@ -275,7 +264,6 @@ SV_DECL_IMPL_REF(SvMetaTypeString)
 SV_DECL_IMPL_PERSIST_LIST(SvMetaTypeString,SvMetaTypeString *)
 
 
-/******************** class SvMetaEnumValue **********************************/
 class SvMetaEnumValue : public SvMetaName
 {
     ByteString      aEnumValue;
@@ -294,7 +282,6 @@ SV_DECL_IMPL_REF(SvMetaEnumValue)
 SV_DECL_IMPL_PERSIST_LIST(SvMetaEnumValue,SvMetaEnumValue *)
 
 
-/******************** class SvTypeEnum *********************************/
 class SvMetaTypeEnum : public SvMetaType
 {
     SvMetaEnumValueMemberList   aEnumValueList;
@@ -330,7 +317,6 @@ SV_DECL_IMPL_REF(SvMetaTypeEnum)
 SV_DECL_IMPL_PERSIST_LIST(SvMetaTypeEnum,SvMetaTypeEnum *)
 
 
-/******************** class SvTypeVoid ***********************************/
 class SvMetaTypevoid : public SvMetaType
 {
 public:
@@ -343,3 +329,4 @@ SV_DECL_IMPL_PERSIST_LIST(SvMetaTypevoid,SvMetaTypevoid *)
 
 #endif // _TYPES_HXX
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */