Kaydet (Commit) c21a5229 authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Andras Timar

Resolves: tdf#118545 restore to historic logic

revert

commit 9eff9e69
Date:   Wed Aug 10 09:47:40 2016 +0200

    Don't re-check valid SwPageDescs when layouting

and then revert

commit 60d34e1c
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/57660
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
(cherry picked from commit b2671845)
üst a10f2e24
...@@ -444,10 +444,8 @@ void SwLayAction::InternalAction(OutputDevice* pRenderContext) ...@@ -444,10 +444,8 @@ void SwLayAction::InternalAction(OutputDevice* pRenderContext)
sal_uInt16 nPercentPageNum = 0; sal_uInt16 nPercentPageNum = 0;
while ( (pPage && !IsInterrupt()) || m_nCheckPageNum != USHRT_MAX ) while ( (pPage && !IsInterrupt()) || m_nCheckPageNum != USHRT_MAX )
{ {
// nCheckPageNum is set to USHRT_MAX in this code path after we have if ( !pPage && m_nCheckPageNum != USHRT_MAX &&
// checked the SwPageDescs and set tos the minimal changed SwPageDesc. (!pPage || pPage->GetPhyPageNum() >= m_nCheckPageNum) )
// We don't need to check the SwPageDescs without changes.
if ( (m_nCheckPageNum != USHRT_MAX) && (!pPage || pPage->GetPhyPageNum() >= m_nCheckPageNum) )
{ {
if ( !pPage || pPage->GetPhyPageNum() > m_nCheckPageNum ) if ( !pPage || pPage->GetPhyPageNum() > m_nCheckPageNum )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment