sw/source/core/layout/layact.cxx | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit cee296066ab780217395201ab84c2150c8840d25
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jul 17 16:26:35 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jul 17 22:11:45 2018 +0200
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/57577
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index b390ab771371..ea6bbebf3def 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -442,10 +442,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 )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
