Kaydet (Commit) e96a5d40 authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#1287398 Logically dead code

and

coverity#1287399 Logically dead code

regression from

commit 5806a7ed
Date:   Mon Mar 2 09:36:39 2015 +0200
    cppcheck: Variable is assigned a value that is never used

Change-Id: Iaee21f8c120a09aaeed2f55da16a7ef83bea2b07
üst 124a3e68
...@@ -422,7 +422,7 @@ bool OHTMLReader::CreateTable(int nToken) ...@@ -422,7 +422,7 @@ bool OHTMLReader::CreateTable(int nToken)
sal_Int32 nTextColor = 0; sal_Int32 nTextColor = 0;
do do
{ {
switch(nToken) switch (nToken)
{ {
case HTML_TEXTTOKEN: case HTML_TEXTTOKEN:
case HTML_SINGLECHAR: case HTML_SINGLECHAR:
...@@ -490,8 +490,9 @@ bool OHTMLReader::CreateTable(int nToken) ...@@ -490,8 +490,9 @@ bool OHTMLReader::CreateTable(int nToken)
aFont.Strikeout = ::com::sun::star::awt::FontStrikeout::SINGLE; aFont.Strikeout = ::com::sun::star::awt::FontStrikeout::SINGLE;
break; break;
} }
nToken = GetNextToken();
} }
while( GetNextToken() != HTML_TABLEROW_OFF ); while (nToken != HTML_TABLEROW_OFF);
if ( !m_sCurrent.isEmpty() ) if ( !m_sCurrent.isEmpty() )
aColumnName = m_sCurrent; aColumnName = m_sCurrent;
......
...@@ -258,7 +258,7 @@ bool ORTFReader::CreateTable(int nToken) ...@@ -258,7 +258,7 @@ bool ORTFReader::CreateTable(int nToken)
FontDescriptor aFont = VCLUnoHelper::CreateFontDescriptor(Application::GetSettings().GetStyleSettings().GetAppFont()); FontDescriptor aFont = VCLUnoHelper::CreateFontDescriptor(Application::GetSettings().GetStyleSettings().GetAppFont());
do do
{ {
switch(nToken) switch (nToken)
{ {
case RTF_UNKNOWNCONTROL: case RTF_UNKNOWNCONTROL:
case RTF_UNKNOWNDATA: case RTF_UNKNOWNDATA:
...@@ -301,8 +301,9 @@ bool ORTFReader::CreateTable(int nToken) ...@@ -301,8 +301,9 @@ bool ORTFReader::CreateTable(int nToken)
aFont.Strikeout = ::com::sun::star::awt::FontStrikeout::SINGLE; aFont.Strikeout = ::com::sun::star::awt::FontStrikeout::SINGLE;
break; 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(); bool bOk = !m_vDestVector.empty();
if(bOk) if(bOk)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment