diff options
Diffstat (limited to 'idl/source/prj/command.cxx')
-rwxr-xr-x[-rw-r--r--] | idl/source/prj/command.cxx | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx index 5e85fe86ca4b..a112e3b93f83 100644..100755 --- a/idl/source/prj/command.cxx +++ b/idl/source/prj/command.cxx @@ -141,7 +141,7 @@ void DeInit() delete IDLAPP; } -BOOL ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand ) +sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand ) { for( size_t n = 0; n < rCommand.aInFileList.size(); ++n ) { @@ -163,23 +163,27 @@ BOOL ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand ) aStr = "error during load, file "; aStr += ByteString( aFileName, RTL_TEXTENCODING_UTF8 ); fprintf( stderr, "%s\n", aStr.GetBuffer() ); - return FALSE; + return sal_False; } } else { SvTokenStream aTokStm( aStm, aFileName ); - if( !pDataBase->ReadSvIdl( aTokStm, FALSE, rCommand.aPath ) ) - return FALSE; + if( !pDataBase->ReadSvIdl( aTokStm, sal_False, rCommand.aPath ) ) + return sal_False; } } else - return FALSE; + { + const ByteString aStr( aFileName, RTL_TEXTENCODING_UTF8 ); + fprintf( stderr, "unable to read input file: %s\n", aStr.GetBuffer() ); + return sal_False; + } } - return TRUE; + return sal_True; } -static BOOL ResponseFile( StringList * pList, int argc, char ** argv ) +static sal_Bool ResponseFile( StringList * pList, int argc, char ** argv ) { // program name pList->push_back( new String( String::CreateFromAscii(*argv) ) ); @@ -189,13 +193,13 @@ static BOOL ResponseFile( StringList * pList, int argc, char ** argv ) { // when @, then response file SvFileStream aStm( String::CreateFromAscii((*(argv +i)) +1), STREAM_STD_READ | STREAM_NOCREATE ); if( aStm.GetError() != SVSTREAM_OK ) - return FALSE; + return sal_False; ByteString aStr; while( aStm.ReadLine( aStr ) ) { - USHORT n = 0; - USHORT nPos = 1; + sal_uInt16 n = 0; + sal_uInt16 nPos = 1; while( n != nPos ) { while( aStr.GetChar(n) && isspace( aStr.GetChar(n) ) ) @@ -211,7 +215,7 @@ static BOOL ResponseFile( StringList * pList, int argc, char ** argv ) else if( argv[ i ] ) pList->push_back( new String( String::CreateFromAscii( argv[ i ] ) ) ); } - return TRUE; + return sal_True; } SvCommand::SvCommand( int argc, char ** argv ) |