1 files changed, 16 insertions, 16 deletions

diff --git a/tools/bootstrp/cppdep.cxx b/tools/bootstrp/cppdep.cxx
index 6263c719df51..28410a575b5a 100644
--- a/tools/bootstrp/cppdep.cxx
+++ b/tools/bootstrp/cppdep.cxx
@@ -63,34 +63,34 @@ CppDep::~CppDep()
 
 void CppDep::Execute()
 {
-    ULONG nCount = pSources->Count();
-    for ( ULONG n=0; n<nCount;n++)
+    sal_uIntPtr nCount = pSources->Count();
+    for ( sal_uIntPtr n=0; n<nCount;n++)
     {
         ByteString *pStr = pSources->GetObject(n);
         Search( *pStr );
     }
 }
 
-BOOL CppDep::AddSearchPath( const char* aPath )
+sal_Bool CppDep::AddSearchPath( const char* aPath )
 {
     ByteString *pStr = new ByteString( aPath );
     pSearchPath->Insert( pStr, LIST_APPEND );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL CppDep::AddSource( const char* aSource )
+sal_Bool CppDep::AddSource( const char* aSource )
 {
     ByteString *pStr = new ByteString( aSource );
     pSources->Insert( pStr, LIST_APPEND );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL CppDep::Search( ByteString aFileName )
+sal_Bool CppDep::Search( ByteString aFileName )
 {
 #ifdef DEBUG_VERBOSE
     fprintf( stderr, "SEARCH : %s\n", aFileName.GetBuffer());
 #endif
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     SvFileStream aFile;
     ByteString aReadLine;
@@ -100,7 +100,7 @@ BOOL CppDep::Search( ByteString aFileName )
     aFile.Open( suFileName, STREAM_READ );
     while ( aFile.ReadLine( aReadLine ))
     {
-        USHORT nPos = aReadLine.Search( "include" );
+        sal_uInt16 nPos = aReadLine.Search( "include" );
         if ( nPos != STRING_NOTFOUND  )
         {
 #ifdef DEBUG_VERBOSE
@@ -115,13 +115,13 @@ BOOL CppDep::Search( ByteString aFileName )
             if ( aResult !="")
             if ( (aNewFile = Exists( aResult )) != "" )
             {
-                BOOL bFound = FALSE;
-                ULONG nCount = pFileList->Count();
-                for ( ULONG i=0; i<nCount; i++ )
+                sal_Bool bFound = sal_False;
+                sal_uIntPtr nCount = pFileList->Count();
+                for ( sal_uIntPtr i=0; i<nCount; i++ )
                 {
                     ByteString *pStr = pFileList->GetObject(i);
                     if ( *pStr == aNewFile )
-                        bFound = TRUE;
+                        bFound = sal_True;
                 }
 #ifdef DEBUG_VERBOSE
                 fprintf( stderr, "not in list : %d %s\n", nPos, aReadLine.GetBuffer() );
@@ -151,8 +151,8 @@ ByteString CppDep::Exists( ByteString aFileName )
     fprintf( stderr, "Searching %s \n", aFileName.GetBuffer() );
 #endif
 
-    ULONG nCount = pSearchPath->Count();
-    for ( ULONG n=0; n<nCount; n++)
+    sal_uIntPtr nCount = pSearchPath->Count();
+    for ( sal_uIntPtr n=0; n<nCount; n++)
     {
         struct stat aBuf;
         ByteString *pPathName = pSearchPath->GetObject(n);
@@ -217,7 +217,7 @@ ByteString CppDep::IsIncludeStatement( ByteString aLine )
     if ( aTmpStr.Equals("#include") )
     {
         aTmpStr = aLine.Erase( 0, 8 );
-        USHORT nLen = aLine.Len();
+        sal_uInt16 nLen = aLine.Len();
         aLine.Erase( nLen-1, 1 );
         aLine.Erase( 0, 1 );
 #ifdef DEBUG_VERBOSE