removetooltypes01: #i112600# Exchange misleading sal_uIntPtr with sal_uLong in idl

19 files changed, 153 insertions, 153 deletions

diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 60d12a69e6b5..32a05d2a4c6b 100755
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -105,7 +105,7 @@ public:
 
 #ifdef IDL_COMPILER
     static void         WriteTab( SvStream & rOutStm, sal_uInt16 nTab );
-    static sal_Bool         TestAndSeekSpaceOnly( SvStream &, sal_uIntPtr nBegPos );
+    static sal_Bool         TestAndSeekSpaceOnly( SvStream &, sal_uLong nBegPos );
     static void         Back2Delemitter( SvStream & );
     static void         WriteStars( SvStream & );
 
@@ -136,7 +136,7 @@ public:
     SvMetaObject *  Pop() { return aList.Remove( aList.Count() -1 ); }
     SvMetaObject *  Top() const { return aList.GetObject( aList.Count() -1 ); }
     void            Clear() { aList.Clear(); }
-    sal_uIntPtr     Count() const { return aList.Count(); }
+    sal_uLong     Count() const { return aList.Count(); }
 
     SvMetaObject *  Get( TypeId nType )
                     {
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 1d5ead23c907..b3f9ca5b154f 100755
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -132,7 +132,7 @@ public:
     void                    WriteError( const ByteString & rErrWrn,
                                     const ByteString & rFileName,
                                     const ByteString & rErrorText,
-                                    sal_uIntPtr nRow = 0, sal_uIntPtr nColumn = 0 ) const;
+                                    sal_uLong nRow = 0, sal_uLong nColumn = 0 ) const;
     void                    WriteError( SvTokenStream & rInStm );
     void                    SetError( const ByteString & rError, SvToken * pTok );
     void                    Push( SvMetaObject * pObj );
@@ -146,8 +146,8 @@ public:
                                 return bOk;
                             }
     sal_uInt32              GetUniqueId() { return ++nUniqueId; }
-    sal_Bool                    FindId( const ByteString & rIdName, sal_uIntPtr * pVal );
-    sal_Bool                    InsertId( const ByteString & rIdName, sal_uIntPtr nVal );
+    sal_Bool                    FindId( const ByteString & rIdName, sal_uLong * pVal );
+    sal_Bool                    InsertId( const ByteString & rIdName, sal_uLong nVal );
     sal_Bool                    ReadIdFile( const String & rFileName );
 
     SvMetaType *            FindType( const ByteString & rName );
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 4e25ebd98ca9..ec97a12a8fce 100755
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -63,7 +63,7 @@ class SvStringHashEntry : public SvRefBase
 friend class SvStringHashTable;
     ByteString  aName;
     sal_uInt32  nHashId;
-    sal_uIntPtr   nValue;
+    sal_uLong   nValue;
     sal_Bool    bHasId;
 public:
                     SvStringHashEntry() : bHasId( sal_False ) {;}
@@ -78,8 +78,8 @@ public:
     sal_Bool            HasId() const { return bHasId; }
     sal_uInt32          GetId() const { return nHashId; }
 
-    void            SetValue( sal_uIntPtr n ) { nValue = n; }
-    sal_uIntPtr           GetValue() const { return nValue; }
+    void            SetValue( sal_uLong n ) { nValue = n; }
+    sal_uLong           GetValue() const { return nValue; }
 
     sal_Bool            operator == ( const SvStringHashEntry & rRef )
                     { return nHashId == rRef.nHashId; }
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index b276ad49c9d9..9c7ecdd95f3a 100755
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -44,12 +44,12 @@ class BigInt;
 class SvToken
 {
 friend class SvTokenStream;
-    sal_uIntPtr                 nLine, nColumn;
+    sal_uLong                   nLine, nColumn;
     SVTOKEN_ENUM            nType;
     ByteString                  aString;
     union
     {
-        sal_uIntPtr             nLong;
+        sal_uLong               nLong;
         sal_Bool                bBool;
         char                cChar;
 //      SvRttiBase *        pComplexObj;
@@ -58,7 +58,7 @@ friend class SvTokenStream;
 public:
             SvToken();
             SvToken( const SvToken & rObj );
-            SvToken( sal_uIntPtr n );
+            SvToken( sal_uLong n );
             SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b );
             SvToken( char c );
             SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr );
@@ -70,11 +70,11 @@ public:
     ByteString          GetTokenAsString() const;
     SVTOKEN_ENUM    GetType() const { return nType; }
 
-    void        SetLine( sal_uIntPtr nLineP )     { nLine = nLineP;       }
-    sal_uIntPtr       GetLine() const             { return nLine;         }
+    void        SetLine( sal_uLong nLineP )     { nLine = nLineP;       }
+    sal_uLong       GetLine() const             { return nLine;         }
 
-    void        SetColumn( sal_uIntPtr nColumnP ) { nColumn = nColumnP;   }
-    sal_uIntPtr       GetColumn() const           { return nColumn;       }
+    void        SetColumn( sal_uLong nColumnP ) { nColumn = nColumnP;   }
+    sal_uLong       GetColumn() const           { return nColumn;       }
 
     sal_Bool        IsEmpty() const     { return nType == SVTOKEN_EMPTY; }
     sal_Bool        IsComment() const   { return nType == SVTOKEN_COMMENT; }
@@ -98,7 +98,7 @@ public:
                         ? pHash->GetName()
                         : aString;
                 }
-    sal_uIntPtr       GetNumber() const       { return nLong;         }
+    sal_uLong       GetNumber() const       { return nLong;         }
     sal_Bool        GetBool() const         { return bBool;         }
     char        GetChar() const         { return cChar;         }
 //    SvRttiBase *GetObject() const       { return pComplexObj;   }
@@ -115,7 +115,7 @@ public:
 inline SvToken::SvToken()
     : nType( SVTOKEN_EMPTY ) {}
 
-inline SvToken::SvToken( sal_uIntPtr n )
+inline SvToken::SvToken( sal_uLong n )
     : nType( SVTOKEN_INTEGER ), nLong( n ) {}
 
 inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b )
@@ -141,7 +141,7 @@ DECLARE_LIST( SvTokenList, SvToken * )
 /******************** class SvTokenStream ********************************/
 class SvTokenStream
 {
-    sal_uIntPtr       nLine, nColumn;
+    sal_uLong       nLine, nColumn;
     int         nBufPos;
     int         c;          // naechstes Zeichen
     CharSet     nCharSet;
@@ -149,7 +149,7 @@ class SvTokenStream
     sal_uInt16      nTabSize;   // Tabulator Laenge
     ByteString      aStrTrue;
     ByteString      aStrFalse;
-    sal_uIntPtr     nMaxPos;
+    sal_uLong       nMaxPos;
 
     SvFileStream *  pInStream;
     SvStream &      rInStream;
@@ -167,12 +167,12 @@ class SvTokenStream
                     }
 
     void            FillTokenList();
-    sal_uIntPtr         GetNumber();
+    sal_uLong           GetNumber();
     sal_Bool            MakeToken( SvToken & );
     sal_Bool            IsEof() const { return rInStream.IsEof(); }
     void            SetMax()
                     {
-                        sal_uIntPtr n = Tell();
+                        sal_uLong n = Tell();
                         if( n > nMaxPos )
                             nMaxPos = n;
                     }
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index ac9d193d4d83..5f4b44c8d7fb 100755
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -49,9 +49,9 @@ DECLARE_LIST( SvMetaClassList, SvMetaClass* )
 class SvULongs : public List
 {
 public:
-    void    Insert( sal_uIntPtr& rId, sal_uIntPtr nPos ) { sal_uIntPtr nId(rId ); List::Insert( (void*) nId, nPos ); }
-    void    Remove( sal_uIntPtr& rId ){ sal_uIntPtr nId(rId ); List::Remove( (void*) nId ); }
-    sal_uIntPtr   GetObject( sal_uIntPtr nPos ){ return (sal_uIntPtr) List::GetObject( nPos ); }
+    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 SvClassElement *******************************/
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index a29331ef8e4c..95d4051026be 100755
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -75,7 +75,7 @@ class SvMetaSlot : public SvMetaAttribute
     SvString        aDisableFlags;
     SvMetaSlot*     pLinkedSlot;
     SvMetaSlot*     pNextSlot;
-    sal_uIntPtr         nListPos;
+    sal_uLong           nListPos;
     SvMetaEnumValue* pEnumValue;
     SvString    aUnoName;
 
@@ -234,9 +234,9 @@ public:
                         { return pLinkedSlot; }
     SvMetaSlot*         GetNextSlot() const
                         { return pNextSlot; }
-    sal_uIntPtr             GetListPos() const
+    sal_uLong               GetListPos() const
                         { return nListPos; }
-    void                SetListPos(sal_uIntPtr n)
+    void                SetListPos(sal_uLong n)
                         { nListPos = n; }
     void                ResetSlotPointer()
                         { pNextSlot = pLinkedSlot = 0; }
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 56c3f2e6271b..bb12b9291b27 100755
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -54,7 +54,7 @@ protected:
 #ifdef IDL_COMPILER
     virtual void WriteCSource( SvIdlDataBase & rBase,
                                  SvStream & rOutStm, sal_Bool bSet );
-    sal_uIntPtr      MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVariable ) const;
+    sal_uLong        MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVariable ) const;
     virtual void WriteAttributes( SvIdlDataBase & rBase,
                                       SvStream & rOutStm, sal_uInt16 nTab,
                                         WriteType, WriteAttribute = 0 );
@@ -118,7 +118,7 @@ public:
                                           WriteType, WriteAttribute );
     virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
-    sal_uIntPtr             MakeSfx( ByteString * pAtrrArray );
+    sal_uLong               MakeSfx( ByteString * pAtrrArray );
     virtual void        Insert( SvSlotElementList&, const ByteString & rPrefix,
                                 SvIdlDataBase& );
     virtual void        WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
@@ -188,7 +188,7 @@ public:
                         const ByteString & rBasicPostfix/*, SbxDataType nT = SbxEMPTY */);
 
     SvMetaAttributeMemberList & GetAttrList() const;
-    sal_uIntPtr             GetAttrCount() const
+    sal_uLong               GetAttrCount() const
                         {
                             return pAttrList ? pAttrList->Count() : 0L;
                         }
@@ -246,7 +246,7 @@ public:
     void                WriteOdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
     void                AppendParserString (ByteString &rString);
 
-    sal_uIntPtr             MakeSfx( ByteString * pAtrrArray );
+    sal_uLong               MakeSfx( ByteString * pAtrrArray );
     virtual void        WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
     //sal_Bool              ReadTypePrefix( SvIdlDataBase &, SvTokenStream & rInStm );
     sal_Bool                ReadMethodArgs( SvIdlDataBase & rBase,
@@ -312,9 +312,9 @@ public:
             SvMetaTypeEnum();
 
     sal_uInt16              GetMaxValue() const;
-    sal_uIntPtr               Count() const { return aEnumValueList.Count(); }
+    sal_uLong               Count() const { return aEnumValueList.Count(); }
     const ByteString &      GetPrefix() const { return aPrefix; }
-    SvMetaEnumValue *   GetObject( sal_uIntPtr n ) const
+    SvMetaEnumValue *   GetObject( sal_uLong n ) const
                         { return aEnumValueList.GetObject( n ); }
 
 #ifdef IDL_COMPILER
diff --git a/idl/source/cmptools/char.cxx b/idl/source/cmptools/char.cxx
index 45dda7d68fe7..6e0049240bbb 100755
--- a/idl/source/cmptools/char.cxx
+++ b/idl/source/cmptools/char.cxx
@@ -88,7 +88,7 @@ char * SvChar::GetTable( CharSet nSource , CharSet nDest )
         pCharTable = new Table();
 
     sal_uInt8 * pSet;
-    pSet = (sal_uInt8 *)pCharTable->Get( ((sal_uIntPtr)nSource << 16) + (sal_uIntPtr)nDest );
+    pSet = (sal_uInt8 *)pCharTable->Get( ((sal_uLong)nSource << 16) + (sal_uLong)nDest );
 
     if( !pSet )
     {
@@ -100,7 +100,7 @@ char * SvChar::GetTable( CharSet nSource , CharSet nDest )
             if( c )
                 pSet[ i ] = (sal_uInt8)c;
         }
-        pCharTable->Insert( ((sal_uIntPtr)nSource << 16) + (sal_uIntPtr)nDest, pSet );
+        pCharTable->Insert( ((sal_uLong)nSource << 16) + (sal_uLong)nDest, pSet );
     }
 
     return (char *)pSet;
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index c212289823ed..f919a1074efa 100755
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <ctype.h>
 
-// Programmabh„ngige Includes.
+// Programmabh�ngige Includes.
 #include <hash.hxx>
 #include <tools/debug.hxx>
 
@@ -73,8 +73,8 @@ SvHashTable::SvHashTable( sal_uInt32 nMaxEntries )
 SvHashTable::~SvHashTable()
 {
 #ifdef DOS_NIE
-    printf( "Maximum: %ld, F�llung: %ld\n", (sal_uIntPtr)nMax, (sal_uIntPtr)nFill );
-    printf( "Anfragen: %ld, Versuche: %ld", (sal_uIntPtr)lAsk, (sal_uIntPtr)lTry );
+    printf( "Maximum: %ld, F�llung: %ld\n", (sal_uLong)nMax, (sal_uLong)nFill );
+    printf( "Anfragen: %ld, Versuche: %ld", (sal_uLong)lAsk, (sal_uLong)lTry );
     if( lTry != 0 )
         printf( ", V/E = %ld\n", lTry / lAsk );
 #endif
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index 98c835a95065..24991489841c 100755
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -284,9 +284,9 @@ int SvTokenStream::GetNextChar()
 |*
 |*    Beschreibung
 *************************************************************************/
-sal_uIntPtr SvTokenStream::GetNumber()
+sal_uLong SvTokenStream::GetNumber()
 {
-    sal_uIntPtr   l = 0;
+    sal_uLong   l = 0;
     short   nLog = 10;
 
     if( '0' == c )
@@ -345,8 +345,8 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken )
     }
     while( 0 == c && !IsEof() && ( SVSTREAM_OK == rInStream.GetError() ) );
 
-    sal_uIntPtr nLastLine       = nLine;
-    sal_uIntPtr nLastColumn = nColumn;
+    sal_uLong nLastLine     = nLine;
+    sal_uLong nLastColumn   = nColumn;
     // Kommentar
     if( '/' == c )
     {
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 57e1ecd01e5e..09b9a317e07a 100755
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -89,10 +89,10 @@ void SvMetaObject::WriteStars( SvStream & rOutStm )
 |*
 |*    Beschreibung
 *************************************************************************/
-sal_Bool SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, sal_uIntPtr nBegPos )
+sal_Bool SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, sal_uLong nBegPos )
 {
     // keine leeren Klammern schreiben
-    sal_uIntPtr nPos = rOutStm.Tell();
+    sal_uLong nPos = rOutStm.Tell();
     rOutStm.Seek( nBegPos );
     sal_Bool bOnlySpace = sal_True;
     while( bOnlySpace && rOutStm.Tell() < nPos )
@@ -118,7 +118,7 @@ sal_Bool SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, sal_uIntPtr nBe
 void SvMetaObject::Back2Delemitter( SvStream & rOutStm )
 {
     // keine leeren Klammern schreiben
-    sal_uIntPtr nPos = rOutStm.Tell();
+    sal_uLong nPos = rOutStm.Tell();
     rOutStm.SeekRel( -1 );
     char c = 0;
     rOutStm >> c;
@@ -434,10 +434,10 @@ sal_Bool SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 void SvMetaName::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
                              sal_uInt16 nTab )
 {
-    sal_uIntPtr nBeginPos = rOutStm.Tell();
+    sal_uLong nBeginPos = rOutStm.Tell();
     WriteTab( rOutStm, nTab );
     rOutStm << '[' << endl;
-    sal_uIntPtr nOldPos = rOutStm.Tell();
+    sal_uLong nOldPos = rOutStm.Tell();
     WriteAttributesSvIdl( rBase, rOutStm, nTab +1 );
 
     // keine leeren Klammern schreiben
@@ -477,14 +477,14 @@ void SvMetaName::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
                            sal_uInt16 nTab,
                          WriteType nT, WriteAttribute nA )
 {
-    sal_uIntPtr nBeginPos = rOutStm.Tell();
+    sal_uLong nBeginPos = rOutStm.Tell();
     WriteTab( rOutStm, nTab );
     rOutStm << '[' << endl;
-    sal_uIntPtr nOldPos = rOutStm.Tell();
+    sal_uLong nOldPos = rOutStm.Tell();
     WriteAttributes( rBase, rOutStm, nTab +1, nT, nA );
 
     // keine leeren Klammern schreiben
-    sal_uIntPtr nPos = rOutStm.Tell();
+    sal_uLong nPos = rOutStm.Tell();
     rOutStm.Seek( nOldPos );
     sal_Bool bOnlySpace = sal_True;
     while( bOnlySpace && rOutStm.Tell() < nPos )
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index a4851652f0dd..19df1c0967b2 100755
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -41,7 +41,7 @@
 #ifdef IDL_COMPILER
 /************************************************************************/
 static sal_Bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm,
-                            sal_uIntPtr nMin, sal_uIntPtr nMax, sal_uIntPtr* pValue )
+                            sal_uLong nMin, sal_uLong nMax, sal_uLong* pValue )
 {
     sal_uInt32 nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
@@ -53,7 +53,7 @@ static sal_Bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInSt
             pTok = rInStm.GetToken_Next();
             if( pTok->IsInteger() )
             {
-                sal_uIntPtr n = pTok->GetNumber();
+                sal_uLong n = pTok->GetNumber();
                 if ( n >= nMin && n <= nMax )
                 {
                     *pValue = n;
@@ -328,7 +328,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
 {
     if( SvIdentifier::ReadSvIdl( pName, rInStm ) )
     {
-        sal_uIntPtr n;
+        sal_uLong n;
         if( rBase.FindId( *this, &n ) )
         {
             nValue = n;
@@ -361,7 +361,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
 
     if( pTok->IsIdentifier() )
     {
-        sal_uIntPtr n;
+        sal_uLong n;
         if( rBase.FindId( pTok->GetString(), &n ) )
         {
             *(ByteString *)this = pTok->GetString();
@@ -568,7 +568,7 @@ sal_Bool SvUUId::WriteSvIdl( SvStream & rOutStm )
 *************************************************************************/
 sal_Bool SvVersion::ReadSvIdl( SvTokenStream & rInStm )
 {
-    sal_uIntPtr n = 0;
+    sal_uLong n = 0;
 
     sal_uInt32 nTokPos = rInStm.Tell();
     if( ReadRangeSvIdl( SvHash_Version(), rInStm, 0 , 0xFFFF, &n ) )
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 1c0b0dced62b..f8d68dabbbf6 100755
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -135,14 +135,14 @@ void SvMetaModule::Save( SvPersistStream & rStm )
 
     // Compiler Daten schreiben
     sal_uInt16 nCmpLen = 0;
-    sal_uIntPtr nLenPos = rStm.Tell();
+    sal_uLong nLenPos = rStm.Tell();
     rStm << nCmpLen;
 #ifdef IDL_COMPILER
     rStm << aBeginName;
     rStm << aEndName;
     rStm << aNextName;
     // Laenge der Compiler Daten schreiben
-    sal_uIntPtr nPos = rStm.Tell();
+    sal_uLong nPos = rStm.Tell();
     rStm.Seek( nLenPos );
     rStm << (sal_uInt16)( nPos - nLenPos - sizeof( sal_uInt16 ) );
     rStm.Seek( nPos );
@@ -372,7 +372,7 @@ void SvMetaModule::WriteContextSvIdl( SvIdlDataBase & rBase,
                                       sal_uInt16 nTab )
 {
     SvMetaExtern::WriteContextSvIdl( rBase, rOutStm, nTab );
-    sal_uIntPtr n;
+    sal_uLong n;
     for( n = 0; n < aTypeList.Count(); n++ )
     {
         WriteTab( rOutStm, nTab );
@@ -464,7 +464,7 @@ void SvMetaModule::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
 *************************************************************************/
 void SvMetaModule::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
 {
-    for( sal_uIntPtr n = 0; n < aClassList.Count(); n++ )
+    for( sal_uLong n = 0; n < aClassList.Count(); n++ )
     {
         SvMetaClass * pClass = aClassList.GetObject( n );
         pClass->WriteSfx( rBase, rOutStm );
@@ -474,7 +474,7 @@ void SvMetaModule::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
 void SvMetaModule::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
                             Table* pTable )
 {
-    for( sal_uIntPtr n = 0; n < aClassList.Count(); n++ )
+    for( sal_uLong n = 0; n < aClassList.Count(); n++ )
     {
         SvMetaClass * pClass = aClassList.GetObject( n );
         pClass->WriteHelpIds( rBase, rOutStm, pTable );
@@ -506,7 +506,7 @@ void SvMetaModule::WriteAttributes( SvIdlDataBase & rBase,
 void SvMetaModule::WriteSbx( SvIdlDataBase & rBase, SvStream & rOutStm,
                                 SvNamePosList & rList )
 {
-    for( sal_uIntPtr n = 0; n < aClassList.Count(); n++ )
+    for( sal_uLong n = 0; n < aClassList.Count(); n++ )
     {
         SvMetaClass * pClass = aClassList.GetObject( n );
         if( !pClass->IsShell() && pClass->GetAutomation() )
@@ -547,7 +547,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
         rOutStm << "importlib(\"STDOLE.TLB\");" << endl;
 
     /*
-        for( sal_uIntPtr n = 0; n < aTypeList.Count(); n++ )
+        for( sal_uLong n = 0; n < aTypeList.Count(); n++ )
         {
             SvMetaType * pType = aTypeList.GetObject( n );
             if( !pType ->Write( rBase, rOutStm, nTab +1, nT, nA ) )
@@ -555,11 +555,11 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
         }
     */
         /*
-        for( sal_uIntPtr n = 0; n < rBase.GetModuleList().Count(); n++ )
+        for( sal_uLong n = 0; n < rBase.GetModuleList().Count(); n++ )
         {
             SvMetaModule * pModule = rBase.GetModuleList().GetObject( n );
             const SvMetaTypeMemberList &rTypeList = pModule->GetTypeList();
-            for( sal_uIntPtr n = 0; n < rTypeList.Count(); n++ )
+            for( sal_uLong n = 0; n < rTypeList.Count(); n++ )
             {
                 SvMetaType * pType = rTypeList.GetObject( n );
                 pType->Write( rBase, rOutStm, nTab +1, nT, nA );
@@ -567,7 +567,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
         }
         */
 
-        for( sal_uIntPtr n = 0; n < aClassList.Count(); n++ )
+        for( sal_uLong n = 0; n < aClassList.Count(); n++ )
         {
             SvMetaClass * pClass = aClassList.GetObject( n );
             if( !pClass->IsShell() && pClass->GetAutomation() )
@@ -591,7 +591,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
         rOutStm << "</MODULE>" << endl << endl;
 
         rOutStm << "<CLASSES>" << endl;
-        for( sal_uIntPtr n = 0; n < aClassList.Count(); n++ )
+        for( sal_uLong n = 0; n < aClassList.Count(); n++ )
         {
             SvMetaClass * pClass = aClassList.GetObject( n );
             if( !pClass->IsShell() )
@@ -607,7 +607,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
                 {
                     rOutStm << " ( ";
 
-                    for( sal_uIntPtr m=0; m<rClassList.Count(); m++ )
+                    for( sal_uLong m=0; m<rClassList.Count(); m++ )
                     {
                         SvClassElement *pEle = rClassList.GetObject(m);
                         SvMetaClass *pCl = pEle->GetClass();
@@ -629,7 +629,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
     case WRITE_C_SOURCE:
     case WRITE_C_HEADER:
     {
-        for( sal_uIntPtr n = 0; n < aClassList.Count(); n++ )
+        for( sal_uLong n = 0; n < aClassList.Count(); n++ )
         {
             SvMetaClass * pClass = aClassList.GetObject( n );
             if( !pClass->IsShell() /* && pClass->GetAutomation() */ )
@@ -652,7 +652,7 @@ void SvMetaModule::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
 //  rOutStm << "#pragma CHARSET IBMPC" << endl;
     if( aSlotIdFile.Len() )
         rOutStm << "//#include <" << aSlotIdFile.GetBuffer() << '>' << endl;
-    for( sal_uIntPtr n = 0; n < aClassList.Count(); n++ )
+    for( sal_uLong n = 0; n < aClassList.Count(); n++ )
     {
         aClassList.GetObject( n )->WriteSrc( rBase, rOutStm, pTable );
     }
@@ -664,7 +664,7 @@ void SvMetaModule::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
 void SvMetaModule::WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm,
                              sal_uInt16 nTab )
 {
-    for( sal_uIntPtr n = 0; n < aClassList.Count(); n++ )
+    for( sal_uLong n = 0; n < aClassList.Count(); n++ )
     {
         SvMetaClass * pClass = aClassList.GetObject( n );
         pClass->WriteHxx( rBase, rOutStm, nTab );
@@ -677,7 +677,7 @@ void SvMetaModule::WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm,
 void SvMetaModule::WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm,
                              sal_uInt16 nTab )
 {
-    for( sal_uIntPtr n = 0; n < aClassList.Count(); n++ )
+    for( sal_uLong n = 0; n < aClassList.Count(); n++ )
     {
         SvMetaClass * pClass = aClassList.GetObject( n );
         pClass->WriteCxx( rBase, rOutStm, nTab );
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index abfa6c7c8621..e9bddda61f9a 100755
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -179,7 +179,7 @@ void SvMetaClass::FillSbxMemberObject( SvIdlDataBase & rBase,
                                         sal_Bool bVariable )
 {
     // alle Attribute der Klasse schreiben
-    sal_uIntPtr n ;
+    sal_uLong n ;
     for( n = 0; n < aAttrList.Count(); n++ )
     {
         SvMetaAttribute * pAttr = aAttrList.GetObject( n );
@@ -387,7 +387,7 @@ void SvMetaClass::WriteContextSvIdl
 )
 {
     //SvMetaType::WriteContextSvIdl( rBase, rOutStm, nTab );
-    sal_uIntPtr n;
+    sal_uLong n;
     for( n = 0; n < aAttrList.Count(); n++ )
     {
         WriteTab( rOutStm, nTab );
@@ -416,7 +416,7 @@ void SvMetaClass::WriteContextSvIdl
 *************************************************************************/
 sal_Bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 {
-    sal_uIntPtr nTokPos = rInStm.Tell();
+    sal_uLong nTokPos = rInStm.Tell();
     if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm ) && GetType() == TYPE_CLASS )
     {
         sal_Bool bOk = sal_True;
@@ -458,7 +458,7 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS
         DBG_ERROR( rAttr.GetSlotId().GetBuffer() );
     }
 
-    for( sal_uIntPtr n = 0; n < aAttrList.Count(); n++ )
+    for( sal_uLong n = 0; n < aAttrList.Count(); n++ )
     {
         SvMetaAttribute * pS = aAttrList.GetObject( n );
         if( pS->GetName() == rAttr.GetName() )
@@ -535,7 +535,7 @@ void SvMetaClass::WriteOdlMembers( ByteStringList & rSuperList,
                                        SvStream & rOutStm, sal_uInt16 nTab )
 {
     // alle Attribute schreiben
-    sal_uIntPtr n;
+    sal_uLong n;
     for( n = 0; n < aAttrList.Count(); n++ )
     {
         SvMetaAttribute * pAttr = aAttrList.GetObject( n );
@@ -655,7 +655,7 @@ void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
             rOutStm << "</INTERFACE>" << endl << endl;
 
             // alle Attribute schreiben
-            sal_uIntPtr n;
+            sal_uLong n;
             for( n = 0; n < aAttrList.Count(); n++ )
             {
                 SvMetaAttribute * pAttr = aAttrList.GetObject( n );
@@ -686,7 +686,7 @@ sal_uInt16 SvMetaClass::WriteSlotParamArray( SvIdlDataBase & rBase,
                                         SvStream & rOutStm )
 {
     sal_uInt16 nCount = 0;
-    for( sal_uIntPtr n = 0; n < rSlotList.Count(); n++ )
+    for( sal_uLong n = 0; n < rSlotList.Count(); n++ )
     {
         SvSlotElement *pEle = rSlotList.GetObject( n );
         SvMetaSlot *pAttr = pEle->xSlot;
@@ -707,7 +707,7 @@ sal_uInt16 SvMetaClass::WriteSlots( const ByteString & rShellName,
                                 SvStream & rOutStm )
 {
     sal_uInt16 nSCount = 0;
-    for( sal_uIntPtr n = 0; n < rSlotList.Count(); n++ )
+    for( sal_uLong n = 0; n < rSlotList.Count(); n++ )
     {
         rSlotList.Seek(n);
         SvSlotElement * pEle = rSlotList.GetCurObject();
@@ -736,12 +736,12 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, SvULongs& rSuperList,
     rClassList.Insert(this, LIST_APPEND);
 
     // alle direkten Attribute schreiben
-    sal_uIntPtr n;
+    sal_uLong n;
     for( n = 0; n < aAttrList.Count(); n++ )
     {
         SvMetaAttribute * pAttr = aAttrList.GetObject( n );
 
-        sal_uIntPtr nId = pAttr->GetSlotId().GetValue();
+        sal_uLong nId = pAttr->GetSlotId().GetValue();
         sal_uInt16 nPos;
         for ( nPos=0; nPos < rSuperList.Count(); nPos++ )
         {
@@ -800,7 +800,7 @@ void SvMetaClass::FillClasses( SvMetaClassList & rList )
         rList.Insert(this, LIST_APPEND);
 
         // Meine Imports
-        for( sal_uIntPtr n = 0; n < aClassList.Count(); n++ )
+        for( sal_uLong n = 0; n < aClassList.Count(); n++ )
         {
             SvClassElement * pEle = aClassList.GetObject( n );
             SvMetaClass * pCl = pEle->GetClass();
@@ -825,7 +825,7 @@ void SvMetaClass::WriteSlotStubs( const ByteString & rShellName,
                                 SvStream & rOutStm )
 {
     // alle Attribute schreiben
-    for( sal_uIntPtr n = 0; n < rSlotList.Count(); n++ )
+    for( sal_uLong n = 0; n < rSlotList.Count(); n++ )
     {
         SvSlotElement *pEle = rSlotList.GetObject( n );
         SvMetaSlot *pAttr = pEle->xSlot;
@@ -876,7 +876,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
     SvMetaClassList classList;
     SvSlotElementList aSlotList;
     InsertSlots(aSlotList, aSuperList, classList, ByteString(), rBase);
-    sal_uIntPtr n;
+    sal_uLong n;
     for ( n=0; n<aSlotList.Count(); n++ )
     {
         SvSlotElement *pEle = aSlotList.GetObject( n );
@@ -884,7 +884,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
         pSlot->SetListPos(n);
     }
 
-    sal_uIntPtr nSlotCount = aSlotList.Count();
+    sal_uLong nSlotCount = aSlotList.Count();
 
     // alle Attribute schreiben
     sal_uInt16 nArgCount = WriteSlotParamArray( rBase, aSlotList, rOutStm );
@@ -944,7 +944,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
 void SvMetaClass::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
                             Table* pTable )
 {
-    for( sal_uIntPtr n=0; n<aAttrList.Count(); n++ )
+    for( sal_uLong n=0; n<aAttrList.Count(); n++ )
     {
         SvMetaAttribute * pAttr = aAttrList.GetObject( n );
         pAttr->WriteHelpId( rBase, rOutStm, pTable );
@@ -957,7 +957,7 @@ void SvMetaClass::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
 void SvMetaClass::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
                              Table * pTable )
 {
-    for( sal_uIntPtr n=0; n<aAttrList.Count(); n++ )
+    for( sal_uLong n=0; n<aAttrList.Count(); n++ )
     {
         SvMetaAttribute * pAttr = aAttrList.GetObject( n );
         pAttr->WriteSrc( rBase, rOutStm, pTable );
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 1664d75971fc..6c7018959a9d 100755
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -1049,7 +1049,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
     sal_uInt16 nId = (sal_uInt16) GetSlotId().GetValue();
     sal_uInt16 nListCount = (sal_uInt16) rList.Count();
     sal_uInt16 nPos;
-    sal_uIntPtr m;  // for inner "for" loop
+    sal_uLong m;  // for inner "for" loop
 
     if ( !nListCount )
         nPos = 0;
@@ -1108,7 +1108,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
         // Den MasterSlot clonen
         SvMetaSlotRef xEnumSlot;
         SvMetaSlot *pFirstEnumSlot = NULL;
-        for( sal_uIntPtr n = 0; n < pEnum->Count(); n++ )
+        for( sal_uLong n = 0; n < pEnum->Count(); n++ )
         {
             // Die SlotId erzeugen
             SvMetaEnumValue *enumValue = pEnum->GetObject(n);
@@ -1135,7 +1135,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
             {
                 DBG_ERROR("Invalid EnumSlot!");
                 xEnumSlot = Clone();
-                sal_uIntPtr nValue;
+                sal_uLong nValue;
                 if ( rBase.FindId(aSId , &nValue) )
                 {
                     SvNumberIdentifier aId;
@@ -1163,7 +1163,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
         pLinkedSlot = pFirstEnumSlot;
 
         // Slaves untereinander verketten
-        rList.Seek((sal_uIntPtr)0);
+        rList.Seek((sal_uLong)0);
         xEnumSlot = pFirstEnumSlot;
         SvSlotElement *pEle;
         do
@@ -1483,7 +1483,7 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, sal_uInt16 nCount,
                 pType = pMethod->GetType();
             else
                 pType = GetType();
-            sal_uIntPtr nSCount = pType->GetAttrCount();
+            sal_uLong nSCount = pType->GetAttrCount();
             rOutStm << ByteString::CreateFromInt32( nSCount ).GetBuffer() << "/*Count*/";
         }
         else
@@ -1549,7 +1549,7 @@ sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rO
 
         const SvMetaAttributeMemberList & rList =
                     pType->GetAttrList();
-        for( sal_uIntPtr n = 0; n < rList.Count(); n++ )
+        for( sal_uLong n = 0; n < rList.Count(); n++ )
         {
             SvMetaAttribute * pPar  = rList.GetObject( n );
             SvMetaType * pPType     = pPar->GetType();
@@ -1603,7 +1603,7 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
     if (!GetToolBoxConfig() && !GetAccelConfig() && !GetMenuConfig() && !GetStatusBarConfig() )
         return;
 
-    sal_uIntPtr nSId = GetSlotId().GetValue();
+    sal_uLong nSId = GetSlotId().GetValue();
     if( !pTable->IsKeyValid( nSId ) )
     {
         pTable->Insert( nSId, this );
@@ -1630,7 +1630,7 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
     SvMetaTypeEnum * pEnum = PTR_CAST( SvMetaTypeEnum, GetType() );
     if( GetPseudoSlots() && pEnum )
     {
-        for( sal_uIntPtr n = 0; n < pEnum->Count(); n++ )
+        for( sal_uLong n = 0; n < pEnum->Count(); n++ )
         {
             ByteString aValName = pEnum->GetObject( n )->GetName();
             ByteString aSId( GetSlotId() );
@@ -1639,7 +1639,7 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
             aSId += '_';
             aSId += aValName.Copy( pEnum->GetPrefix().Len() );
 
-            sal_uIntPtr nSId2;
+            sal_uLong nSId2;
             sal_Bool bIdOk = sal_False;
             if( rBase.FindId( aSId, &nSId2 ) )
             {
@@ -1672,7 +1672,7 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
 void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
                              Table * pTable )
 {
-    sal_uIntPtr nSId = GetSlotId().GetValue();
+    sal_uLong nSId = GetSlotId().GetValue();
     if( !pTable->IsKeyValid( nSId ) )
     {
         pTable->Insert( nSId, this );
@@ -1682,7 +1682,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
     SvMetaTypeEnum * pEnum = PTR_CAST( SvMetaTypeEnum, GetType() );
     if( GetPseudoSlots() && pEnum )
     {
-        for( sal_uIntPtr n = 0; n < pEnum->Count(); n++ )
+        for( sal_uLong n = 0; n < pEnum->Count(); n++ )
         {
             ByteString aValName = pEnum->GetObject( n )->GetName();
             ByteString aSId( GetSlotId() );
@@ -1691,7 +1691,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
             aSId += '_';
             aSId += aValName.Copy( pEnum->GetPrefix().Len() );
 
-            sal_uIntPtr nSId2;
+            sal_uLong nSId2;
             sal_Bool bIdOk = sal_False;
             if( rBase.FindId( aSId, &nSId2 ) )
             {
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index c9874ecbe292..48b08da96962 100755
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -267,8 +267,8 @@ void SvMetaAttribute::FillSbxObject( SbxInfo * pInfo, sal_uInt16 nSbxFlags )
     if( pBaseType->GetType() == TYPE_STRUCT )
     {
         const SvMetaAttributeMemberList & rList = pBaseType->GetAttrList();
-        sal_uIntPtr nCount = rList.Count();
-        for( sal_uIntPtr i = 0; i < nCount; i++ )
+        sal_uLong nCount = rList.Count();
+        for( sal_uLong i = 0; i < nCount; i++ )
             rList.GetObject( i )->FillSbxObject( pInfo, nSbxFlags );
     }
     else
@@ -303,8 +303,8 @@ void SvMetaAttribute::FillSbxObject( SvIdlDataBase & rBase,
             if ( GetSlotId().Len() )
                 rBase.aStructSlotId = GetSlotId();
             const SvMetaAttributeMemberList & rList = pBaseType->GetAttrList();
-            sal_uIntPtr nCount = rList.Count();
-            for( sal_uIntPtr i = 0; i < nCount; i++ )
+            sal_uLong nCount = rList.Count();
+            for( sal_uLong i = 0; i < nCount; i++ )
                 rList.GetObject( i )->FillSbxObject( rBase, pObj, bVariable );
             rBase.aStructSlotId = aSlotId;
         }
@@ -418,7 +418,7 @@ void SvMetaAttribute::WriteSvIdl
         rOutStm << ' ' << aSlotId.GetBuffer();
     if( pType->GetType() == TYPE_METHOD )
         pType->WriteMethodArgs( rBase, rOutStm, nTab, WRITE_IDL );
-    sal_uIntPtr nPos = rOutStm.Tell();
+    sal_uLong nPos = rOutStm.Tell();
     rOutStm << endl;
     SvMetaName::WriteSvIdl( rBase, rOutStm, nTab );
     TestAndSeekSpaceOnly( rOutStm, nPos );
@@ -529,8 +529,8 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
         if( pBaseType->GetType() == TYPE_STRUCT )
         {
             const SvMetaAttributeMemberList & rList = pBaseType->GetAttrList();
-            sal_uIntPtr nCount = rList.Count();
-            for( sal_uIntPtr i = 0; i < nCount; i++ )
+            sal_uLong nCount = rList.Count();
+            for( sal_uLong i = 0; i < nCount; i++ )
             {
                 rList.GetObject( i )->WriteParam( rBase, rOutStm, nTab, nT );
                 if( i+1<nCount )
@@ -584,10 +584,10 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
 |*
 |*    Beschreibung
 *************************************************************************/
-sal_uIntPtr SvMetaAttribute::MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVar ) const
+sal_uLong SvMetaAttribute::MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVar ) const
 {
      const SvNumberIdentifier & rId = GetSlotId();
-    sal_uIntPtr n = rId.GetValue();
+    sal_uLong n = rId.GetValue();
     if( rBase.aStructSlotId.Len() )
     {
         n = n << 20;
@@ -743,7 +743,7 @@ void SvMetaAttribute::WriteRecursiv_Impl( SvIdlDataBase & rBase,
                              WriteType nT, WriteAttribute nA )
 {
     const SvMetaAttributeMemberList & rList = GetType()->GetBaseType()->GetAttrList();
-    sal_uIntPtr nCount = rList.Count();
+    sal_uLong nCount = rList.Count();
 
     SvNumberIdentifier slotId = rBase.aStructSlotId;
     if ( GetSlotId().Len() )
@@ -754,7 +754,7 @@ void SvMetaAttribute::WriteRecursiv_Impl( SvIdlDataBase & rBase,
     if ( GetReadonly() )
         nA |= WA_READONLY;
 
-    for( sal_uIntPtr i = 0; i < nCount; i++ )
+    for( sal_uLong i = 0; i < nCount; i++ )
     {
         SvMetaAttribute *pAttr = rList.GetObject( i );
         if ( nT == WRITE_DOCU )
@@ -970,7 +970,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*
 |*    Beschreibung
 *************************************************************************/
-sal_uIntPtr SvMetaAttribute::MakeSfx( ByteString * pAttrArray )
+sal_uLong SvMetaAttribute::MakeSfx( ByteString * pAttrArray )
 {
     SvMetaType * pType = GetType();
     DBG_ASSERT( pType, "no type for attribute" );
@@ -1413,7 +1413,7 @@ void SvMetaType::FillSbxObject( SbxVariable * pObj, sal_Bool bVariable )
     {
         if( GetType() == TYPE_METHOD )
         {
-            sal_uIntPtr nCount = GetAttrCount();
+            sal_uLong nCount = GetAttrCount();
             if( nCount )
             {
                 SbxInfoRef xInfo = pObj->GetInfo();
@@ -1422,7 +1422,7 @@ void SvMetaType::FillSbxObject( SbxVariable * pObj, sal_Bool bVariable )
                     xInfo = new SbxInfo();
                     pObj->SetInfo( xInfo );
                 }
-                for( sal_uIntPtr n = nCount; n > 0; n-- )
+                for( sal_uLong n = nCount; n > 0; n-- )
                     pAttrList->GetObject( n -1 )->FillSbxObject( xInfo );
             }
         }
@@ -1563,7 +1563,7 @@ void SvMetaType::WriteSvIdl
     if( GetType() == TYPE_METHOD )
         WriteMethodArgs( rBase, rOutStm, nTab, WRITE_IDL );
 
-    sal_uIntPtr nOldPos = rOutStm.Tell();
+    sal_uLong nOldPos = rOutStm.Tell();
     rOutStm << endl;
     SvMetaExtern::WriteSvIdl( rBase, rOutStm, nTab );
     if( TestAndSeekSpaceOnly( rOutStm, nOldPos ) )
@@ -1890,15 +1890,15 @@ void SvMetaType::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
 |*
 |*    Beschreibung
 *************************************************************************/
-sal_uIntPtr SvMetaType::MakeSfx( ByteString * pAttrArray )
+sal_uLong SvMetaType::MakeSfx( ByteString * pAttrArray )
 {
-    sal_uIntPtr nC = 0;
+    sal_uLong nC = 0;
 
     if( GetBaseType()->GetType() == TYPE_STRUCT )
     {
-        sal_uIntPtr nAttrCount = GetAttrCount();
+        sal_uLong nAttrCount = GetAttrCount();
         // Die einzelnen Attribute schreiben
-        for( sal_uIntPtr n = 0; n < nAttrCount; n++ )
+        for( sal_uLong n = 0; n < nAttrCount; n++ )
         {
             nC += pAttrList->GetObject( n )->MakeSfx( pAttrArray );
             if( n +1 < nAttrCount )
@@ -1918,8 +1918,8 @@ void SvMetaType::WriteSfxItem(
 
     ByteString  aTypeName = "SfxType";
     ByteString  aAttrArray;
-    sal_uIntPtr nAttrCount = MakeSfx( &aAttrArray );
-    //sal_uIntPtr   nAttrCount = GetAttrCount();
+    sal_uLong   nAttrCount = MakeSfx( &aAttrArray );
+    //sal_uLong nAttrCount = GetAttrCount();
     ByteString  aAttrCount( ByteString::CreateFromInt32( nAttrCount ) );
     aTypeName += aAttrCount;
 
@@ -2232,9 +2232,9 @@ ByteString SvMetaType::GetParserString() const
 
     if( TYPE_METHOD == type || TYPE_STRUCT == type )
     {
-        sal_uIntPtr nAttrCount = GetAttrCount();
+        sal_uLong nAttrCount = GetAttrCount();
         // Die einzelnen Attribute schreiben
-        for( sal_uIntPtr n = 0; n < nAttrCount; n++ )
+        for( sal_uLong n = 0; n < nAttrCount; n++ )
         {
             SvMetaAttribute * pT = pAttrList->GetObject( n );
             aPStr += pT->GetType()->GetParserString();
@@ -2264,9 +2264,9 @@ void SvMetaType::WriteParamNames( SvIdlDataBase & rBase,
 
         if( TYPE_METHOD == type || TYPE_STRUCT == type )
         {
-            sal_uIntPtr nAttrCount = GetAttrCount();
+            sal_uLong nAttrCount = GetAttrCount();
             // Die einzelnen Attribute schreiben
-            for( sal_uIntPtr n = 0; n < nAttrCount; n++ )
+            for( sal_uLong n = 0; n < nAttrCount; n++ )
             {
                 SvMetaAttribute * pA = pAttrList->GetObject( n );
                 // Fuer Methoden ist rChief immer ""
@@ -2455,7 +2455,7 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm )
 sal_uInt16 SvMetaTypeEnum::GetMaxValue() const
 {
     sal_uInt16 nMax = 0;
-    for( sal_uIntPtr n = 0; n < aEnumValueList.Count(); n++ )
+    for( sal_uLong n = 0; n < aEnumValueList.Count(); n++ )
     {
         SvMetaEnumValue * pObj = aEnumValueList.GetObject( n );
         if( nMax < pObj->GetValue() )
@@ -2509,7 +2509,7 @@ void SvMetaTypeEnum::WriteContextSvIdl( SvIdlDataBase & rBase,
                                         sal_uInt16 nTab )
 {
     WriteTab( rOutStm, nTab +1 );
-    for( sal_uIntPtr n = 0; n < aEnumValueList.Count(); n++ )
+    for( sal_uLong n = 0; n < aEnumValueList.Count(); n++ )
     {
         aEnumValueList.GetObject( n )->WriteSvIdl( rBase, rOutStm, nTab );
         if( n +1 != aEnumValueList.Count() )
@@ -2580,7 +2580,7 @@ void SvMetaTypeEnum::WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
                                  WriteType nT, WriteAttribute nA )
 {
     WriteTab( rOutStm, nTab +1 );
-    for( sal_uIntPtr n = 0; n < aEnumValueList.Count(); n++ )
+    for( sal_uLong n = 0; n < aEnumValueList.Count(); n++ )
     {
         aEnumValueList.GetObject( n )->Write( rBase, rOutStm, nTab +1, nT, nA );
 
@@ -2645,7 +2645,7 @@ ByteString SvMetaAttribute::Compare( SvMetaAttribute* pAttr )
 
             if ( aType->GetAttrCount() )
             {
-                sal_uIntPtr nCount = aType->GetAttrCount();
+                sal_uLong nCount = aType->GetAttrCount();
                 SvMetaAttributeMemberList& rList = aType->GetAttrList();
                 SvMetaAttributeMemberList& rOtherList = pAttr->GetType()->GetAttrList();
                 if ( pAttr->GetType()->GetAttrCount() != nCount )
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 67a532531855..616ed98d182a 100755
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -264,7 +264,7 @@ SvCommand::SvCommand( int argc, char ** argv )
     StringList aList;
 
     if( ResponseFile( &aList, argc, argv ) )
-    for( sal_uIntPtr i = 1; i < aList.Count(); i++ )
+    for( sal_uLong i = 1; i < aList.Count(); i++ )
     {
         String aParam( *aList.GetObject( i ) );
         sal_Unicode aFirstChar( aParam.GetChar(0) );
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 9f3be2ccea86..dd199ea4261d 100755
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -113,7 +113,7 @@ SvMetaTypeMemberList & SvIdlDataBase::GetTypeList()
 
 
         // A c h t u n g !!!, bei hinzufuegen von Typen werden alle
-        // bin„ren Datenbasen inkompatibel
+        // bin�ren Datenbasen inkompatibel
 
     /*
         // So tun als ob die Init-Daten auf einem Stream gelesen wurden
@@ -139,7 +139,7 @@ SvMetaTypeMemberList & SvIdlDataBase::GetTypeList()
 *************************************************************************/
 SvMetaModule * SvIdlDataBase::GetModule( const ByteString & rName )
 {
-    for( sal_uIntPtr n = 0; n < aModuleList.Count(); n++ )
+    for( sal_uLong n = 0; n < aModuleList.Count(); n++ )
         if( aModuleList.GetObject( n )->GetName() == rName )
             return aModuleList.GetObject( n );
     return NULL;
@@ -157,7 +157,7 @@ SvMetaModule * SvIdlDataBase::GetModule( const ByteString & rName )
 sal_Bool SvIdlDataBase::IsBinaryFormat( SvStream & rStm )
 {
     sal_uInt32  nSig = 0;
-    sal_uIntPtr   nPos = rStm.Tell();
+    sal_uLong   nPos = rStm.Tell();
     rStm >> nSig;
     rStm.Seek( nPos );
 
@@ -221,7 +221,7 @@ void SvIdlDataBase::Save( SvStream & rStm, sal_uInt32 nFlags )
     if( bOnlyStreamedObjs )
     {
         SvMetaClassMemberList aList;
-        for( sal_uIntPtr n = 0; n < GetModuleList().Count(); n++ )
+        for( sal_uLong n = 0; n < GetModuleList().Count(); n++ )
         {
             SvMetaModule * pModule = GetModuleList().GetObject( n );
             if( !pModule->IsImported() )
@@ -275,7 +275,7 @@ void SvIdlDataBase::Push( SvMetaObject * pObj )
 |*    Beschreibung
 |*
 *************************************************************************/
-sal_Bool SvIdlDataBase::FindId( const ByteString & rIdName, sal_uIntPtr * pVal )
+sal_Bool SvIdlDataBase::FindId( const ByteString & rIdName, sal_uLong * pVal )
 {
     if( pIdTable )
     {
@@ -296,7 +296,7 @@ sal_Bool SvIdlDataBase::FindId( const ByteString & rIdName, sal_uIntPtr * pVal )
 |*    Beschreibung
 |*
 *************************************************************************/
-sal_Bool SvIdlDataBase::InsertId( const ByteString & rIdName, sal_uIntPtr nVal )
+sal_Bool SvIdlDataBase::InsertId( const ByteString & rIdName, sal_uLong nVal )
 {
     if( !pIdTable )
         pIdTable = new SvStringHashTable( 20003 );
@@ -355,14 +355,14 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
                         return sal_False;
                     }
 
-                    sal_uIntPtr nVal = 0;
+                    sal_uLong nVal = 0;
                     sal_Bool bOk = sal_True;
                     while( bOk )
                     {
                         pTok = aTokStm.GetToken_Next();
                         if( pTok->IsIdentifier() )
                         {
-                            sal_uIntPtr n;
+                            sal_uLong n;
                             if( FindId( pTok->GetString(), &n ) )
                                 nVal += n;
                             else
@@ -615,7 +615,7 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr
 /*
         SvToken * pTok = rInStm.GetToken_Next();
         if( pTok->IsIdentifier() )
-            for( sal_uIntPtr n = 0; n < aAttrList.Count(); n++ )
+            for( sal_uLong n = 0; n < aAttrList.Count(); n++ )
             {
                 SvMetaAttribute * pAttr = aAttrList.GetObject( n );
                 if( pAttr->GetName() == pTok->GetString() )
@@ -629,10 +629,10 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr
         SvToken * pTok = rInStm.GetToken_Next();
         if( pTok->IsIdentifier() )
         {
-            sal_uIntPtr n;
+            sal_uLong n;
             if( FindId( pTok->GetString(), &n ) )
             {
-                for( sal_uIntPtr i = 0; i < aAttrList.Count(); i++ )
+                for( sal_uLong i = 0; i < aAttrList.Count(); i++ )
                 {
                     SvMetaAttribute * pAttr = aAttrList.GetObject( i );
                     if( pAttr->GetSlotId() == pTok->GetString() )
@@ -655,10 +655,10 @@ SvMetaAttribute* SvIdlDataBase::SearchKnownAttr
     const SvNumberIdentifier& rId
 )
 {
-    sal_uIntPtr n;
+    sal_uLong n;
     if( FindId( rId, &n ) )
     {
-        for( sal_uIntPtr i = 0; i < aAttrList.Count(); i++ )
+        for( sal_uLong i = 0; i < aAttrList.Count(); i++ )
         {
             SvMetaAttribute * pAttr = aAttrList.GetObject( i );
             if( pAttr->GetSlotId() == rId )
@@ -680,7 +680,7 @@ SvMetaClass * SvIdlDataBase::ReadKnownClass( SvTokenStream & rInStm )
     SvToken * pTok = rInStm.GetToken_Next();
 
     if( pTok->IsIdentifier() )
-        for( sal_uIntPtr n = 0; n < aClassList.Count(); n++ )
+        for( sal_uLong n = 0; n < aClassList.Count(); n++ )
         {
             SvMetaClass * pClass = aClassList.GetObject( n );
             if( pClass->GetName() == pTok->GetString() )
@@ -710,7 +710,7 @@ void SvIdlDataBase::Write( const ByteString & rText )
 void SvIdlDataBase::WriteError( const ByteString & rErrWrn,
                                 const ByteString & rFileName,
                                 const ByteString & rErrorText,
-                                sal_uIntPtr nRow, sal_uIntPtr nColumn ) const
+                                sal_uLong nRow, sal_uLong nColumn ) const
 {
     //Fehlerbehandlung
     fprintf( stderr, "\n%s --- %s: ( %ld, %ld )\n",
@@ -732,7 +732,7 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
     //Fehlerbehandlung
     String aFileName( rInStm.GetFileName() );
     ByteString aErrorText;
-    sal_uIntPtr nRow = 0, nColumn = 0;
+    sal_uLong   nRow = 0, nColumn = 0;
 
     rInStm.SeekEnd();
     SvToken *pTok = rInStm.GetToken();
@@ -910,7 +910,7 @@ sal_Bool SvIdlWorkingBase::WriteSvIdl( SvStream & rOutStm )
         }
     }
 
-    for( sal_uIntPtr n = 0; n < GetModuleList().Count(); n++ )
+    for( sal_uLong n = 0; n < GetModuleList().Count(); n++ )
     {
         SvMetaModule * pModule = GetModuleList().GetObject( n );
         //if( !pModule->IsImported() )
@@ -932,7 +932,7 @@ sal_Bool SvIdlWorkingBase::WriteSfx( SvStream & rOutStm )
     // alle Tmp-Variablen fuer das Schreiben zuruecksetzen
     WriteReset();
     SvMemoryStream aTmpStm( 256000, 256000 );
-    sal_uIntPtr n;
+    sal_uLong n;
     for( n = 0; n < GetModuleList().Count(); n++ )
     {
         SvMetaModule * pModule = GetModuleList().GetObject( n );
@@ -956,7 +956,7 @@ sal_Bool SvIdlWorkingBase::WriteHelpIds( SvStream& rOutStm )
         return sal_False;
 
     Table aIdTable;
-    sal_uIntPtr n;
+    sal_uLong n;
     for( n = 0; n < GetModuleList().Count(); n++ )
     {
         SvMetaModule * pModule = GetModuleList().GetObject( n );
@@ -999,8 +999,8 @@ void SvIdlDataBase::AppendAttr( SvMetaAttribute *pAttr )
 sal_Bool SvIdlWorkingBase::WriteCSV( SvStream& rStrm )
 {
     SvMetaAttributeMemberList &rList = GetAttrList();
-    sal_uIntPtr nCount = rList.Count();
-    for ( sal_uIntPtr n=0; n<nCount; n++ )
+    sal_uLong nCount = rList.Count();
+    for ( sal_uLong n=0; n<nCount; n++ )
     {
         if ( rList.GetObject(n)->IsNewAttribute() )
         {
@@ -1024,7 +1024,7 @@ sal_Bool SvIdlWorkingBase::WriteDocumentation( SvStream & rOutStm )
     if( rOutStm.GetError() != SVSTREAM_OK )
         return sal_False;
 
-    for( sal_uIntPtr n = 0; n < GetModuleList().Count(); n++ )
+    for( sal_uLong n = 0; n < GetModuleList().Count(); n++ )
     {
         SvMetaModule * pModule = GetModuleList().GetObject( n );
         if( !pModule->IsImported() )
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index a4600fd43ba9..d2884464b5a7 100755
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -40,8 +40,8 @@
 sal_Bool FileMove_Impl( const String & rFile1, const String & rFile2, sal_Bool bImmerVerschieben )
 {
     //printf( "Move from %s to %s\n", rFile2.GetStr(), rFile1.GetStr() );
-    sal_uIntPtr nC1 = 0;
-    sal_uIntPtr nC2 = 1;
+    sal_uLong nC1 = 0;
+    sal_uLong nC2 = 1;
     if( !bImmerVerschieben )
     {
         SvFileStream aOutStm1( rFile1, STREAM_STD_READ );