[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/source

[Caolán McNamara]

 sw/source/core/doc/doc.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 509603e3763d064ec7951e7aa7978462ab6be458
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 15 10:22:59 2016 +0000

    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 at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 3690218b1f5073db8407a58f1b45a97d3d6fe7cd)
    Reviewed-on: https://gerrit.libreoffice.org/31757

diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 7850ffa..6a70980 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -842,6 +842,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)
@@ -858,7 +864,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 )
             {
                 OSL_ENSURE( pPageFrame, "Empty page frame. How are we going to print this?" );