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

[Caolán McNamara]

 sw/source/core/layout/layact.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 61c226d34edc7fd1b212f01be6bdbbde6cc6c2f7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 12 20:31:40 2014 +0000

    Revert "coverity#735657 Division or modulo by float zero"
    
    wrong name, and I intended to get an explicit review of this
    option
    
    This reverts commit c4f821f17cb8c970d1d8abd86a1f780250d96734.
    
    Change-Id: I743e79b8cc9493c259b88f50487ef06290ab7318

diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 64428e1..f664f70 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -474,7 +474,8 @@ void SwLayAction::InternalAction()
     sal_uInt16 nPercentPageNum = 0;
     while ( (pPage && !IsInterrupt()) || nCheckPageNum != USHRT_MAX )
     {
-        if (!pPage || (nCheckPageNum != USHRT_MAX && pPage->GetPhyPageNum() >= nCheckPageNum))
+        if ( !pPage && nCheckPageNum != USHRT_MAX &&
+             (!pPage || pPage->GetPhyPageNum() >= nCheckPageNum) )
         {
             if ( !pPage || pPage->GetPhyPageNum() > nCheckPageNum )
             {