diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-03-09 21:06:48 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-03-09 21:27:31 +0000 |
| commit | e96a5d4064a6002eb95b2c05f4e68c79bb766b07 (patch) | |
| tree | 7ca1abec7a02618fe33f61808fbc0e0e65c4d73e | |
| parent | 124a3e680fecf0659dfaf283a648a405c070c71c (diff) | |
coverity#1287398 Logically dead code
and
coverity#1287399 Logically dead code
regression from
commit 5806a7ed44f675f8c2d6aaf16a4347f3e11c9783
Date: Mon Mar 2 09:36:39 2015 +0200
cppcheck: Variable is assigned a value that is never used
Change-Id: Iaee21f8c120a09aaeed2f55da16a7ef83bea2b07
| -rw-r--r-- | dbaccess/source/ui/misc/HtmlReader.cxx | 5 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/RtfReader.cxx | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 56470b3f3842..436995b63cf3 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -422,7 +422,7 @@ bool OHTMLReader::CreateTable(int nToken) sal_Int32 nTextColor = 0; do { - switch(nToken) + switch (nToken) { case HTML_TEXTTOKEN: case HTML_SINGLECHAR: @@ -490,8 +490,9 @@ bool OHTMLReader::CreateTable(int nToken) aFont.Strikeout = ::com::sun::star::awt::FontStrikeout::SINGLE; break; } + nToken = GetNextToken(); } - while( GetNextToken() != HTML_TABLEROW_OFF ); + while (nToken != HTML_TABLEROW_OFF); if ( !m_sCurrent.isEmpty() ) aColumnName = m_sCurrent; diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index 4e89f2a7aa57..a4ece11b42f5 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -258,7 +258,7 @@ bool ORTFReader::CreateTable(int nToken) FontDescriptor aFont = VCLUnoHelper::CreateFontDescriptor(Application::GetSettings().GetStyleSettings().GetAppFont()); do { - switch(nToken) + switch (nToken) { case RTF_UNKNOWNCONTROL: case RTF_UNKNOWNDATA: @@ -301,8 +301,9 @@ bool ORTFReader::CreateTable(int nToken) aFont.Strikeout = ::com::sun::star::awt::FontStrikeout::SINGLE; break; } + nToken = GetNextToken(); } - while( GetNextToken() != RTF_TROWD && eState != SVPAR_ERROR && eState != SVPAR_ACCEPTED ); + while(nToken != RTF_TROWD && eState != SVPAR_ERROR && eState != SVPAR_ACCEPTED); bool bOk = !m_vDestVector.empty(); if(bOk) |