summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-11-15 10:22:59 +0000
committerMichael Stahl <mstahl@redhat.com>2016-12-01 16:55:36 +0000
commitceab440bf2bb4d414e5bac65c385167901d5a983 (patch)
tree957dfb69d1de17e20044db52605150ac08cb5abc
parent5a20ff53d908b90e7c805316c61b00149dab9f58 (diff)
Resolves: tdf#103313 idles never get to complete postit shell formatting
Change-Id: Ic01628bca8c306c48277ffbc84d334d1922a248b Reviewed-on: https://gerrit.libreoffice.org/30864 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 3690218b1f5073db8407a58f1b45a97d3d6fe7cd) Reviewed-on: https://gerrit.libreoffice.org/31446
-rw-r--r--sw/source/core/doc/doc.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index e3ae223b6b84..36b77722035f 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -840,6 +840,12 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
// format post-it doc to get correct number of pages
rData.m_pPostItShell->CalcLayout();
+
+ SwRootFrame* pPostItRoot = rData.m_pPostItShell->GetLayout();
+ //tdf#103313 print dialog maxes out cpu as Idles never get to
+ //complete this postitshell's desire to complete formatting
+ pPostItRoot->ResetIdleFormat();
+
const sal_Int32 nPostItDocPageCount = rData.m_pPostItShell->GetPageCount();
if (nPostItMode == SwPostItMode::Only || nPostItMode == SwPostItMode::EndDoc)
@@ -856,7 +862,7 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
// now we just need to add the post-it pages to be printed to the
// end of the vector of pages to print
sal_Int32 nPageNum = 0;
- const SwPageFrame * pPageFrame = static_cast<SwPageFrame*>(rData.m_pPostItShell->GetLayout()->Lower());
+ const SwPageFrame * pPageFrame = static_cast<SwPageFrame*>(pPostItRoot->Lower());
while( pPageFrame && nPageNum < nPostItDocPageCount )
{
++nPageNum;