diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-11-15 10:22:59 +0000 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2016-12-08 15:33:43 +0000 |
commit | 509603e3763d064ec7951e7aa7978462ab6be458 (patch) | |
tree | 7091075b8c1cfcbef4e4f95a2d90c0b4a1ab16bc /sw | |
parent | 4494af6d4cb777d55470ef80089004b55e476e7f (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/31757
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/doc/doc.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 7850ffa4b905..6a7098077aa1 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?" ); |