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

[Caolán McNamara]

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

New commits:
commit 60d34e1c840d2c317bb7d0a5b14f4602c22b3fcc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 12 20:33:06 2014 +0000

    coverity#735517 Logically dead code
    
    its possible that this was the original intent, maybe
    
    Change-Id: Ia7ab679b84f16ae7aab201b43eb69ce6a693c0f2
    Reviewed-on: https://gerrit.libreoffice.org/12392
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

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