diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2012-03-18 10:56:17 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2012-03-18 10:56:17 +0100 |
| commit | 2255d1f25f6e9bf4baac9ca5ef9668eb3c518ee4 (patch) | |
| tree | 5df9a502762c51ab3899a23bbb2574313be8706a /sw | |
| parent | fa2cccb7cb334bb78bab6fd02b08021a2a94f201 (diff) | |
Simplify these 2 conditions
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 254b4c962e64..db0fdb55a0e9 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -2360,7 +2360,7 @@ CharSet SwWW8ImplReader::GetCurrentCharSet() { if (!maFontSrcCharSets.empty()) eSrcCharSet = maFontSrcCharSets.top(); - if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && (nCharFmt != -1) && nCharFmt >= 0 && (size_t)nCharFmt < vColl.size() ) + if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && nCharFmt >= 0 && (size_t)nCharFmt < vColl.size() ) eSrcCharSet = vColl[nCharFmt].GetCharSet(); if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && StyleExists(nAktColl) && nAktColl < vColl.size()) eSrcCharSet = vColl[nAktColl].GetCharSet(); @@ -2422,7 +2422,7 @@ CharSet SwWW8ImplReader::GetCurrentCJKCharSet() eSrcCharSet = maFontSrcCJKCharSets.top(); if (!vColl.empty()) { - if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && (nCharFmt != -1) && nCharFmt >= 0 && (size_t)nCharFmt < vColl.size() ) + if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && nCharFmt >= 0 && (size_t)nCharFmt < vColl.size() ) eSrcCharSet = vColl[nCharFmt].GetCJKCharSet(); if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW && nAktColl < vColl.size()) eSrcCharSet = vColl[nAktColl].GetCJKCharSet(); |