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

7 files changed, 67 insertions, 67 deletions

diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index d0a66cd2b301..e849a9969d07 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.hxx
@@ -37,7 +37,7 @@ class RscClass : public RscTop
 {
 protected:
     struct RscClassInst{
-        sal_uIntPtr   nVarDflt;
+        sal_uLong   nVarDflt;
     };
     struct VARTYPE_STRUCT {
         Atom            nVarName;   // Variablenname
diff --git a/rsc/inc/rscclobj.hxx b/rsc/inc/rscclobj.hxx
index a1eb7affc23d..75277813a8cb 100644
--- a/rsc/inc/rscclobj.hxx
+++ b/rsc/inc/rscclobj.hxx
@@ -51,18 +51,18 @@ DECLARE_LIST( RscInconsList, RscInconsistent * )
 class ObjNode : public IdNode{
     RscId       aRscId; // Id der Resource
     CLASS_DATA  pRscObj;// pointer to a resourceobject
-    sal_uIntPtr       lFileKey;// Dateischluessel
+    sal_uLong       lFileKey;// Dateischluessel
 protected:
     using NameNode::Search;
 
 public:
     using NameNode::Insert;
 
-                ObjNode( const RscId & rId, CLASS_DATA pData, sal_uIntPtr lKey );
-    ObjNode *   DelObjNode( RscTop * pClass, sal_uIntPtr lFileKey );
+                ObjNode( const RscId & rId, CLASS_DATA pData, sal_uLong lKey );
+    ObjNode *   DelObjNode( RscTop * pClass, sal_uLong lFileKey );
     sal_uInt32      GetId() const;
     RscId       GetRscId(){ return( aRscId ); }
-    sal_uIntPtr       GetFileKey(){ return lFileKey; };
+    sal_uLong       GetFileKey(){ return lFileKey; };
     ObjNode*    Search( const RscId &rName ) const{
                     // search the index in the b-tree
                     return( (ObjNode *)IdNode::Search( rName ) );
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 4ddfb24df289..76552a455fa7 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -79,7 +79,7 @@ class RscTypCont
     ByteString          aSearchPath;        // Suchen der Bitmap, Icon, Pointer
     ByteString          aSysSearchPath;     // aSearchPath plus language specific paths
     sal_uInt32              nUniqueId;          // eindeutiger Id fuer Systemresourcen
-    sal_uIntPtr             nFilePos;           // Position in der Datei ( MTF )
+    sal_uLong               nFilePos;           // Position in der Datei ( MTF )
     sal_uInt32              nPMId;              // eindeutiger Id fuer PM-Rseourcefile
                                             // muss groesser als RSC_VERSIONCONTROL_ID sein
     RscTop  *           pRoot;              // Zeiger auf die Wurzel vom Typenbaum
@@ -266,7 +266,7 @@ class RscTypCont
 
     void        InsWinBit( RscTop * pClass, const ByteString & rName,
                            Atom nVal );
-    void        WriteInc( FILE * fOutput, sal_uIntPtr lKey );
+    void        WriteInc( FILE * fOutput, sal_uLong lKey );
 
 public:
     RscBool             aBool;
@@ -297,7 +297,7 @@ public:
     RscNameTable        aNmTb;      // Tabelle fuer Namen
     RscFileTab          aFileTab;   // Tabelle der Dateinamen
     sal_uInt32              nFlags;
-    std::map<sal_uInt64, sal_uIntPtr>   aIdTranslator; //Ordnet Resourcetypen und Id's einen Id zu
+    std::map<sal_uInt64, sal_uLong> aIdTranslator; //Ordnet Resourcetypen und Id's einen Id zu
                                        //(unter PM), oder eine Dateiposition (MTF)
 
     RscTypCont( RscError *, RSCBYTEORDER_TYPE, const ByteString & rSearchPath, sal_uInt32 nFlags );
@@ -338,23 +338,23 @@ public:
     CLASS_DATA  Search( Atom typ, const RscId & rId );
     void        Delete( Atom typ, const RscId & rId );
                 // loescht alle Resourceobjekte diese Datei
-    void        Delete( sal_uIntPtr lFileKey );
+    void        Delete( sal_uLong lFileKey );
     RscTop  *   GetRoot()         { return( pRoot ); };
     sal_uInt32      PutSysName( sal_uInt32 nRscTyp, char * pName, sal_uInt32 nConst,
                             sal_uInt32 nId, sal_Bool bFirst );
     void        ClearSysNames();
     ERRTYPE     WriteRc( WriteRcContext& rContext );
-    void        WriteSrc( FILE * fOutput, sal_uIntPtr nFileIndex,
+    void        WriteSrc( FILE * fOutput, sal_uLong nFileIndex,
                           CharSet nCharSet, sal_Bool bName = sal_True );
-    ERRTYPE     WriteHxx( FILE * fOutput, sal_uIntPtr nFileKey);
-    ERRTYPE     WriteCxx( FILE * fOutput, sal_uIntPtr nFileKey,
+    ERRTYPE     WriteHxx( FILE * fOutput, sal_uLong nFileKey);
+    ERRTYPE     WriteCxx( FILE * fOutput, sal_uLong nFileKey,
                           const ByteString & rHxxName );
     void        WriteSyntax( FILE * fOutput );
     void        WriteRcCtor( FILE * fOutput );
-    void        FillNameIdList( REResourceList * pList, sal_uIntPtr lFileKey );
+    void        FillNameIdList( REResourceList * pList, sal_uLong lFileKey );
     sal_Bool        MakeConsistent( RscInconsList * pList );
     sal_uInt32      PutTranslatorKey( sal_uInt64 nKey );
-    void        IncFilePos( sal_uIntPtr nOffset ){ nFilePos += nOffset; }
+    void        IncFilePos( sal_uLong nOffset ){ nFilePos += nOffset; }
 };
 
 #endif
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index 68dc47a47419..8900c5708c99 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.hxx
@@ -125,15 +125,15 @@ friend class RscDefineList;
 friend class RscDefTree;
 friend class RscExpression;
 friend class RscId;
-    sal_uIntPtr         lFileKey;   // zu welcher Datei gehoert das Define
+    sal_uLong           lFileKey;   // zu welcher Datei gehoert das Define
     sal_uInt32          nRefCount;  // Wieviele Referenzen auf dieses Objekt
     sal_Int32           lId;        // Identifier
     RscExpression * pExp;       // Ausdruck
 protected:
 
-            RscDefine( sal_uIntPtr lFileKey, const ByteString & rDefName,
+            RscDefine( sal_uLong lFileKey, const ByteString & rDefName,
                        sal_Int32 lDefId );
-            RscDefine( sal_uIntPtr lFileKey, const ByteString & rDefName,
+            RscDefine( sal_uLong lFileKey, const ByteString & rDefName,
                        RscExpression * pExpression );
             ~RscDefine();
     void    IncRef(){ nRefCount++; }
@@ -147,7 +147,7 @@ protected:
     using StringNode::Search;
 public:
     RscDefine * Search( const char * );
-    sal_uIntPtr     GetFileKey() const { return lFileKey; }
+    sal_uLong       GetFileKey() const { return lFileKey; }
     sal_Bool        Evaluate();
     sal_Int32       GetNumber() const  { return lId;      }
     ByteString  GetMacro();
@@ -160,13 +160,13 @@ friend class RscFile;
 friend class RscFileTab;
 private:
                 // pExpression wird auf jedenfall Eigentum der Liste
-    RscDefine * New( sal_uIntPtr lFileKey, const ByteString & rDefName,
-                     sal_Int32 lDefId, sal_uIntPtr lPos );
-    RscDefine * New( sal_uIntPtr lFileKey, const ByteString & rDefName,
-                     RscExpression * pExpression, sal_uIntPtr lPos );
+    RscDefine * New( sal_uLong lFileKey, const ByteString & rDefName,
+                     sal_Int32 lDefId, sal_uLong lPos );
+    RscDefine * New( sal_uLong lFileKey, const ByteString & rDefName,
+                     RscExpression * pExpression, sal_uLong lPos );
     sal_Bool        Befor( const RscDefine * pFree, const RscDefine * pDepend );
     sal_Bool        Remove( RscDefine * pDef );
-    sal_Bool        Remove( sal_uIntPtr nIndex );
+    sal_Bool        Remove( sal_uLong nIndex );
     sal_Bool        Remove();
 public:
     void        WriteAll( FILE * fOutput );
@@ -188,10 +188,10 @@ public:
 
 /********************** R S C F I L E ************************************/
 class RscDepend {
-    sal_uIntPtr          lKey;
+    sal_uLong            lKey;
 public:
-            RscDepend( sal_uIntPtr lIncKey ){ lKey = lIncKey; };
-    sal_uIntPtr GetFileKey(){ return lKey; }
+            RscDepend( sal_uLong lIncKey ){ lKey = lIncKey; };
+    sal_uLong   GetFileKey(){ return lKey; }
 };
 DECLARE_LIST( RscDependList, RscDepend * )
 
@@ -210,9 +210,9 @@ public:
 
                     RscFile();
                     ~RscFile();
-    sal_Bool            InsertDependFile( sal_uIntPtr lDepFile, sal_uIntPtr lPos );
-    void            RemoveDependFile( sal_uIntPtr lDepFile );
-    sal_Bool            Depend( sal_uIntPtr lDepend, sal_uIntPtr lFree );
+    sal_Bool            InsertDependFile( sal_uLong lDepFile, sal_uLong lPos );
+    void            RemoveDependFile( sal_uLong lDepFile );
+    sal_Bool            Depend( sal_uLong lDepend, sal_uLong lFree );
     void            SetIncFlag(){ bIncFile = sal_True; };
     sal_Bool            IsIncFile(){  return bIncFile; };
 };
@@ -235,25 +235,25 @@ public:
 
 class RscFileTab : public RscSubFileTab {
     RscDefTree aDefTree;
-    sal_uIntPtr     Find( const ByteString & rName );
+    sal_uLong       Find( const ByteString & rName );
 public:
                 RscFileTab();
                 ~RscFileTab();
 
     RscDefine * FindDef( const char * );
     RscDefine * FindDef( const ByteString& rStr ) { return FindDef( rStr.GetBuffer() ); }
-    RscDefine * FindDef( sal_uIntPtr lKey, const ByteString & );
+    RscDefine * FindDef( sal_uLong lKey, const ByteString & );
 
-    sal_Bool        Depend( sal_uIntPtr lDepend, sal_uIntPtr lFree );
-    sal_Bool        TestDef( sal_uIntPtr lFileKey, sal_uIntPtr lPos,
+    sal_Bool        Depend( sal_uLong lDepend, sal_uLong lFree );
+    sal_Bool        TestDef( sal_uLong lFileKey, sal_uLong lPos,
                          const RscDefine * pDefDec );
-    sal_Bool        TestDef( sal_uIntPtr lFileKey, sal_uIntPtr lPos,
+    sal_Bool        TestDef( sal_uLong lFileKey, sal_uLong lPos,
                          const RscExpression * pExpDec );
 
-    RscDefine * NewDef( sal_uIntPtr lKey, const ByteString & rDefName,
-                        sal_Int32 lId, sal_uIntPtr lPos );
-    RscDefine * NewDef( sal_uIntPtr lKey, const ByteString & rDefName,
-                        RscExpression *, sal_uIntPtr lPos );
+    RscDefine * NewDef( sal_uLong lKey, const ByteString & rDefName,
+                        sal_Int32 lId, sal_uLong lPos );
+    RscDefine * NewDef( sal_uLong lKey, const ByteString & rDefName,
+                        RscExpression *, sal_uLong lPos );
 
     sal_Bool        ChangeDef( const ByteString & rDefName, sal_Int32 lId );
     sal_Bool        ChangeDef( const ByteString & rDefName, RscExpression * );
@@ -264,11 +264,11 @@ public:
                         const ByteString & rNewName );
 
            // Alle Defines die in dieser Datei Definiert sind loeschen
-    void   DeleteFileContext( sal_uIntPtr lKey );
-    void   DeleteFile( sal_uIntPtr lKey );
-    sal_uIntPtr  NewCodeFile( const ByteString & rName );
-    sal_uIntPtr  NewIncFile( const ByteString & rName, const ByteString & rPath );
-    RscFile * GetFile( sal_uIntPtr lFileKey ){ return Get( lFileKey ); }
+    void   DeleteFileContext( sal_uLong lKey );
+    void   DeleteFile( sal_uLong lKey );
+    sal_uLong  NewCodeFile( const ByteString & rName );
+    sal_uLong  NewIncFile( const ByteString & rName, const ByteString & rPath );
+    RscFile * GetFile( sal_uLong lFileKey ){ return Get( lFileKey ); }
 };
 
 #endif // _RSCDEF_HXX
diff --git a/rsc/inc/rscinst.hxx b/rsc/inc/rscinst.hxx
index 5e21d31ea88c..107060dd863c 100644
--- a/rsc/inc/rscinst.hxx
+++ b/rsc/inc/rscinst.hxx
@@ -152,35 +152,35 @@ public:
                 // Array mit Dateinamen
     RscFileTab* GetFileTab();
                 // Eine Dateinamen-Instanz holen
-    RscFile *   GetFileStruct( sal_uIntPtr lKey );
+    RscFile *   GetFileStruct( sal_uLong lKey );
 
-    sal_uIntPtr     AddSrcFile( const ByteString & rFileName );
-    sal_uIntPtr     AddHrcFile( const ByteString & rFileName );
+    sal_uLong       AddSrcFile( const ByteString & rFileName );
+    sal_uLong       AddHrcFile( const ByteString & rFileName );
                 // Traegt die Include-Dateien in die Abhaengigkeitsliste
                 // von lFileKey ein
-    void        ScanForIncFiles( sal_uIntPtr lFileKey );
-    void        RemoveFile( sal_uIntPtr lKey );
+    void        ScanForIncFiles( sal_uLong lFileKey );
+    void        RemoveFile( sal_uLong lKey );
 
                 // Suche ueber alle DEFINES
     RscDefine * FindDef( const ByteString & rName );
-    sal_uIntPtr     GetFileKey( const ByteString & rFileName );
+    sal_uLong       GetFileKey( const ByteString & rFileName );
 };
 
 class RscHrc
 {
 protected:
-    sal_uIntPtr       lFileKey; // Index der Instanz
+    sal_uLong         lFileKey; // Index der Instanz
     RscDataBase * pDataBase;// Datenbasis
 public:
 
                 // Kompilerinstanz erzeugen
-                RscHrc( RscDataBase * pDBase, sal_uIntPtr lKey );
+                RscHrc( RscDataBase * pDBase, sal_uLong lKey );
                 ~RscHrc();
 
                 // Daten von Datei uebernehmen
     ERRTYPE     ReadFile();
 
-    sal_uIntPtr     GetFileKey() const { return lFileKey; }
+    sal_uLong       GetFileKey() const { return lFileKey; }
 
     void        SetDirty( sal_Bool bSet );
     sal_Bool        IsDirty();
@@ -190,16 +190,16 @@ public:
     ByteString  GetFileName();
 
                 //Depend-Datei anhaengen
-    void        InsertDepend( sal_uIntPtr lKey, sal_uIntPtr lPos );
+    void        InsertDepend( sal_uLong lKey, sal_uLong lPos );
 
                 // DefineList holen
     RscDefineList * GetDefineList();
                 // Suche ueber all DEFINES im Zugriff
     RscDefine * FindDef( const ByteString & rName );
     ERRTYPE     NewDef( const ByteString & rMacroName, sal_Int32 lValue,
-                        sal_uIntPtr lPos );
+                        sal_uLong lPos );
     ERRTYPE     NewDef( const ByteString & rMacroName, const ByteString & rMacro,
-                        sal_uIntPtr lPos );
+                        sal_uLong lPos );
     ERRTYPE     ChangeDef( const ByteString & rMacroName, sal_Int32 lValue );
     ERRTYPE     ChangeDef( const ByteString & rMacroName,
                            const ByteString & rMacro );
@@ -220,7 +220,7 @@ public:
 class RscSrc : public RscHrc {
 public:
             // Kompilerinstanz erzeugen
-            RscSrc( RscDataBase * pDBase, sal_uIntPtr lKey );
+            RscSrc( RscDataBase * pDBase, sal_uLong lKey );
             ~RscSrc();
 
 
diff --git a/rsc/inc/rscpar.hxx b/rsc/inc/rscpar.hxx
index 0f3a3f8c1ad1..952c4670616c 100644
--- a/rsc/inc/rscpar.hxx
+++ b/rsc/inc/rscpar.hxx
@@ -43,8 +43,8 @@ class RscFileInst
     sal_uInt32              nErrorPos;  // Position des ersten Fehlers
     sal_Bool                bIncLine;   // Muss Zeilennummer incrementiert werden
     sal_uInt32              nLineNo;    // Zeile in der Eingabedatei
-    sal_uIntPtr             lFileIndex; // Index auf Eingabedatei
-    sal_uIntPtr             lSrcIndex;  // Index auf Basisdatei
+    sal_uLong               lFileIndex; // Index auf Eingabedatei
+    sal_uLong               lSrcIndex;  // Index auf Basisdatei
     FILE *              fInputFile; // Eingabedatei
     char *              pInput;     // Lesepuffer
     sal_uInt32              nInputBufLen; // Laenge des Lesepuffers
@@ -59,15 +59,15 @@ class RscFileInst
 public:
     RscTypCont *        pTypCont;
     void    Init();  // ctor initialisieren
-            RscFileInst( RscTypCont * pTC, sal_uIntPtr lIndexSrc,
-                         sal_uIntPtr lFileIndex, FILE * fFile );
-            RscFileInst( RscTypCont * pTC, sal_uIntPtr lIndexSrc,
-                         sal_uIntPtr lFileIndex, const ByteString & );
+            RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc,
+                         sal_uLong lFileIndex, FILE * fFile );
+            RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc,
+                         sal_uLong lFileIndex, const ByteString & );
             ~RscFileInst();
     sal_Bool    IsEof() const { return bEof; }
-    void    SetFileIndex( sal_uIntPtr lFIndex ) { lFileIndex = lFIndex;  }
-    sal_uIntPtr GetFileIndex()                { return( lFileIndex );  }
-    sal_uIntPtr GetSrcIndex()                 { return( lSrcIndex );   }
+    void    SetFileIndex( sal_uLong lFIndex ) { lFileIndex = lFIndex;  }
+    sal_uLong   GetFileIndex()                { return( lFileIndex );  }
+    sal_uLong   GetSrcIndex()                 { return( lSrcIndex );   }
     void    SetLineNo( sal_uInt32 nLine )     { nLineNo = nLine;       }
     sal_uInt32  GetLineNo()                   { return( nLineNo );     }
     sal_uInt32  GetScanPos()                  { return( nScanPos );    }
diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx
index 1bf311b4eb76..711b686f8a27 100644
--- a/rsc/inc/rscrsc.hxx
+++ b/rsc/inc/rscrsc.hxx
@@ -129,8 +129,8 @@ public:
     ByteString      GetTmpFileName();   // Die Dateien werden geloescht
 
                     // Include Statements lesen
-    ERRTYPE         IncludeParser( sal_uIntPtr lFileKey );
-    ERRTYPE         ParseOneFile( sal_uIntPtr lFileKey, const RscCmdLine::OutputFile* pOutputFile, const WriteRcContext* pContext );
+    ERRTYPE         IncludeParser( sal_uLong lFileKey );
+    ERRTYPE         ParseOneFile( sal_uLong lFileKey, const RscCmdLine::OutputFile* pOutputFile, const WriteRcContext* pContext );
     ERRTYPE         Link();
     void            EndCompile();
 };