removetooltypes01: #i112600# Fixes in tools after rebase

8 files changed, 101 insertions, 101 deletions

diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 7d77993317dc..e00e43395ca7 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -1796,13 +1796,13 @@ void DbgOutf( const sal_Char* pFStr, ... )
 
 #else
 
-void* DbgFunc( USHORT, void* ) { return NULL; }
+void* DbgFunc( sal_uInt16, void* ) { return NULL; }
 
-void DbgProf( USHORT, DbgDataType* ) {}
-void DbgXtor( DbgDataType*, USHORT, const void*, DbgUsr ) {}
+void DbgProf( sal_uInt16, DbgDataType* ) {}
+void DbgXtor( DbgDataType*, sal_uInt16, const void*, DbgUsr ) {}
 
-void DbgOut( const sal_Char*, USHORT, const sal_Char*, USHORT ) {}
-void DbgOutTypef( USHORT, const sal_Char*, ... ) {}
+void DbgOut( const sal_Char*, sal_uInt16, const sal_Char*, sal_uInt16 ) {}
+void DbgOutTypef( sal_uInt16, const sal_Char*, ... ) {}
 void DbgOutf( const sal_Char*, ... ) {}
 
 #endif
diff --git a/tools/source/fsys/comdep.hxx b/tools/source/fsys/comdep.hxx
index 2c8ab11471d5..cd6f8db2cd57 100755
--- a/tools/source/fsys/comdep.hxx
+++ b/tools/source/fsys/comdep.hxx
@@ -111,8 +111,8 @@ struct DirReader_Impl
                 { if( pDosDir ) closedir( pDosDir ); }
 
                 // die folgenden sind systemabh"angig implementiert
-    USHORT      Init(); // initialisiert, liest ggf. devices
-    USHORT      Read(); // liest 1 Eintrag, F2ugt ein falls ok
+    sal_uInt16      Init(); // initialisiert, liest ggf. devices
+    sal_uInt16      Read(); // liest 1 Eintrag, F2ugt ein falls ok
 };
 
 //--------------------------------------------------------------------
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index a7219aa73f85..277ab120ff69 100755
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -289,12 +289,12 @@ const char* ImpCheckDirEntry( const void* p )
 |*
 *************************************************************************/
 
-ByteString ImplCutPath( const ByteString& rStr, USHORT nMax, char cAccDel )
+ByteString ImplCutPath( const ByteString& rStr, sal_uInt16 nMax, char cAccDel )
 {
-    USHORT  nMaxPathLen = nMax;
+    sal_uInt16  nMaxPathLen = nMax;
     ByteString  aCutPath( rStr );
     sal_Bool    bInsertPrefix = sal_False;
-    USHORT  nBegin = aCutPath.Search( cAccDel );
+    sal_uInt16  nBegin = aCutPath.Search( cAccDel );
 
     if( nBegin == STRING_NOTFOUND )
         nBegin = 0;
@@ -303,8 +303,8 @@ ByteString ImplCutPath( const ByteString& rStr, USHORT nMax, char cAccDel )
 
     while( aCutPath.Len() > nMaxPathLen )
     {
-        USHORT nEnd = aCutPath.Search( cAccDel, nBegin + 1 );
-        USHORT nCount;
+        sal_uInt16 nEnd = aCutPath.Search( cAccDel, nBegin + 1 );
+        sal_uInt16 nCount;
 
         if ( nEnd != STRING_NOTFOUND )
         {
@@ -318,7 +318,7 @@ ByteString ImplCutPath( const ByteString& rStr, USHORT nMax, char cAccDel )
 
     if ( aCutPath.Len() > nMaxPathLen )
     {
-        for ( USHORT n = nMaxPathLen; n > nMaxPathLen/2; --n )
+        for ( sal_uInt16 n = nMaxPathLen; n > nMaxPathLen/2; --n )
             if ( !ByteString(aCutPath.GetChar(n)).IsAlphaNumericAscii() )
             {
                 aCutPath.Erase( n );
@@ -362,7 +362,7 @@ FSysError DirEntry::ImpParseOs2Name( const ByteString& rPfad, FSysPathStyle eSty
         // der Rest immer ohne die fuehrenden '\\'.
         // ein ":" trennt ebenfalls, gehoert aber zum Namen
         // den ersten '\\', '/' oder ':' suchen
-        USHORT nPos;
+        sal_uInt16 nPos;
         for ( nPos = 0;
               nPos < aPfad.Len() &&                             //?O
                   aPfad.GetChar(nPos) != '\\' && aPfad.GetChar(nPos) != '/' &&      //?O
@@ -499,7 +499,7 @@ FSysError DirEntry::ImpParseOs2Name( const ByteString& rPfad, FSysPathStyle eSty
     }
     while ( aPfad.Len() );
 
-    ULONG nErr = ERRCODE_NONE;
+    sal_uInt32 nErr = ERRCODE_NONE;
     // Haupt-Entry (selbst) zuweisen
     if ( aStack.Count() == 0 )
     {
@@ -639,7 +639,7 @@ void DirEntry::ImpTrim( FSysPathStyle eStyle )
     {
         case FSYS_STYLE_FAT:
         {
-            USHORT nPunktPos = aName.Search( '.' );
+            sal_uInt16 nPunktPos = aName.Search( '.' );
             if ( nPunktPos == STRING_NOTFOUND )
             {
                 if ( aName.Len() > 8 )
@@ -1139,7 +1139,7 @@ sal_Bool DirEntry::First()
 *************************************************************************/
 
 String DirEntry::GetFull( FSysPathStyle eStyle, sal_Bool bWithDelimiter,
-                          USHORT nMaxChars ) const
+                          sal_uInt16 nMaxChars ) const
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
@@ -1779,11 +1779,11 @@ sal_Bool DirEntry::Find( const String& rPfad, char cDelim )
         if ( !cDelim )
                 cDelim = SEARCHDELIM(DEFSTYLE)[0];
 
-        USHORT nTokenCount = rPfad.GetTokenCount( cDelim );
-        USHORT nIndex = 0;
+        sal_uInt16 nTokenCount = rPfad.GetTokenCount( cDelim );
+        sal_uInt16 nIndex = 0;
         ByteString aThis = ACCESSDELIM(DEFSTYLE);
         aThis += ByteString(GetFull(), osl_getThreadTextEncoding());
-        for ( USHORT nToken = 0; nToken < nTokenCount; ++nToken )
+        for ( sal_uInt16 nToken = 0; nToken < nTokenCount; ++nToken )
         {
             ByteString aPath = ByteString(rPfad, osl_getThreadTextEncoding()).GetToken( 0, cDelim, nIndex );
 
@@ -1831,7 +1831,7 @@ sal_Bool DirEntry::ImpToRel( String aCurStr )
     }
 
     // "Ubereinstimmung pr"ufen
-    USHORT nPos = aThisCompareStr.Match( aCurCompareStr );
+    sal_uInt16 nPos = aThisCompareStr.Match( aCurCompareStr );
     if ( nPos == STRING_MATCH && aThisStr.Len() != aCurStr.Len() )
         nPos = Min( aThisStr.Len(), aCurStr.Len() );
 
@@ -1877,7 +1877,7 @@ sal_Bool DirEntry::ImpToRel( String aCurStr )
 |*
 *************************************************************************/
 
-USHORT DirEntry::CutRelParents()
+sal_uInt16 DirEntry::CutRelParents()
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
@@ -1891,7 +1891,7 @@ USHORT DirEntry::CutRelParents()
         pDir = pPar;
 
     // '..' zaehlen
-    USHORT nParCount = 0;
+    sal_uInt16 nParCount = 0;
     while ( pPar && pPar->eFlag == FSYS_FLAG_PARENT )
     {
         ++nParCount;
@@ -2030,7 +2030,7 @@ String DirEntry::GetSearchDelimiter( FSysPathStyle eFormatter )
 |*
 *************************************************************************/
 
-USHORT DirEntry::GetMaxNameLen( FSysPathStyle eFormatter )
+sal_uInt16 DirEntry::GetMaxNameLen( FSysPathStyle eFormatter )
 {
     eFormatter = GetStyle( eFormatter );
     switch ( eFormatter )
@@ -2259,7 +2259,7 @@ DirEntry DirEntry::TempName( DirEntryKind eKind ) const
 |*
 *************************************************************************/
 
-const DirEntry &DirEntry::operator[]( USHORT nParentLevel ) const
+const DirEntry &DirEntry::operator[]( sal_uInt16 nParentLevel ) const
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
@@ -2295,7 +2295,7 @@ FSysError DirEntry::ImpParseUnixName( const ByteString& rPfad, FSysPathStyle eSt
         // falls '/' am Anfang, ist der Name '/',
         // der Rest immer ohne die fuehrenden '/'.
         // den ersten '/' suchen
-        USHORT nPos;
+        sal_uInt16 nPos;
         for ( nPos = 0;
               nPos < aPfad.Len() && aPfad.GetChar(nPos) != '/';
               nPos++ )
@@ -2321,8 +2321,8 @@ FSysError DirEntry::ImpParseUnixName( const ByteString& rPfad, FSysPathStyle eSt
                         else if ( aName == "~" )
                         {
                                 DirEntry aHome( String( (const char *) getenv( "HOME" ), osl_getThreadTextEncoding()) );
-                                for ( USHORT n = aHome.Level(); n; --n )
-                                        aStack.Push( new DirEntry( aHome[ (USHORT) n-1 ] ) );
+                                for ( sal_uInt16 n = aHome.Level(); n; --n )
+                                        aStack.Push( new DirEntry( aHome[ (sal_uInt16) n-1 ] ) );
                         }
 #endif
 
@@ -2507,7 +2507,7 @@ sal_Bool DirEntry::MakeShortName( const String& rLongName, DirEntryKind eKind,
 #if 0
         if ( FSYS_STYLE_NWFS == GetPathStyle( ImpGetTopPtr()->GetName() ) )
         {
-                for ( USHORT n = aLongName.Len(); n; --n )
+                for ( sal_uInt16 n = aLongName.Len(); n; --n )
                 {
                         short nChar = aLongName(n-1);
                         if ( nChar < 32 || nChar >= 127 )
@@ -2532,7 +2532,7 @@ sal_Bool DirEntry::MakeShortName( const String& rLongName, DirEntryKind eKind,
         }
 
         // max L"angen feststellen
-        USHORT nMaxExt, nMaxLen;
+        sal_uInt16 nMaxExt, nMaxLen;
         if ( FSYS_STYLE_DETECT == eStyle )
             eStyle = DirEntry::GetPathStyle( GetDevice().GetName() );
         ByteString aInvalidChars;
@@ -2955,7 +2955,7 @@ FSysError DirEntry::Kill(  FSysAction nActions ) const
                 if ( FSYS_ACTION_RECURSIVE == (nActions & FSYS_ACTION_RECURSIVE) )
                 {
                         Dir aDir( *this, FSYS_KIND_DIR|FSYS_KIND_FILE );
-                        for ( USHORT n = 0; eError == FSYS_ERR_OK && n < aDir.Count(); ++n )
+                        for ( sal_uInt16 n = 0; eError == FSYS_ERR_OK && n < aDir.Count(); ++n )
                         {
                                 const DirEntry &rSubDir = aDir[n];
                                 DirEntryFlag flag = rSubDir.GetFlag();
@@ -3062,8 +3062,8 @@ sal_Bool DirEntry::Contains( const DirEntry &rSubEntry ) const
 {
     DBG_ASSERT( IsAbs() && rSubEntry.IsAbs(), "must be absolute entries" );
 
-        USHORT nThisLevel = Level();
-    USHORT nSubLevel = rSubEntry.Level();
+        sal_uInt16 nThisLevel = Level();
+    sal_uInt16 nSubLevel = rSubEntry.Level();
     if ( nThisLevel < nSubLevel )
     {
         for ( ; nThisLevel; --nThisLevel, --nSubLevel )
@@ -3084,11 +3084,11 @@ sal_Bool DirEntry::Contains( const DirEntry &rSubEntry ) const
 |*
 *************************************************************************/
 
-USHORT DirEntry::Level() const
+sal_uInt16 DirEntry::Level() const
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
-    USHORT nLevel = 0;
+    sal_uInt16 nLevel = 0;
     const DirEntry *pRes = this;
     while ( pRes )
     {
@@ -3182,7 +3182,7 @@ sal_Bool DirEntry::IsLongNameOnFAT() const
         }
 
         // DirEntry-Kette auf lange Dateinamen pr?fen
-        for( USHORT iLevel = this->Level(); iLevel > 0; iLevel-- )
+        for( sal_uInt16 iLevel = this->Level(); iLevel > 0; iLevel-- )
         {
             const DirEntry& rEntry = (const DirEntry&) (*this)[iLevel-1];
             String  aBase( rEntry.GetBase() );
diff --git a/tools/source/fsys/filecopy.cxx b/tools/source/fsys/filecopy.cxx
index d5dc5af3990a..e087b6c4a4c3 100755
--- a/tools/source/fsys/filecopy.cxx
+++ b/tools/source/fsys/filecopy.cxx
@@ -315,7 +315,7 @@ FSysError FileCopier::DoCopy_Impl(
         // recursive copy
         eRet = Error( aTgt.MakeDir() ? FSYS_ERR_OK : FSYS_ERR_UNKNOWN, 0, &aTgt );
         Dir aSourceDir( rSource, FSYS_KIND_DIR|FSYS_KIND_FILE );
-        for ( USHORT n = 0; ERRCODE_TOERROR(eRet) == FSYS_ERR_OK && n < aSourceDir.Count(); ++n )
+        for ( sal_uInt16 n = 0; ERRCODE_TOERROR(eRet) == FSYS_ERR_OK && n < aSourceDir.Count(); ++n )
         {
             const DirEntry &rSubSource = aSourceDir[n];
             DirEntryFlag eFlag = rSubSource.GetFlag();
diff --git a/tools/source/fsys/fstat.cxx b/tools/source/fsys/fstat.cxx
index 17995b9f7983..4db68b930fd2 100755
--- a/tools/source/fsys/fstat.cxx
+++ b/tools/source/fsys/fstat.cxx
@@ -50,12 +50,12 @@
 
 FileStat::FileStat()
 :   // don't use Default-Ctors!
-    aDateCreated( ULONG(0) ),
-    aTimeCreated( ULONG(0) ),
-    aDateModified( ULONG(0) ),
-    aTimeModified( ULONG(0) ),
-    aDateAccessed( ULONG(0) ),
-    aTimeAccessed( ULONG(0) )
+    aDateCreated( sal_uInt32(0) ),
+    aTimeCreated( sal_uInt32(0) ),
+    aDateModified( sal_uInt32(0) ),
+    aTimeModified( sal_uInt32(0) ),
+    aDateAccessed( sal_uInt32(0) ),
+    aTimeAccessed( sal_uInt32(0) )
 {
     nSize = 0;
     nKindFlags = FSYS_KIND_UNKNOWN;
@@ -74,12 +74,12 @@ FileStat::FileStat()
 
 FileStat::FileStat( const DirEntry& rDirEntry, FSysAccess nAccess )
 :   // don't use Default-Ctors!
-    aDateCreated( ULONG(0) ),
-    aTimeCreated( ULONG(0) ),
-    aDateModified( ULONG(0) ),
-    aTimeModified( ULONG(0) ),
-    aDateAccessed( ULONG(0) ),
-    aTimeAccessed( ULONG(0) )
+    aDateCreated( sal_uInt32(0) ),
+    aTimeCreated( sal_uInt32(0) ),
+    aDateModified( sal_uInt32(0) ),
+    aTimeModified( sal_uInt32(0) ),
+    aDateAccessed( sal_uInt32(0) ),
+    aTimeAccessed( sal_uInt32(0) )
 {
     sal_Bool bCached = FSYS_ACCESS_CACHED == (nAccess & FSYS_ACCESS_CACHED);
     sal_Bool bFloppy = FSYS_ACCESS_FLOPPY == (nAccess & FSYS_ACCESS_FLOPPY);
@@ -212,7 +212,7 @@ sal_Bool FileStat::GetReadOnlyFlag( const DirEntry &rEntry )
 |*
 *************************************************************************/
 
-ULONG FileStat::SetReadOnlyFlag( const DirEntry &rEntry, sal_Bool bRO )
+sal_uInt32 FileStat::SetReadOnlyFlag( const DirEntry &rEntry, sal_Bool bRO )
 {
 
     ByteString aFPath(rEntry.GetFull(), osl_getThreadTextEncoding());
diff --git a/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx
index 6c3cbf47af32..893f397499a5 100755
--- a/tools/source/fsys/tdir.cxx
+++ b/tools/source/fsys/tdir.cxx
@@ -48,7 +48,7 @@ DECLARE_LIST( DirEntryList, DirEntry* )
 DECLARE_LIST( FSysSortList, FSysSort* )
 DECLARE_LIST( FileStatList, FileStat* )
 
-#define APPEND (USHORT) 65535
+#define APPEND (sal_uInt16) 65535
 
 /*************************************************************************
 |*
@@ -62,7 +62,7 @@ DECLARE_LIST( FileStatList, FileStat* )
 
 sal_Bool Dir::ImpInsertPointReached( const DirEntry& rNewEntry,
                                  const FileStat& rNewStat,
-                                 ULONG nCurPos, ULONG nSortIndex ) const
+                                 sal_uInt32 nCurPos, sal_uInt32 nSortIndex ) const
 {
 #define VALUE( nKindFlags ) \
     ( ( FSYS_KIND_FILE | FSYS_KIND_DIR | FSYS_KIND_DEV | \
@@ -226,7 +226,7 @@ void Dir::ImpSortedInsert( const DirEntry *pNewEntry, const FileStat *pNewStat )
     pLst->First();
     do {
         if ( ImpInsertPointReached( *pNewEntry, *pNewStat, pLst->GetCurPos(),
-                                    (ULONG)0  ) )
+                                    (sal_uInt32)0  ) )
         {
             if ( pStatLst )
                 pStatLst->Insert( (FileStat*)pNewStat, pLst->GetCurPos() );
@@ -377,10 +377,10 @@ void Dir::Reset()
 |*
 *************************************************************************/
 
-USHORT Dir::Scan( USHORT nCount )
+sal_uInt16 Dir::Scan( sal_uInt16 nCount )
 {
 
-    USHORT nRead = 0; // Anzahl in dieser Runde gelesener Eintr"age
+    sal_uInt16 nRead = 0; // Anzahl in dieser Runde gelesener Eintr"age
     FSysFailOnErrorImpl();
 
     // noch nicht fertig gewesen
@@ -559,8 +559,8 @@ FSysError Dir::ImpSetSort( std::va_list pArgs, int nFirstSort )
         bLast = FSYS_SORT_END == (*pSort & FSYS_SORT_END);
         *pSort &= ~FSYS_SORT_END;
 
-        FSysSort nSort = *pSort & ~(USHORT)FSYS_SORT_ASCENDING
-                              &  ~(USHORT)FSYS_SORT_DESCENDING;
+        FSysSort nSort = *pSort & ~(sal_uInt16)FSYS_SORT_ASCENDING
+                              &  ~(sal_uInt16)FSYS_SORT_DESCENDING;
 
         // g"utliges Sortierkriterium?
         if ( ( nSort ==  FSYS_SORT_NAME ) ||
@@ -692,7 +692,7 @@ FSysError Dir::SetSort( FSysSort nSort, ... )
 |*
 *************************************************************************/
 
-DirEntry& Dir::operator[] ( USHORT nIndex ) const
+DirEntry& Dir::operator[] ( sal_uInt16 nIndex ) const
 {
     DBG_ASSERT( nIndex < Count(), "Dir::operator[] : nIndex > Count()" );
 
@@ -733,7 +733,7 @@ Dir& Dir::operator+=( const Dir& rDir )
         } while ( !bStat && pSortLst->Next() );
     }
     FileStat * stat = NULL;
-    for ( USHORT nNr = 0; nNr < rDir.Count(); nNr++ )
+    for ( sal_uInt16 nNr = 0; nNr < rDir.Count(); nNr++ )
     {
         if ( bStat )
         {
@@ -758,11 +758,11 @@ Dir& Dir::operator+=( const Dir& rDir )
 *************************************************************************/
 
 
-USHORT Dir::Count( sal_Bool bUpdated ) const
+sal_uInt16 Dir::Count( sal_Bool bUpdated ) const
 {
     // ggf. erst den Rest lesen
     if ( bUpdated && pReader )
         ((Dir*)this)->Scan( USHRT_MAX );
 
-    return pLst == NULL ? 0 : (USHORT) pLst->Count();
+    return pLst == NULL ? 0 : (sal_uInt16) pLst->Count();
 }
diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index 13da80f6ccca..54d68c31d846 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.cxx
@@ -98,7 +98,7 @@ struct mymnttab
 BOOL GetMountEntry(dev_t /* dev */, struct mymnttab * /* mytab */ )
 {
     DBG_WARNING( "Sorry, not implemented: GetMountEntry" );
-    return FALSE;
+    return sal_False;
 }
 
 #elif defined AIX
@@ -106,7 +106,7 @@ BOOL GetMountEntry(dev_t dev, struct mymnttab *mytab)
 {
     int bufsize;
     if (mntctl (MCTL_QUERY, sizeof bufsize, (char*) &bufsize))
-        return FALSE;
+        return sal_False;
 
     char* buffer = (char *)malloc( bufsize * sizeof(char) );
     if (mntctl (MCTL_QUERY, bufsize, buffer) != -1)
@@ -127,40 +127,40 @@ BOOL GetMountEntry(dev_t dev, struct mymnttab *mytab)
                         += vmt2dataptr((struct vmount*)vmt, VMT_OBJECT);
                 mytab->mountdevice = dev;
                 free( buffer );
-                return TRUE;
+                return sal_True;
             }
         }
     free( buffer );
-    return FALSE;
+    return sal_False;
 }
 
 #else
 
 
-static BOOL GetMountEntry(dev_t dev, struct mymnttab *mytab)
+static sal_Bool GetMountEntry(dev_t dev, struct mymnttab *mytab)
 {
 #if defined SOLARIS || defined SINIX
     FILE *fp = fopen (MNTTAB, "r");
     if (! fp)
-        return FALSE;
+        return sal_False;
     struct mnttab mnt[1];
     while (getmntent (fp, mnt) != -1)
 #elif defined SCO
     FILE *fp = fopen (MNTTAB, "r");
     if (! fp)
-        return FALSE;
+        return sal_False;
     struct mnttab mnt[1];
     while (fread (&mnt, sizeof mnt, 1, fp) > 0)
 #elif defined DECUNIX || defined AIX
     FILE *fp = NULL;
     if (! fp)
-        return FALSE;
+        return sal_False;
     struct mnttab mnt[1];
     while ( 0 )
 #else
     FILE *fp = setmntent (MOUNTED, "r");
     if (! fp)
-        return FALSE;
+        return sal_False;
     struct mnttab *mnt;
     while ((mnt = getmntent (fp)) != NULL)
 #endif
@@ -196,7 +196,7 @@ static BOOL GetMountEntry(dev_t dev, struct mymnttab *mytab)
 #else
         mytab->mymnttab_filesystem = "ext2";        //default ist case sensitiv unter unix
 #endif
-        return TRUE;
+        return sal_True;
     }
 #   ifdef LINUX
     /* #61624# dito */
@@ -204,7 +204,7 @@ static BOOL GetMountEntry(dev_t dev, struct mymnttab *mytab)
 #   else
     fclose (fp);
 #   endif
-    return FALSE;
+    return sal_False;
 }
 
 #endif
@@ -219,13 +219,13 @@ static BOOL GetMountEntry(dev_t dev, struct mymnttab *mytab)
 |*
 *************************************************************************/
 
-BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
+sal_Bool DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
 {
 
     if (eFormatter==FSYS_STYLE_HOST)
     {
 #ifdef NETBSD
-        return TRUE;
+        return sal_True;
 #else
         struct stat buf;
         DirEntry aPath(*this);
@@ -235,7 +235,7 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
         {
             if (aPath.Level() == 1)
             {
-                return TRUE;    // ich bin unter UNIX, also ist der default im Zweifelsfall case sensitiv
+                return sal_True;    // ich bin unter UNIX, also ist der default im Zweifelsfall case sensitiv
             }
             aPath = aPath [1];
         }
@@ -249,17 +249,17 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
             (fsmnt.mymnttab_filesystem.CompareTo("smb") ==COMPARE_EQUAL) ||
             (fsmnt.mymnttab_filesystem.CompareTo("ncpfs")==COMPARE_EQUAL))
         {
-            return FALSE;
+            return sal_False;
         }
         else
         {
-            return TRUE;
+            return sal_True;
         }
 #endif
     }
     else
     {
-        BOOL isCaseSensitive = TRUE;    // ich bin unter UNIX, also ist der default im Zweifelsfall case sensitiv
+        sal_Bool isCaseSensitive = sal_True;    // ich bin unter UNIX, also ist der default im Zweifelsfall case sensitiv
         switch ( eFormatter )
         {
             case FSYS_STYLE_MAC:
@@ -269,19 +269,19 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
             case FSYS_STYLE_NWFS:
             case FSYS_STYLE_HPFS:
                 {
-                    isCaseSensitive = FALSE;
+                    isCaseSensitive = sal_False;
                     break;
                 }
             case FSYS_STYLE_SYSV:
             case FSYS_STYLE_BSD:
             case FSYS_STYLE_DETECT:
                 {
-                    isCaseSensitive = TRUE;
+                    isCaseSensitive = sal_True;
                     break;
                 }
             default:
                 {
-                    isCaseSensitive = TRUE; // ich bin unter UNIX, also ist der default im Zweifelsfall case sensitiv
+                    isCaseSensitive = sal_True; // ich bin unter UNIX, also ist der default im Zweifelsfall case sensitiv
                     break;
                 }
         }
@@ -299,16 +299,16 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
 |*
 *************************************************************************/
 
-BOOL DirEntry::ToAbs()
+sal_Bool DirEntry::ToAbs()
 {
     if ( FSYS_FLAG_VOLUME == eFlag )
     {
         eFlag = FSYS_FLAG_ABSROOT;
-        return TRUE;
+        return sal_True;
     }
 
     if ( IsAbs() )
-      return TRUE;
+      return sal_True;
 
     char sBuf[MAXPATHLEN + 1];
     *this = DirEntry( String( getcwd( sBuf, MAXPATHLEN ), osl_getThreadTextEncoding() ) ) + *this;
@@ -379,7 +379,7 @@ DirEntry DirEntry::GetDevice() const
 |*
 *************************************************************************/
 
-BOOL DirEntry::SetCWD( BOOL bSloppy ) const
+sal_Bool DirEntry::SetCWD( sal_Bool bSloppy ) const
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
@@ -387,31 +387,31 @@ BOOL DirEntry::SetCWD( BOOL bSloppy ) const
     ByteString aPath( GetFull(), osl_getThreadTextEncoding());
     if ( !chdir( aPath.GetBuffer() ) )
     {
-        return TRUE;
+        return sal_True;
     }
     else
     {
         if ( bSloppy && !chdir(aPath.GetBuffer()) )
         {
-            return TRUE;
+            return sal_True;
         }
         else
         {
-            return FALSE;
+            return sal_False;
         }
     }
 }
 
 //-------------------------------------------------------------------------
 
-USHORT DirReader_Impl::Init()
+sal_uInt16 DirReader_Impl::Init()
 {
     return 0;
 }
 
 //-------------------------------------------------------------------------
 
-USHORT DirReader_Impl::Read()
+sal_uInt16 DirReader_Impl::Read()
 {
     if (!pDosDir)
     {
@@ -420,7 +420,7 @@ USHORT DirReader_Impl::Read()
 
     if (!pDosDir)
     {
-        bReady = TRUE;
+        bReady = sal_True;
         return 0;
     }
 
@@ -437,7 +437,7 @@ USHORT DirReader_Impl::Read()
                 :   FSYS_FLAG_NORMAL;
             DirEntry *pTemp = new DirEntry( ByteString(pDosEntry->d_name), eFlag, FSYS_STYLE_UNX );
             if ( pParent )
-                pTemp->ImpChangeParent( new DirEntry( *pParent ), FALSE);
+                pTemp->ImpChangeParent( new DirEntry( *pParent ), sal_False);
             FileStat aStat( *pTemp );
             if ( ( ( ( pDir->eAttrMask & FSYS_KIND_DIR ) &&
                      ( aStat.IsKind( FSYS_KIND_DIR ) ) ) ||
@@ -457,7 +457,7 @@ USHORT DirReader_Impl::Read()
         }
     }
     else
-        bReady = TRUE;
+        bReady = sal_True;
     return 0;
 }
 
@@ -490,7 +490,7 @@ FileStat::FileStat( const void *, const void * ):
 |*    Letzte Aenderung  MA 07.11.91
 |*
 *************************************************************************/
-BOOL FileStat::Update( const DirEntry& rDirEntry, BOOL )
+sal_Bool FileStat::Update( const DirEntry& rDirEntry, sal_Bool )
 {
 
     nSize = 0;
@@ -507,7 +507,7 @@ BOOL FileStat::Update( const DirEntry& rDirEntry, BOOL )
     if ( !rDirEntry.IsValid() )
     {
         nError = FSYS_ERR_NOTEXISTS;
-        return FALSE;
+        return sal_False;
     }
 
     // Sonderbehandlung falls es sich um eine Root handelt
@@ -515,7 +515,7 @@ BOOL FileStat::Update( const DirEntry& rDirEntry, BOOL )
     {
         nKindFlags = FSYS_KIND_DIR;
         nError = FSYS_ERR_OK;
-        return TRUE;
+        return sal_True;
     }
 
     struct stat aStat;
@@ -536,11 +536,11 @@ BOOL FileStat::Update( const DirEntry& rDirEntry, BOOL )
         {
             nKindFlags = FSYS_KIND_WILD;
             nError = FSYS_ERR_OK;
-            return TRUE;
+            return sal_True;
         }
 
         nError = FSYS_ERR_NOTEXISTS;
-        return FALSE;
+        return sal_False;
     }
 
     nError = FSYS_ERR_OK;
@@ -562,7 +562,7 @@ BOOL FileStat::Update( const DirEntry& rDirEntry, BOOL )
     Unx2DateAndTime( aStat.st_mtime, aTimeModified, aDateModified );
     Unx2DateAndTime( aStat.st_atime, aTimeAccessed, aDateAccessed );
 
-    return TRUE;
+    return sal_True;
 }
 
 //====================================================================
@@ -654,7 +654,7 @@ ErrCode FileStat::QueryDiskSpace( const String &, BigInt &, BigInt & )
 
 //=========================================================================
 
-void FSysEnableSysErrorBox( BOOL )
+void FSysEnableSysErrorBox( sal_Bool )
 {
 }
 
diff --git a/tools/unx/source/dll/toolsdll.cxx b/tools/unx/source/dll/toolsdll.cxx
index 71b01e20bd4f..c008cbbc001c 100644
--- a/tools/unx/source/dll/toolsdll.cxx
+++ b/tools/unx/source/dll/toolsdll.cxx
@@ -41,7 +41,7 @@ static void* aAppData[SHL_COUNT];
 |*
 ***************************************************************************/
 
-void** GetAppData( USHORT nSharedLib )
+void** GetAppData( sal_uInt16 nSharedLib )
 {
     return &(aAppData[nSharedLib]);
 }