From 3690218b1f5073db8407a58f1b45a97d3d6fe7cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 15 Nov 2016 10:22:59 +0000 Subject: [PATCH] Resolves: tdf#103313 idles never get to complete postit shell formatting Change-Id: Ic01628bca8c306c48277ffbc84d334d1922a248b Reviewed-on: https://gerrit.libreoffice.org/30864 Tested-by: Jenkins Reviewed-by: Michael Stahl --- sw/source/core/doc/doc.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 1a5bfb1cf3cd..fa00bff3350f 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -833,6 +833,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) @@ -849,7 +855,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(rData.m_pPostItShell->GetLayout()->Lower()); + const SwPageFrame * pPageFrame = static_cast(pPostItRoot->Lower()); while( pPageFrame && nPageNum < nPostItDocPageCount ) { ++nPageNum;