diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index c43994e8f98c..acc15a5d3485 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -130,7 +130,7 @@ public: sal_Unicode GetNextChar(); void RereadLookahead(); - inline int IsParserWorking() const { return SVPAR_WORKING == eState; } + inline bool IsParserWorking() const { return SVPAR_WORKING == eState; } Link GetAsynchCallLink() const { return STATIC_LINK( this, SvParser, NewDataRead ); } diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 9cda95d22ca3..b8076fe836ef 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -421,13 +421,13 @@ int HTMLParser::FilterToken( int nToken ) int HTMLParser::ScanText( const sal_Unicode cBreak ) { OUStringBuffer sTmpBuffer( MAX_LEN ); - int bContinue = true; - int bEqSignFound = false; + bool bContinue = true; + bool bEqSignFound = false; sal_Unicode cQuote = 0U; while( bContinue && IsParserWorking() ) { - int bNextCh = true; + bool bNextCh = true; switch( nNextCh ) { case '&': @@ -844,12 +844,12 @@ int HTMLParser::_GetNextRawToken() } // Default return value: HTML_RAWDATA - int bContinue = true; + bool bContinue = true; int nToken = HTML_RAWDATA; SaveState( 0 ); while( bContinue && IsParserWorking() ) { - int bNextCh = true; + bool bNextCh = true; switch( nNextCh ) { case '<': @@ -865,7 +865,7 @@ int HTMLParser::_GetNextRawToken() sal_uLong nLinePos = GetLinePos(); // Start of an end token? - int bOffState = false; + bool bOffState = false; if( '/' == (nNextCh = GetNextChar()) ) { bOffState = true; @@ -1089,7 +1089,7 @@ int HTMLParser::_GetNextToken() } do { - int bNextCh = true; + bool bNextCh = true; switch( nNextCh ) { case '<': @@ -1098,7 +1098,7 @@ int HTMLParser::_GetNextToken() sal_uLong nLineNr = GetLineNr(); sal_uLong nLinePos = GetLinePos(); - int bOffState = false; + bool bOffState = false; if( '/' == (nNextCh = GetNextChar()) ) { bOffState = true; diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index 1c28b78638f9..4e0f9714a463 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -54,7 +54,7 @@ int SvRTFParser::_GetNextToken() { int nRet = 0; do { - int bNextCh = true; + bool bNextCh = true; switch( nNextCh ) { case '\\': @@ -116,7 +116,7 @@ int SvRTFParser::_GetNextToken() } // minus before numeric parameters - int bNegValue = false; + bool bNegValue = false; if( '-' == nNextCh ) { bNegValue = true; @@ -304,10 +304,10 @@ sal_Unicode SvRTFParser::GetHexValue() void SvRTFParser::ScanText( const sal_Unicode cBreak ) { OUStringBuffer aStrBuffer; - int bContinue = true; + bool bContinue = true; while( bContinue && IsParserWorking() && aStrBuffer.getLength() < MAX_STRING_LEN) { - int bNextCh = true; + bool bNextCh = true; switch( nNextCh ) { case '\\':