diff options
Diffstat (limited to 'tools/bootstrp/command.cxx')
| -rw-r--r-- | tools/bootstrp/command.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tools/bootstrp/command.cxx b/tools/bootstrp/command.cxx index 2ab0cc8dc4a6..85dc982379e7 100644 --- a/tools/bootstrp/command.cxx +++ b/tools/bootstrp/command.cxx @@ -92,7 +92,7 @@ #endif /*****************************************************************************/ -CommandLine::CommandLine(BOOL bWrite) +CommandLine::CommandLine(sal_Bool bWrite) /*****************************************************************************/ : bTmpWrite(bWrite) { @@ -117,7 +117,7 @@ CommandLine::CommandLine(BOOL bWrite) } /*****************************************************************************/ -CommandLine::CommandLine(const char *CommandString, BOOL bWrite) +CommandLine::CommandLine(const char *CommandString, sal_Bool bWrite) /*****************************************************************************/ : bTmpWrite(bWrite) { @@ -143,7 +143,7 @@ CommandLine::CommandLine(const char *CommandString, BOOL bWrite) } /*****************************************************************************/ -CommandLine::CommandLine(const CommandLine& CCommandLine, BOOL bWrite) +CommandLine::CommandLine(const CommandLine& CCommandLine, sal_Bool bWrite) /*****************************************************************************/ : bTmpWrite(bWrite) { @@ -405,9 +405,9 @@ void CCommand::ImplInit() char *pChar; int nVoid = sizeof( size_t * ); nArgc = aCommandLine.GetTokenCount(' '); - ULONG nLen = aCommandLine.Len(); + sal_uIntPtr nLen = aCommandLine.Len(); - ppArgv = (char **) new char[ (ULONG)(nLen + nVoid * (nArgc +2) + nArgc ) ]; + ppArgv = (char **) new char[ (sal_uIntPtr)(nLen + nVoid * (nArgc +2) + nArgc ) ]; pChar = (char *) ppArgv + ( (1+nArgc) * nVoid ); pPtr = (size_t *) ppArgv; for ( xub_StrLen i=0; i<nArgc; i++ ) @@ -421,7 +421,7 @@ void CCommand::ImplInit() #ifdef UNX if ( i == 1 ) { - USHORT nWo = aCommandLine.Search("csh -c "); + sal_uInt16 nWo = aCommandLine.Search("csh -c "); if (nWo != STRING_NOTFOUND) aCommandLine.Erase(0, nWo + 7); else @@ -452,19 +452,19 @@ CCommand::operator int() if (( pid = fork()) < 0 ) { - DBG_ASSERT( FALSE, "fork error" ); + DBG_ASSERT( sal_False, "fork error" ); } else if ( pid == 0 ) { if ( execv( ppArgv[0], (char * const *) ppArgv ) < 0 ) { - DBG_ASSERT( FALSE, "execv failed" ); + DBG_ASSERT( sal_False, "execv failed" ); } } //fprintf( stderr, "parent: %s %s\n", ppArgv[0] , ppArgv[1] ); if ( (nRet = waitpid( pid, NULL, 0 ) < 0) ) { - DBG_ASSERT( FALSE, "wait error" ); + DBG_ASSERT( sal_False, "wait error" ); } #endif @@ -517,7 +517,7 @@ ByteString CCommand::Search(ByteString aEnv, ByteString sItem) ByteString sEnvironment = GetEnv( sEnv.GetBuffer()); xub_StrLen nCount = sEnvironment.GetTokenCount( cPathSeperator ); - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; for ( xub_StrLen i=0; i<nCount && !bFound; i++ ) { @@ -534,7 +534,7 @@ ByteString CCommand::Search(ByteString aEnv, ByteString sItem) aDirEntry.ToAbs(); if ( aDirEntry.Exists()) { sReturn = aEntry; - bFound = TRUE; + bFound = sal_True; } } if ( !bFound ) @@ -557,7 +557,7 @@ ByteString CCommand::Search(ByteString aEnv, ByteString sItem) aDirEntry.ToAbs(); if ( aDirEntry.Exists()) { sReturn = aEntry; - bFound = TRUE; + bFound = sal_True; } } } @@ -596,7 +596,7 @@ CCommandd::operator int() LPTSTR lpCommandLine = (char *) GetCommandLine_().GetBuffer(); LPSECURITY_ATTRIBUTES lpProcessAttributes = NULL; LPSECURITY_ATTRIBUTES lpThreadAttributes = NULL; - BOOL bInheritHandles = TRUE; + sal_Bool bInheritHandles = sal_True; // wie wuenschen wir denn gestartet zu werden ?? DWORD dwCreationFlags; |