#i112600#: clean up l10ntools, rsc, sot, svl, tools and unotools

11 files changed, 189 insertions, 189 deletions

diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index ae0708f5ff05..e0c2c0cf61f2 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -76,13 +76,13 @@ public:
     CfgStack() : CfgStackList( 10, 10 ) {}
     ~CfgStack();
 
-    ULONG Push( CfgStackData *pStackData );
+    sal_uIntPtr Push( CfgStackData *pStackData );
     CfgStackData *Push( const ByteString &rTag, const ByteString &rId );
     CfgStackData *Pop() { return Remove( Count() - 1 ); }
 
-    CfgStackData *GetStackData( ULONG nPos = LIST_APPEND );
+    CfgStackData *GetStackData( sal_uIntPtr nPos = LIST_APPEND );
 
-    ByteString GetAccessPath( ULONG nPos = LIST_APPEND );
+    ByteString GetAccessPath( sal_uIntPtr nPos = LIST_APPEND );
 };
 
 //
@@ -101,7 +101,7 @@ protected:
     CfgStack aStack;
     CfgStackData *pStackData;
 
-    BOOL bLocalize;
+    sal_Bool bLocalize;
 
     virtual void WorkOnText(
         ByteString &rText,
@@ -121,7 +121,7 @@ private:
         const ByteString &rIsoLang,
         const ByteString &rResTyp );
 
-BOOL IsTokenClosed( const ByteString &rToken );
+sal_Bool IsTokenClosed( const ByteString &rToken );
 
 public:
     CfgParser();
@@ -181,9 +181,9 @@ private:
     std::vector<ByteString> aLanguages;
     ResData *pResData;
 
-    BOOL bGerman;
+    sal_Bool bGerman;
     ByteString sFilename;
-    BOOL bEnglish;
+    sal_Bool bEnglish;
 
 protected:
     void WorkOnText(
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index d1474503882f..8828594c54fd 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -61,7 +61,7 @@
 
 
 struct eqstr{
-  BOOL operator()(const char* s1, const char* s2) const{
+  sal_Bool operator()(const char* s1, const char* s2) const{
     return strcmp(s1,s2)==0;
   }
 };
@@ -114,11 +114,11 @@ DECLARE_LIST( ExportListBase, ExportListEntry * )
 class ExportList : public ExportListBase
 {
 private:
-    ULONG nSourceLanguageListEntryCount;
+    sal_uIntPtr nSourceLanguageListEntryCount;
 
 public:
     ExportList() : ExportListBase() { nSourceLanguageListEntryCount = 0; }
-    ULONG GetSourceLanguageListEntryCount() { return nSourceLanguageListEntryCount; }
+    sal_uIntPtr GetSourceLanguageListEntryCount() { return nSourceLanguageListEntryCount; }
     void NewSourceLanguageListEntry() { nSourceLanguageListEntryCount++; }
 };
 
@@ -144,21 +144,21 @@ class ResData
 {
 public:
     ~ResData();
-    BOOL SetId( const ByteString &rId, USHORT nLevel );
+    sal_Bool SetId( const ByteString &rId, sal_uInt16 nLevel );
 
-    USHORT nWidth;
-    USHORT nChildIndex;
-    USHORT nIdLevel;
-    BOOL bChild;
-    BOOL bChildWithText;
+    sal_uInt16 nWidth;
+    sal_uInt16 nChildIndex;
+    sal_uInt16 nIdLevel;
+    sal_Bool bChild;
+    sal_Bool bChildWithText;
 
-    BOOL bText;
-    BOOL bHelpText;
-    BOOL bQuickHelpText;
-    BOOL bTitle;
-    BOOL bList;
+    sal_Bool bText;
+    sal_Bool bHelpText;
+    sal_Bool bQuickHelpText;
+    sal_Bool bTitle;
+    sal_Bool bList;
 
-    BOOL bRestMerged;
+    sal_Bool bRestMerged;
 
     ByteString sResTyp;
     ByteString sId;
@@ -167,16 +167,16 @@ public:
     ByteString sFilename;
 
     ByteStringHashMap sText;
-    USHORT nTextRefId;
+    sal_uInt16 nTextRefId;
 
     ByteStringHashMap sHelpText;
-    USHORT nHelpTextRefId;
+    sal_uInt16 nHelpTextRefId;
 
     ByteStringHashMap sQuickHelpText;
-    USHORT nQuickHelpTextRefId;
+    sal_uInt16 nQuickHelpTextRefId;
 
     ByteStringHashMap sTitle;
-    USHORT nTitleRefId;
+    sal_uInt16 nTitleRefId;
 
     ByteString sTextTyp;
     ByteStringHashMap aFallbackData;
@@ -201,14 +201,14 @@ public:
             nWidth( 0 ),
             nChildIndex( 0 ),
             nIdLevel( ID_LEVEL_NULL ),
-            bChild( FALSE ),
-            bChildWithText( FALSE ),
-            bText( FALSE ),
-            bHelpText( FALSE ),
-            bQuickHelpText( FALSE ),
-            bTitle( FALSE ),
-            bList( FALSE ),
-            bRestMerged( FALSE ),
+            bChild( sal_False ),
+            bChildWithText( sal_False ),
+            bText( sal_False ),
+            bHelpText( sal_False ),
+            bQuickHelpText( sal_False ),
+            bTitle( sal_False ),
+            bList( sal_False ),
+            bRestMerged( sal_False ),
             sGId( rGId ),
             nTextRefId( REFID_NONE ),
             nHelpTextRefId( REFID_NONE ),
@@ -229,14 +229,14 @@ public:
             :
             nChildIndex( 0 ),
             nIdLevel( ID_LEVEL_NULL ),
-            bChild( FALSE ),
-            bChildWithText( FALSE ),
-            bText( FALSE ),
-            bHelpText( FALSE ),
-            bQuickHelpText( FALSE ),
-            bTitle( FALSE ),
-            bList( FALSE ),
-            bRestMerged( FALSE ),
+            bChild( sal_False ),
+            bChildWithText( sal_False ),
+            bText( sal_False ),
+            bHelpText( sal_False ),
+            bQuickHelpText( sal_False ),
+            bTitle( sal_False ),
+            bList( sal_False ),
+            bRestMerged( sal_False ),
             sGId( rGId ),
             sFilename( rFilename ),
             nTextRefId( REFID_NONE ),
@@ -300,23 +300,23 @@ private:
 
     ByteString sActPForm;               // hold cur. system
 
-    BOOL bDefine;                       // cur. res. in a define?
-    BOOL bNextMustBeDefineEOL;          // define but no \ at lineend
-    ULONG nLevel;                       // res. recursiv? how deep?
-    USHORT nList;                       // cur. res. is String- or FilterList
+    sal_Bool bDefine;                       // cur. res. in a define?
+    sal_Bool bNextMustBeDefineEOL;          // define but no \ at lineend
+    sal_uIntPtr nLevel;                     // res. recursiv? how deep?
+    sal_uInt16 nList;                       // cur. res. is String- or FilterList
     ByteString nListLang;
-    ULONG nListIndex;
-    ULONG nListLevel;
+    sal_uIntPtr nListIndex;
+    sal_uIntPtr nListLevel;
     bool bSkipFile;
     ByteString sProject;
     ByteString sRoot;
-    BOOL bEnableExport;
-    BOOL bMergeMode;
+    sal_Bool bEnableExport;
+    sal_Bool bMergeMode;
     ByteString sMergeSrc;
     ByteString sLastListLine;
-    BOOL bError;                        // any errors while export?
-    BOOL bReadOver;
-    BOOL bDontWriteOutput;
+    sal_Bool bError;                        // any errors while export?
+    sal_Bool bReadOver;
+    sal_Bool bDontWriteOutput;
     ByteString sLastTextTyp;
     static bool isInitialized;
     ByteString sFilename;
@@ -339,7 +339,7 @@ public:
     static bool hasUTF8ByteOrderMarker( const ByteString &rString );
     static void RemoveUTF8ByteOrderMarkerFromFile( const ByteString &rFilename );
     static bool fileHasUTF8ByteOrderMarker( const ByteString &rString );
-    static ByteString GetIsoLangByIndex( USHORT nIndex );
+    static ByteString GetIsoLangByIndex( sal_uInt16 nIndex );
     static void QuotHTML( ByteString &rString );
     static bool CopyFile( const ByteString& source , const ByteString& dest );
 
@@ -364,7 +364,7 @@ public:
     static void FillInFallbacks( ResData *pResData );
     static void FillInListFallbacks( ExportList *pList, const ByteString &nSource, const ByteString &nFallback );
     static ByteString GetTimeStamp();
-    static BOOL ConvertLineEnds( ByteString sSource, ByteString sDestination );
+    static sal_Bool ConvertLineEnds( ByteString sSource, ByteString sDestination );
     static ByteString GetNativeFile( ByteString sSource );
     static DirEntry GetTempFile();
 
@@ -375,11 +375,11 @@ private:
     static std::vector<ByteString> aLanguages;
     static std::vector<ByteString> aForcedLanguages;
 
-    BOOL ListExists( ResData *pResData, USHORT nLst );
+    sal_Bool ListExists( ResData *pResData, sal_uInt16 nLst );
 
-    BOOL WriteData( ResData *pResData, BOOL bCreateNew = FALSE );// called befor dest. cur ResData
-    BOOL WriteExportList( ResData *pResData, ExportList *pExportList,
-                        const ByteString &rTyp, BOOL bCreateNew = FALSE );
+    sal_Bool WriteData( ResData *pResData, sal_Bool bCreateNew = sal_False );// called befor dest. cur ResData
+    sal_Bool WriteExportList( ResData *pResData, ExportList *pExportList,
+                        const ByteString &rTyp, sal_Bool bCreateNew = sal_False );
 
     ByteString MergePairedList( ByteString& sLine , ByteString& sText );
 
@@ -396,10 +396,10 @@ private:
     void CleanValue( ByteString &rValue );
     ByteString GetText( const ByteString &rSource, int nToken );
 
-    BOOL PrepareTextToMerge( ByteString &rText, USHORT nTyp,
+    sal_Bool PrepareTextToMerge( ByteString &rText, sal_uInt16 nTyp,
         ByteString &nLangIndex, ResData *pResData );
 
-    void MergeRest( ResData *pResData, USHORT nMode = MERGE_MODE_NORMAL );
+    void MergeRest( ResData *pResData, sal_uInt16 nMode = MERGE_MODE_NORMAL );
     void ConvertMergeContent( ByteString &rText );
 
       void WriteToMerged( const ByteString &rText , bool bSDFContent );
@@ -408,17 +408,17 @@ private:
     void CutComment( ByteString &rText );
 
 public:
-    Export( const ByteString &rOutput, BOOL bWrite,
+    Export( const ByteString &rOutput, sal_Bool bWrite,
             const ByteString &rPrj, const ByteString &rPrjRoot , const ByteString& rFile );
-    Export( const ByteString &rOutput, BOOL bWrite,
+    Export( const ByteString &rOutput, sal_Bool bWrite,
             const ByteString &rPrj, const ByteString &rPrjRoot,
             const ByteString &rMergeSource , const ByteString& rFile );
     ~Export();
 
     void Init();
     int Execute( int nToken, const char * pToken ); // called from lexer
-    void SetError() { bError = TRUE; }
-    BOOL GetError() { return bError; }
+    void SetError() { bError = sal_True; }
+    sal_Bool GetError() { return bError; }
 };
 
 
@@ -460,8 +460,8 @@ public:
             sTitle[ nId ] = rTitle;
             bTitleFirst[ nId ] = true;
         }
-     BOOL GetText( ByteString &rReturn, USHORT nTyp, const ByteString &nLangIndex, BOOL bDel = FALSE );
-     BOOL GetTransex3Text( ByteString &rReturn, USHORT nTyp, const ByteString &nLangIndex, BOOL bDel = FALSE );
+     sal_Bool GetText( ByteString &rReturn, sal_uInt16 nTyp, const ByteString &nLangIndex, sal_Bool bDel = sal_False );
+     sal_Bool GetTransex3Text( ByteString &rReturn, sal_uInt16 nTyp, const ByteString &nLangIndex, sal_Bool bDel = sal_False );
 
 };
 
@@ -495,7 +495,7 @@ public:
     PFormEntrys* GetPFObject( const ByteString& rPFO );
 
     ByteString Dump();
-    BOOL operator==( ResData *pData );
+    sal_Bool operator==( ResData *pData );
 };
 
 //
@@ -509,7 +509,7 @@ public:
 class MergeDataFile
 {
 private:
-    BOOL bErrorLog;
+    sal_Bool bErrorLog;
     ByteString sErrorLog;
     SvFileStream aErrLog;
     ByteStringSet aLanguageSet;
@@ -520,7 +520,7 @@ private:
 
 
 public:
-    MergeDataFile( const ByteString &rFileName, const ByteString& rFile , BOOL bErrLog, CharSet aCharSet, bool bCaseSensitive = false );
+    MergeDataFile( const ByteString &rFileName, const ByteString& rFile , sal_Bool bErrLog, CharSet aCharSet, bool bCaseSensitive = false );
     ~MergeDataFile();
 
 
@@ -536,7 +536,7 @@ public:
                 const ByteString &rQHTEXT, const ByteString &rTITLE ,
                 const ByteString &sFilename , bool bCaseSensitive
                 );
-    static USHORT GetLangIndex( USHORT nId );
+    static sal_uInt16 GetLangIndex( sal_uInt16 nId );
     static ByteString CreateKey( const ByteString& rTYP , const ByteString& rGID , const ByteString& rLID , const ByteString& rFilename , bool bCaseSensitive = false );
 
     ByteString Dump();
diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx
index fb1eecd38c82..49a1f861eed0 100644
--- a/l10ntools/inc/gsicheck.hxx
+++ b/l10ntools/inc/gsicheck.hxx
@@ -41,7 +41,7 @@ private:
 
     ParserMessageList aMessages;
     LineFormat aFormat;
-    ULONG nLineNumber;
+    sal_uIntPtr nLineNumber;
 
     ByteString aUniqId;
     ByteString aLineType;
@@ -50,15 +50,15 @@ private:
     ByteString aQuickHelpText;
     ByteString aTitle;
 
-    BOOL bOK;
-    BOOL bFixed;
+    sal_Bool bOK;
+    sal_Bool bFixed;
 
     void              ReassembleLine();
 
 public:
-    GSILine( const ByteString &rLine, ULONG nLine );
+    GSILine( const ByteString &rLine, sal_uIntPtr nLine );
     LineFormat  GetLineFormat() const    { return aFormat; }
-    ULONG       GetLineNumber() const    { return nLineNumber; }
+    sal_uIntPtr       GetLineNumber() const    { return nLineNumber; }
 
     ByteString  const GetUniqId()     const    { return aUniqId; }
     ByteString  const GetLineType()   const    { return aLineType; }
@@ -74,13 +74,13 @@ public:
           void        SetTitle( ByteString &aNew ) { aTitle = aNew; ReassembleLine(); }
 
     ParserMessageList* GetMessageList() { return &aMessages; };
-    BOOL HasMessages(){ return ( aMessages.Count() > 0 ); };
+    sal_Bool HasMessages(){ return ( aMessages.Count() > 0 ); };
 
-    BOOL IsOK() const { return bOK; }
+    sal_Bool IsOK() const { return bOK; }
     void NotOK();
 
-    BOOL IsFixed() const { return bFixed; }
-    void SetFixed() { bFixed = TRUE; };
+    sal_Bool IsFixed() const { return bFixed; }
+    void SetFixed() { bFixed = sal_True; };
 };
 
 //
@@ -97,31 +97,31 @@ private:
     GSILine *pSourceLine;
     GSILine *pReferenceLine;
     void PrintList( ParserMessageList *pList, ByteString aPrefix, GSILine *pLine );
-    BOOL bPrintContext;
-    BOOL bCheckSourceLang;
-    BOOL bCheckTranslationLang;
-    BOOL bReference;
-    BOOL bAllowKeyIDs;
-    BOOL bAllowSuspicious;
+    sal_Bool bPrintContext;
+    sal_Bool bCheckSourceLang;
+    sal_Bool bCheckTranslationLang;
+    sal_Bool bReference;
+    sal_Bool bAllowKeyIDs;
+    sal_Bool bAllowSuspicious;
 
-    BOOL bHasBlockError;
+    sal_Bool bHasBlockError;
 
-    BOOL IsUTF8( const ByteString &aTestee, BOOL bFixTags, USHORT &nErrorPos, ByteString &aErrorMsg, BOOL &bHasBeenFixed, ByteString &aFixed ) const;
-    BOOL TestUTF8( GSILine* pTestee, BOOL bFixTags );
-    BOOL HasSuspiciousChars( GSILine* pTestee, GSILine* pSource );
+    sal_Bool IsUTF8( const ByteString &aTestee, sal_Bool bFixTags, sal_uInt16 &nErrorPos, ByteString &aErrorMsg, sal_Bool &bHasBeenFixed, ByteString &aFixed ) const;
+    sal_Bool TestUTF8( GSILine* pTestee, sal_Bool bFixTags );
+    sal_Bool HasSuspiciousChars( GSILine* pTestee, GSILine* pSource );
 
 public:
-    GSIBlock( BOOL PbPrintContext, BOOL bSource, BOOL bTrans, BOOL bRef, BOOL bAllowKID, BOOL bAllowSusp );
+    GSIBlock( sal_Bool PbPrintContext, sal_Bool bSource, sal_Bool bTrans, sal_Bool bRef, sal_Bool bAllowKID, sal_Bool bAllowSusp );
     ~GSIBlock();
-    void PrintMessage( ByteString aType, ByteString aMsg, ByteString aPrefix, ByteString aContext, ULONG nLine, ByteString aUniqueId = ByteString() );
-    void PrintError( ByteString aMsg, ByteString aPrefix, ByteString aContext, ULONG nLine, ByteString aUniqueId = ByteString() );
+    void PrintMessage( ByteString aType, ByteString aMsg, ByteString aPrefix, ByteString aContext, sal_uIntPtr nLine, ByteString aUniqueId = ByteString() );
+    void PrintError( ByteString aMsg, ByteString aPrefix, ByteString aContext, sal_uIntPtr nLine, ByteString aUniqueId = ByteString() );
     void InsertLine( GSILine* pLine, const ByteString aSourceLang);
     void SetReferenceLine( GSILine* pLine );
-    BOOL CheckSyntax( ULONG nLine, BOOL bRequireSourceLine, BOOL bFixTags );
+    sal_Bool CheckSyntax( sal_uIntPtr nLine, sal_Bool bRequireSourceLine, sal_Bool bFixTags );
 
-    void WriteError( LazySvFileStream &aErrOut, BOOL bRequireSourceLine );
-    void WriteCorrect( LazySvFileStream &aOkOut, BOOL bRequireSourceLine );
-    void WriteFixed( LazySvFileStream &aFixOut, BOOL bRequireSourceLine );
+    void WriteError( LazySvFileStream &aErrOut, sal_Bool bRequireSourceLine );
+    void WriteCorrect( LazySvFileStream &aOkOut, sal_Bool bRequireSourceLine );
+    void WriteFixed( LazySvFileStream &aFixOut, sal_Bool bRequireSourceLine );
 };
 
 #endif
diff --git a/l10ntools/inc/l10ntools/vosapp.hxx b/l10ntools/inc/l10ntools/vosapp.hxx
index 49e10e15e3d4..ccfe07006f76 100644
--- a/l10ntools/inc/l10ntools/vosapp.hxx
+++ b/l10ntools/inc/l10ntools/vosapp.hxx
@@ -10,19 +10,19 @@
 class Application
 {
 public:
-    USHORT GetCommandLineParamCount();
-    XubString GetCommandLineParam( USHORT nParam );
+    sal_uInt16 GetCommandLineParamCount();
+    XubString GetCommandLineParam( sal_uInt16 nParam );
     virtual void Main() = 0;
 };
 
 // Urg: Cut & Paste from svapp.cxx: we don't want to depend on vcl
-USHORT Application::GetCommandLineParamCount()
+sal_uInt16 Application::GetCommandLineParamCount()
 {
     vos::OStartupInfo aStartInfo;
-    return (USHORT)aStartInfo.getCommandArgCount();
+    return (sal_uInt16)aStartInfo.getCommandArgCount();
 }
 
-XubString Application::GetCommandLineParam( USHORT nParam )
+XubString Application::GetCommandLineParam( sal_uInt16 nParam )
 {
     vos::OStartupInfo aStartInfo;
     rtl::OUString aParam;
diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 923da89988b6..ba8577c0fc04 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -43,11 +43,11 @@ DECLARE_LIST( LngLineList, ByteString * )
 class LngParser
 {
 private:
-    USHORT nError;
+    sal_uInt16 nError;
     LngLineList *pLines;
     ByteString sSource;
-    BOOL bDBIsUTF8;
-    BOOL bULF;
+    sal_Bool bDBIsUTF8;
+    sal_Bool bULF;
     bool bQuiet;
     std::vector<ByteString> aLanguages;
 
@@ -58,9 +58,9 @@ private:
                     const ByteString &rPrj ,
                     const ByteString &rRoot , const ByteString &sActFileName , const ByteString &sID );
 public:
-    LngParser( const ByteString &rLngFile, BOOL bUTF8, BOOL bULFFormat, bool bQuiet_in );
+    LngParser( const ByteString &rLngFile, sal_Bool bUTF8, sal_Bool bULFFormat, bool bQuiet_in );
     ~LngParser();
 
-    BOOL CreateSDF( const ByteString &rSDFFile, const ByteString &rPrj, const ByteString &rRoot );
-    BOOL Merge( const ByteString &rSDFFile, const ByteString &rDestinationFile , const ByteString &rPrj );
+    sal_Bool CreateSDF( const ByteString &rSDFFile, const ByteString &rPrj, const ByteString &rRoot );
+    sal_Bool Merge( const ByteString &rSDFFile, const ByteString &rDestinationFile , const ByteString &rPrj );
 };
diff --git a/l10ntools/inc/srciter.hxx b/l10ntools/inc/srciter.hxx
index 36061346fe16..91e2c20a768a 100644
--- a/l10ntools/inc/srciter.hxx
+++ b/l10ntools/inc/srciter.hxx
@@ -49,7 +49,7 @@ public:
     SourceTreeIterator( const ByteString &rRootDirectory, const ByteString &rVersion , bool bLocal_in = false);
     virtual ~SourceTreeIterator();
 
-    BOOL StartExecute();
+    sal_Bool StartExecute();
     void EndExecute();
 
     virtual void OnExecuteDirectory( const rtl::OUString &rDirectory );
diff --git a/l10ntools/inc/tagtest.hxx b/l10ntools/inc/tagtest.hxx
index 3e9b03916f4f..90b19037e6e9 100644
--- a/l10ntools/inc/tagtest.hxx
+++ b/l10ntools/inc/tagtest.hxx
@@ -34,9 +34,9 @@
 
 class GSILine;
 
-typedef USHORT TokenId;
+typedef sal_uInt16 TokenId;
 
-#define TOK_INVALIDPOS  USHORT( 0xFFFF )
+#define TOK_INVALIDPOS  sal_uInt16( 0xFFFF )
 
 class ParserMessage;
 
@@ -74,24 +74,24 @@ private:
 
     String aTagName;
     StringHashMap aProperties;
-    BOOL bClosed;    // tag is closed  <sdnf/>
-    BOOL bCloseTag;  // tag is close Tag  </sdnf>
+    sal_Bool bClosed;    // tag is closed  <sdnf/>
+    sal_Bool bCloseTag;  // tag is close Tag  </sdnf>
 
 
-    BOOL bIsBroken;
-    BOOL bHasBeenFixed;
-    BOOL bDone;
+    sal_Bool bIsBroken;
+    sal_Bool bHasBeenFixed;
+    sal_Bool bDone;
 
 public:
 
     String aTokenString;
     TokenId nId;
-    USHORT nPos;            // Position in String
+    sal_uInt16 nPos;            // Position in String
 
-    TokenInfo():bClosed(FALSE),bCloseTag(FALSE),bIsBroken(FALSE),bHasBeenFixed(FALSE),bDone(FALSE),nId( 0 ){;}
-explicit    TokenInfo( TokenId pnId, USHORT nP ):bClosed(FALSE),bCloseTag(FALSE),bIsBroken(FALSE),bHasBeenFixed(FALSE),bDone(FALSE),nId( pnId ),nPos(nP){;}
-explicit    TokenInfo( TokenId pnId, USHORT nP, String paStr ):bClosed(FALSE),bCloseTag(FALSE),bIsBroken(FALSE),bHasBeenFixed(FALSE),bDone(FALSE),aTokenString( paStr ),nId( pnId ),nPos(nP) {;}
-explicit    TokenInfo( TokenId pnId, USHORT nP, String paStr, ParserMessageList &rErrorList );
+    TokenInfo():bClosed(sal_False),bCloseTag(sal_False),bIsBroken(sal_False),bHasBeenFixed(sal_False),bDone(sal_False),nId( 0 ){;}
+explicit    TokenInfo( TokenId pnId, sal_uInt16 nP ):bClosed(sal_False),bCloseTag(sal_False),bIsBroken(sal_False),bHasBeenFixed(sal_False),bDone(sal_False),nId( pnId ),nPos(nP){;}
+explicit    TokenInfo( TokenId pnId, sal_uInt16 nP, String paStr ):bClosed(sal_False),bCloseTag(sal_False),bIsBroken(sal_False),bHasBeenFixed(sal_False),bDone(sal_False),aTokenString( paStr ),nId( pnId ),nPos(nP) {;}
+explicit    TokenInfo( TokenId pnId, sal_uInt16 nP, String paStr, ParserMessageList &rErrorList );
 
     String GetTagName() const;
 
@@ -100,35 +100,35 @@ explicit    TokenInfo( TokenId pnId, USHORT nP, String paStr, ParserMessageList
     /**
         Is the property to be ignored or does it have the default value anyways
     **/
-    BOOL IsPropertyRelevant( const ByteString &aName, const String &aValue ) const;
-    BOOL IsPropertyValueValid( const ByteString &aName, const String &aValue ) const;
+    sal_Bool IsPropertyRelevant( const ByteString &aName, const String &aValue ) const;
+    sal_Bool IsPropertyValueValid( const ByteString &aName, const String &aValue ) const;
     /**
         Does the property contain the same value for all languages
         e.g.: the href in a link tag
     **/
-    BOOL IsPropertyInvariant( const ByteString &aName, const String &aValue ) const;
+    sal_Bool IsPropertyInvariant( const ByteString &aName, const String &aValue ) const;
     /**
         a subset of IsPropertyInvariant but containing only those that are fixable
         we dont wat to fix e.g.: ahelp :: visibility
     **/
-    BOOL IsPropertyFixable( const ByteString &aName ) const;
-    BOOL MatchesTranslation( TokenInfo& rInfo, BOOL bGenErrors, ParserMessageList &rErrorList, BOOL bFixTags = FALSE ) const;
+    sal_Bool IsPropertyFixable( const ByteString &aName ) const;
+    sal_Bool MatchesTranslation( TokenInfo& rInfo, sal_Bool bGenErrors, ParserMessageList &rErrorList, sal_Bool bFixTags = sal_False ) const;
 
-    BOOL IsDone() const { return bDone; }
-    void SetDone( BOOL bNew = TRUE ) { bDone = bNew; }
+    sal_Bool IsDone() const { return bDone; }
+    void SetDone( sal_Bool bNew = sal_True ) { bDone = bNew; }
 
-    BOOL HasBeenFixed() const { return bHasBeenFixed; }
-    void SetHasBeenFixed( BOOL bNew = TRUE ) { bHasBeenFixed = bNew; }
+    sal_Bool HasBeenFixed() const { return bHasBeenFixed; }
+    void SetHasBeenFixed( sal_Bool bNew = sal_True ) { bHasBeenFixed = bNew; }
 };
 
 
 class ParserMessageList : public Impl_ParserMessageList
 {
 public:
-    void AddError( USHORT nErrorNr, ByteString aErrorText, const TokenInfo &rTag );
-    void AddWarning( USHORT nErrorNr, ByteString aErrorText, const TokenInfo &rTag );
+    void AddError( sal_uInt16 nErrorNr, ByteString aErrorText, const TokenInfo &rTag );
+    void AddWarning( sal_uInt16 nErrorNr, ByteString aErrorText, const TokenInfo &rTag );
 
-    BOOL HasErrors();
+    sal_Bool HasErrors();
 };
 
 
@@ -235,13 +235,13 @@ public:
 
     void        Clear()
         {
-            for ( ULONG i = 0 ; i < Count() ; i++ )
+            for ( sal_uIntPtr i = 0 ; i < Count() ; i++ )
                 delete TokenListImpl::GetObject( i );
             TokenListImpl::Clear();
         }
-    void        Insert( TokenInfo p, ULONG nIndex = LIST_APPEND )
+    void        Insert( TokenInfo p, sal_uIntPtr nIndex = LIST_APPEND )
         { TokenListImpl::Insert( new TokenInfo(p), nIndex ); }
-/*    TokenInfo     Remove( ULONG nIndex )
+/*    TokenInfo     Remove( sal_uIntPtr nIndex )
         {
             TokenInfo aT = GetObject( nIndex );
             delete TokenListImpl::GetObject( nIndex );
@@ -250,16 +250,16 @@ public:
         }*/
 //    TokenInfo     Remove( TokenInfo p ){ return Remove( GetPos( p ) ); }
 //    TokenInfo     GetCurObject() const { return *TokenListImpl::GetCurObject(); }
-    TokenInfo&      GetObject( ULONG nIndex ) const
+    TokenInfo&      GetObject( sal_uIntPtr nIndex ) const
         {
 //          if ( TokenListImpl::GetObject(nIndex) )
                 return *TokenListImpl::GetObject(nIndex);
 //          else
 //              return TokenInfo();
         }
-/*    ULONG     GetPos( const TokenInfo p ) const
+/*    sal_uIntPtr       GetPos( const TokenInfo p ) const
         {
-            for ( ULONG i = 0 ; i < Count() ; i++ )
+            for ( sal_uIntPtr i = 0 ; i < Count() ; i++ )
                 if ( p == GetObject( i ) )
                     return i;
             return LIST_ENTRY_NOTFOUND;
@@ -267,7 +267,7 @@ public:
 
     TokenList( const TokenList& rList );
 /*      {
-            for ( ULONG i = 0 ; i < rList.Count() ; i++ )
+            for ( sal_uIntPtr i = 0 ; i < rList.Count() ; i++ )
             {
                 Insert( rList.GetObject( i ), LIST_APPEND );
             }
@@ -276,54 +276,54 @@ public:
 
 class ParserMessage
 {
-    USHORT nErrorNr;
+    sal_uInt16 nErrorNr;
     ByteString aErrorText;
-    USHORT nTagBegin,nTagLength;
+    sal_uInt16 nTagBegin,nTagLength;
 
 protected:
-    ParserMessage( USHORT PnErrorNr, ByteString PaErrorText, const TokenInfo &rTag );
+    ParserMessage( sal_uInt16 PnErrorNr, ByteString PaErrorText, const TokenInfo &rTag );
 public:
 
-    USHORT GetErrorNr() { return nErrorNr; }
+    sal_uInt16 GetErrorNr() { return nErrorNr; }
     ByteString GetErrorText() { return aErrorText; }
 
-    USHORT GetTagBegin() { return nTagBegin; }
-    USHORT GetTagLength() { return nTagLength; }
+    sal_uInt16 GetTagBegin() { return nTagBegin; }
+    sal_uInt16 GetTagLength() { return nTagLength; }
 
     virtual ~ParserMessage() {}
-    virtual BOOL IsError() =0;
+    virtual sal_Bool IsError() =0;
     virtual ByteString Prefix() =0;
 };
 
 class ParserError : public ParserMessage
 {
 public:
-    ParserError( USHORT PnErrorNr, ByteString PaErrorText, const TokenInfo &rTag );
+    ParserError( sal_uInt16 PnErrorNr, ByteString PaErrorText, const TokenInfo &rTag );
 
-    virtual BOOL IsError() {return TRUE;};
+    virtual sal_Bool IsError() {return sal_True;};
     virtual ByteString Prefix() {return "Error:"; };
 };
 
 class ParserWarning : public ParserMessage
 {
 public:
-    ParserWarning( USHORT PnErrorNr, ByteString PaErrorText, const TokenInfo &rTag );
+    ParserWarning( sal_uInt16 PnErrorNr, ByteString PaErrorText, const TokenInfo &rTag );
 
-    virtual BOOL IsError() {return FALSE;};
+    virtual sal_Bool IsError() {return sal_False;};
     virtual ByteString Prefix() {return "Warning:"; };
 };
 
 class SimpleParser
 {
 private:
-    USHORT nPos;
+    sal_uInt16 nPos;
     String aSource;
     String aLastToken;
     TokenList aTokenList;
 
     TokenInfo aNextTag;     // to store closetag in case of combined tags like <br/>
 
-    String GetNextTokenString( ParserMessageList &rErrorList, USHORT &rTokeStartPos );
+    String GetNextTokenString( ParserMessageList &rErrorList, sal_uInt16 &rTokeStartPos );
 
 public:
     SimpleParser();
@@ -335,9 +335,9 @@ public:
 
 class TokenParser
 {
-    BOOL match( const TokenInfo &aCurrentToken, const TokenId &aExpectedToken );
-    BOOL match( const TokenInfo &aCurrentToken, const TokenInfo &aExpectedToken );
-    void ParseError( USHORT nErrNr, ByteString aErrMsg, const TokenInfo &rTag );
+    sal_Bool match( const TokenInfo &aCurrentToken, const TokenId &aExpectedToken );
+    sal_Bool match( const TokenInfo &aCurrentToken, const TokenInfo &aExpectedToken );
+    void ParseError( sal_uInt16 nErrNr, ByteString aErrMsg, const TokenInfo &rTag );
     void Paragraph();
     void PfCase();
     void PfCaseBegin();
@@ -353,7 +353,7 @@ class TokenParser
 
     TokenId nPfCaseOptions;
     TokenId nAppCaseOptions;
-    BOOL bPfCaseActive ,bAppCaseActive;
+    sal_Bool bPfCaseActive ,bAppCaseActive;
 
     TokenId nActiveRefTypes;
 
@@ -363,7 +363,7 @@ public:
     TokenParser();
     void Parse( const String &aCode, ParserMessageList* pList );
 //  ParserMessageList& GetErrors(){ return aErrorList; }
-//  BOOL HasErrors(){ return ( aErrorList.Count() > 0 ); }
+//  sal_Bool HasErrors(){ return ( aErrorList.Count() > 0 ); }
     TokenList& GetTokenList(){ return aParser.GetTokenList(); }
 };
 
@@ -373,21 +373,21 @@ private:
     TokenParser aReferenceParser;
     TokenParser aTesteeParser;
     ParserMessageList aCompareWarningList;
-    void CheckTags( TokenList &aReference, TokenList &aTestee, BOOL bFixTags );
-    BOOL IsTagMandatory( TokenInfo const &aToken, TokenId &aMetaTokens );
+    void CheckTags( TokenList &aReference, TokenList &aTestee, sal_Bool bFixTags );
+    sal_Bool IsTagMandatory( TokenInfo const &aToken, TokenId &aMetaTokens );
     String aFixedTestee;
 public:
     void CheckReference( GSILine *aReference );
-    void CheckTestee( GSILine *aTestee, BOOL bHasSourceLine, BOOL bFixTags );
+    void CheckTestee( GSILine *aTestee, sal_Bool bHasSourceLine, sal_Bool bFixTags );
 
 //  ParserMessageList& GetReferenceErrors(){ return aReferenceParser.GetErrors(); }
-//  BOOL HasReferenceErrors(){ return aReferenceParser.HasErrors(); }
+//  sal_Bool HasReferenceErrors(){ return aReferenceParser.HasErrors(); }
 
 //  ParserMessageList& GetTesteeErrors(){ return aTesteeParser.GetErrors(); }
-//  BOOL HasTesteeErrors(){ return aTesteeParser.HasErrors(); }
+//  sal_Bool HasTesteeErrors(){ return aTesteeParser.HasErrors(); }
 
     ParserMessageList& GetCompareWarnings(){ return aCompareWarningList; }
-    BOOL HasCompareWarnings(){ return ( aCompareWarningList.Count() > 0 ); }
+    sal_Bool HasCompareWarnings(){ return ( aCompareWarningList.Count() > 0 ); }
 
     String GetFixedTestee(){ return aFixedTestee; }
 };
diff --git a/l10ntools/inc/wtranode.hxx b/l10ntools/inc/wtranode.hxx
index af01a4b29d5c..99afe462a9ab 100644
--- a/l10ntools/inc/wtranode.hxx
+++ b/l10ntools/inc/wtranode.hxx
@@ -80,7 +80,7 @@ class WTT_Node  // WordTransTree-Node
     // INQUIRY
     E_TokenType         TokenType() const;
     UINT8               Value() const;
-    BOOL                IsOnDeleting() const;
+    sal_Bool                IsOnDeleting() const;
     const ByteString &  ReplaceString() const;
 
   private:
@@ -102,7 +102,7 @@ WTT_Node::TokenType() const
 inline UINT8
 WTT_Node::Value() const
     { return nValue; }
-inline BOOL
+inline sal_Bool
 WTT_Node::IsOnDeleting() const
     { return bIsOnDeleting; }
 inline const ByteString &
diff --git a/l10ntools/inc/wtratree.hxx b/l10ntools/inc/wtratree.hxx
index 6fd33a7cb413..5ed45d350348 100644
--- a/l10ntools/inc/wtratree.hxx
+++ b/l10ntools/inc/wtratree.hxx
@@ -81,7 +81,7 @@ class WordTransTree
     E_Result            TransformNextToken();
 
     // INQUIRY
-    BOOL                TextEndReached() const;
+    sal_Bool                TextEndReached() const;
     const char *        Output() const;
 
         // These 3 functions are valid between two calls of
@@ -132,7 +132,7 @@ class WordTransTree
 
 
 
-inline BOOL
+inline sal_Bool
 WordTransTree::TextEndReached() const
     { return pInputPosition == pInputEnd; }
 inline const char *
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 69e74a83ec47..cb72ca532afe 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -87,7 +87,7 @@ public:
     void setValue(const String &rValue){sValue=rValue;}
 
     /// returns true if two attributes are equal and have the same value
-    BOOL IsEqual(
+    sal_Bool IsEqual(
         const XMLAttribute &rAttribute  // the attribute which has to be equal
     )
     {
@@ -107,7 +107,7 @@ protected:
     XMLNode() {}
 
 public:
-    virtual USHORT GetNodeType() = 0;
+    virtual sal_uInt16 GetNodeType() = 0;
     virtual ~XMLNode() {}
 };
 
@@ -126,7 +126,7 @@ protected:
     XMLChildNode( const XMLChildNode& obj);
     XMLChildNode& operator=(const XMLChildNode& obj);
 public:
-    virtual USHORT GetNodeType() = 0;
+    virtual sal_uInt16 GetNodeType() = 0;
 
     /// returns the parent of this node
     XMLParentNode *GetParent() { return pParent; }
@@ -162,7 +162,7 @@ protected:
 
 
 public:
-    virtual USHORT GetNodeType() = 0;
+    virtual sal_uInt16 GetNodeType() = 0;
 
     /// returns child list of this node
     XMLChildNodeList *GetChildList() { return pChildList; }
@@ -201,7 +201,7 @@ typedef std::hash_map<ByteString , LangHashMap* ,
 typedef std::hash_map<ByteString, int, hashByteString,equalByteString>  HashMap;
 
 /// Mapping XML tag names <-> have localizable strings
-typedef std::hash_map<ByteString , BOOL ,
+typedef std::hash_map<ByteString , sal_Bool ,
                       hashByteString,equalByteString>                   TagMap;
 
 /** Holds information of a XML file, is root node of tree
@@ -219,7 +219,7 @@ public:
     ~XMLFile();
 
     ByteString* GetGroupID(std::deque<ByteString> &groupid);
-    void        Print( XMLNode *pCur = NULL, USHORT nLevel = 0 );
+    void        Print( XMLNode *pCur = NULL, sal_uInt16 nLevel = 0 );
     virtual void SearchL10NElements( XMLParentNode *pCur, int pos = 0 );
     void        Extract( XMLFile *pCur = NULL );
     void        View();
@@ -227,14 +227,14 @@ public:
     void        showType(XMLParentNode* node);
 
     XMLHashMap* GetStrings(){return XMLStrings;}
-    BOOL        Write( ByteString &rFilename );
-    BOOL        Write( ofstream &rStream , XMLNode *pCur = NULL );
+    sal_Bool        Write( ByteString &rFilename );
+    sal_Bool        Write( ofstream &rStream , XMLNode *pCur = NULL );
 
     bool        CheckExportStatus( XMLParentNode *pCur = NULL );// , int pos = 0 );
 
     XMLFile&    operator=(const XMLFile& obj);
 
-    virtual USHORT  GetNodeType();
+    virtual sal_uInt16  GetNodeType();
 
     /// returns file name
     const String &GetName() { return sFileName; }
@@ -275,10 +275,10 @@ public:
     static void         UnQuotHTML  ( String &rString );
 
     /// Return the numeric iso language code
-    //USHORT                GetLangByIsoLang( const ByteString &rIsoLang );
+    //sal_uInt16                GetLangByIsoLang( const ByteString &rIsoLang );
 
     /// Return the alpha strings representation
-    ByteString          GetIsoLangByIndex( USHORT nIndex );
+    ByteString          GetIsoLangByIndex( sal_uInt16 nIndex );
 
     static XMLUtil&     Instance();
     ~XMLUtil();
@@ -344,7 +344,7 @@ public:
 
     XMLElement& operator=(const XMLElement& obj);
     /// returns node type XML_NODE_ELEMENT
-    virtual USHORT GetNodeType();
+    virtual sal_uInt16 GetNodeType();
 
     /// returns element name
     const String &GetName() { return sElementName; }
@@ -414,7 +414,7 @@ public:
     XMLData(const XMLData& obj);
 
     XMLData& operator=(const XMLData& obj);
-    virtual USHORT GetNodeType();
+    virtual sal_uInt16 GetNodeType();
 
     /// returns the data
     const String &GetData() { return sData; }
@@ -446,7 +446,7 @@ public:
     )
                 : XMLChildNode( Parent ), sComment( rComment ) {}
 
-    virtual USHORT GetNodeType();
+    virtual sal_uInt16 GetNodeType();
 
     XMLComment( const XMLComment& obj );
 
@@ -478,7 +478,7 @@ public:
     XMLDefault& operator=(const XMLDefault& obj);
 
     /// returns node type XML_NODE_TYPE_COMMENT
-    virtual USHORT GetNodeType();
+    virtual sal_uInt16 GetNodeType();
 
     /// returns the comment
     const String &GetDefault()  { return sDefault; }
@@ -490,8 +490,8 @@ public:
  */
 struct XMLError {
     XML_Error eCode;    // the error code
-    ULONG nLine;        // error line number
-    ULONG nColumn;      // error column number
+    sal_uIntPtr nLine;          // error line number
+    sal_uIntPtr nColumn;        // error column number
     String sMessage;    // readable error message
 };
 
diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx
index e8c3d322c92b..91981aa41619 100644
--- a/l10ntools/inc/xrmmerge.hxx
+++ b/l10ntools/inc/xrmmerge.hxx
@@ -38,8 +38,8 @@ private:
     ByteString sGID;
     ByteString sLID;
 
-    BOOL bError;
-    BOOL bText;
+    sal_Bool bError;
+    sal_Bool bText;
 
     bool sLocalized;
 
@@ -74,8 +74,8 @@ public:
 
     int Execute( int nToken, char * pToken );
 
-    void SetError( BOOL bErr = TRUE ) { bError = bErr; }
-    BOOL GetError() { return bError; }
+    void SetError( sal_Bool bErr = sal_True ) { bError = bErr; }
+    sal_Bool GetError() { return bError; }
 };
 
 //