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

7 files changed, 33 insertions, 33 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