diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-06 16:12:59 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-06 16:33:30 +0200 |
| commit | 4f2dfb18283121a81861afb58b037408b3c0036f (patch) | |
| tree | ef31bbcc6707e544f145aef0c23570743a253a16 /editeng | |
| parent | 13f51daa02cc6d1f923a6863ee91662dbea75a8d (diff) | |
clang-analyzer-deadcode.DeadStores
Change-Id: I211ff9c4f64e97f3b397fe2b384f06d18026e1e4
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/rtf/svxrtf.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index a7c81ae7211b..2311fbe95d71 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -297,7 +297,7 @@ INSINGLECHAR: void SvxRTFParser::ReadStyleTable() { - int nToken, bSaveChkStyleAttr = bChkStyleAttr ? 1 : 0; + int bSaveChkStyleAttr = bChkStyleAttr ? 1 : 0; sal_uInt16 nStyleNo = 0; bool bHasStyleNo = false; int _nOpenBrakets = 1; // the first was already detected earlier!! @@ -310,7 +310,8 @@ void SvxRTFParser::ReadStyleTable() while( _nOpenBrakets && IsParserWorking() ) { - switch( nToken = GetNextToken() ) + int nToken = GetNextToken(); + switch( nToken ) { case '}': if( --_nOpenBrakets && IsParserWorking() ) // Style has been completely read, @@ -320,10 +321,10 @@ void SvxRTFParser::ReadStyleTable() case '{': { if( RTF_IGNOREFLAG != GetNextToken() ) - nToken = SkipToken(); + SkipToken(); else if( RTF_UNKNOWNCONTROL != ( nToken = GetNextToken() ) && RTF_PN != nToken ) - nToken = SkipToken( -2 ); + SkipToken( -2 ); else { // filter out at once @@ -458,9 +459,9 @@ void SvxRTFParser::ReadFontTable() while( _nOpenBrakets && IsParserWorking() ) { - int nToken = 0; bool bCheckNewFont = false; - switch( ( nToken = GetNextToken() )) + int nToken = GetNextToken(); + switch( nToken ) { case '}': bIsAltFntNm = false; @@ -473,13 +474,13 @@ void SvxRTFParser::ReadFontTable() break; case '{': if( RTF_IGNOREFLAG != GetNextToken() ) - nToken = SkipToken(); + SkipToken(); // immediately skip unknown and all known but non-evaluated // groups else if( RTF_UNKNOWNCONTROL != ( nToken = GetNextToken() ) && RTF_PANOSE != nToken && RTF_FNAME != nToken && RTF_FONTEMB != nToken && RTF_FONTFILE != nToken ) - nToken = SkipToken( -2 ); + SkipToken( -2 ); else { // filter out at once @@ -597,21 +598,20 @@ OUString& SvxRTFParser::GetTextToEndGroup( OUString& rStr ) while( _nOpenBrakets && IsParserWorking() ) { - int nToken = 0; - switch( nToken = GetNextToken() ) + switch( GetNextToken() ) { case '}': --_nOpenBrakets; break; case '{': { if( RTF_IGNOREFLAG != GetNextToken() ) - nToken = SkipToken(); + SkipToken(); else if( RTF_UNKNOWNCONTROL != GetNextToken() ) - nToken = SkipToken( -2 ); + SkipToken( -2 ); else { // filter out at once ReadUnknownData(); - nToken = GetNextToken(); + int nToken = GetNextToken(); if( '}' != nToken ) eState = SVPAR_ERROR; break; @@ -662,16 +662,16 @@ void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo ) while( _nOpenBrakets && IsParserWorking() ) { - int nToken = 0; - switch( nToken = GetNextToken() ) + int nToken = GetNextToken(); + switch( nToken ) { case '}': --_nOpenBrakets; break; case '{': { if( RTF_IGNOREFLAG != GetNextToken() ) - nToken = SkipToken(); + SkipToken(); else if( RTF_UNKNOWNCONTROL != GetNextToken() ) - nToken = SkipToken( -2 ); + SkipToken( -2 ); else { // filter out at once |