mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: tdf#103313 idles never get to complete postit shell formatting

Browse Source 
Change-Id: Ic01628bca8c306c48277ffbc84d334d1922a248b
Reviewed-on: https://gerrit.libreoffice.org/30864
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Caolán McNamara
2016-11-15 10:22:59 +00:00
committed by Michael Stahl
parent 48aa8dfa60
commit 3690218b1f
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sw/source/core/doc/doc.cxx
View File

@@ -833,6 +833,12 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
// format post-it doc to get correct number of pages // format post-it doc to get correct number of pages
rData.m_pPostItShell->CalcLayout(); 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(); const sal_Int32 nPostItDocPageCount = rData.m_pPostItShell->GetPageCount();
if (nPostItMode == SwPostItMode::Only || nPostItMode == SwPostItMode::EndDoc) 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 // now we just need to add the post-it pages to be printed to the
// end of the vector of pages to print // end of the vector of pages to print
sal_Int32 nPageNum = 0; 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 ) while( pPageFrame && nPageNum < nPostItDocPageCount )
{ {
++nPageNum; ++nPageNum;