summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-07-17 16:26:35 +0100
committerXisco Faulí <xiscofauli@libreoffice.org>2018-07-18 18:12:10 +0200
commit7cca3ff7d0c2d1bf6e47fa69c4edb939e51d098c (patch)
treebeedd27f560be29b844116b867e052ccf57b2d73
parent9bde4146ad0ebe6d3298f7d359154459cbf62f89 (diff)
Resolves: tdf#118545 restore to historic logic
revert commit 9eff9e699e17cc5a8a25895bd28dc8e4ceb8071e Date: Wed Aug 10 09:47:40 2016 +0200 Don't re-check valid SwPageDescs when layouting and then revert commit 60d34e1c840d2c317bb7d0a5b14f4602c22b3fcc 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: Iff45f1e7f3d7e3791d984eb117779a6f39ebb19c Reviewed-on: https://gerrit.libreoffice.org/57578 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
-rw-r--r--sw/source/core/layout/layact.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 761a85c51741..30f6499b01f9 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -444,10 +444,8 @@ void SwLayAction::InternalAction(OutputDevice* pRenderContext)
sal_uInt16 nPercentPageNum = 0;
while ( (pPage && !IsInterrupt()) || m_nCheckPageNum != USHRT_MAX )
{
- // nCheckPageNum is set to USHRT_MAX in this code path after we have
- // checked the SwPageDescs and set tos the minimal changed SwPageDesc.
- // We don't need to check the SwPageDescs without changes.
- if ( (m_nCheckPageNum != USHRT_MAX) && (!pPage || pPage->GetPhyPageNum() >= m_nCheckPageNum) )
+ if ( !pPage && m_nCheckPageNum != USHRT_MAX &&
+ (!pPage || pPage->GetPhyPageNum() >= m_nCheckPageNum) )
{
if ( !pPage || pPage->GetPhyPageNum() > m_nCheckPageNum )
{