[Libreoffice-commits] core.git: hwpfilter/source

[Julien Nabet]

 hwpfilter/source/hwpreader.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8088aeabe4fc4c9e82c78beba3c89dd40a50838a
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Aug 31 11:15:57 2014 +0200

    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

diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 914f6b4..d79b8f5 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();