diff options
Diffstat (limited to 'vcl/source/filter/ixbm/xbmread.cxx')
-rw-r--r-- | vcl/source/filter/ixbm/xbmread.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx index 9b16c901b762..76d41bf22d6d 100644 --- a/vcl/source/filter/ixbm/xbmread.cxx +++ b/vcl/source/filter/ixbm/xbmread.cxx @@ -141,8 +141,8 @@ OString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1, { bStatus = false; - if( ( ( nPos2 = aRet.indexOf( pTok2 ) ) != -1 ) && - ( nPos2 > nPos1 ) ) + nPos2 = aRet.indexOf( pTok2 ); + if( ( nPos2 != -1 ) && ( nPos2 > nPos1 ) ) { bStatus = true; } @@ -208,7 +208,9 @@ void XBMReader::ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat sal_Int32 nPos; // delete opening curly bracket - if( (nPos = ( aLine = aLastLine ).indexOf('{') ) != -1 ) + aLine = aLastLine; + nPos = aLine.indexOf('{'); + if( nPos != -1 ) aLine = aLine.copy(nPos + 1); bFirstLine = false; |