diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-08-31 11:15:57 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2014-08-31 11:18:47 +0200 |
| commit | 8088aeabe4fc4c9e82c78beba3c89dd40a50838a (patch) | |
| tree | 255c75b82f7684bb54198130da87f299b4e3df46 /hwpfilter | |
| parent | 880c18f23068a1faf34f36a67161e3b85fffdea7 (diff) | |
cppcheck: Logical conjunction always evaluates to false
I don't know how to check it's ok, I just took example above
It seems there was a wrong mix between header and footer test
Change-Id: Ia5bb838e92306f3bb160069a7c62707e365e8ab2
Diffstat (limited to 'hwpfilter')
| -rw-r--r-- | hwpfilter/source/hwpreader.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index 914f6b4e9392..d79b8f506590 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -1187,8 +1187,8 @@ void HwpReader::makeMasterStyles() padd(ascii("text:style-name"), sXML_CDATA, ascii("Standard")); rstartEl(ascii("text:p"), rList); pList->clear(); - if( pPage->pagenumber && pPage->pagenumber->where < 4 - && pPage->pagenumber->where == 7 ) + if( pPage->pagenumber && (pPage->pagenumber->where < 4 || + pPage->pagenumber->where == 7 ) ) { d->pPn = pPage->pagenumber; makeShowPageNum(); |