diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-04-29 17:40:45 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-04-30 15:29:52 +0200 |
| commit | 5879351aeb1935e2bf86fda59703f7d49fdeb6ed (patch) | |
| tree | 404becd13db131420d6db2ca3bbe37cef8ce08e7 /sw/source/uibase/uno | |
| parent | tdf#122607 sw: fix preservation of text frame cache entries (diff) | |
| download | core-5879351aeb1935e2bf86fda59703f7d49fdeb6ed.tar.gz core-5879351aeb1935e2bf86fda59703f7d49fdeb6ed.zip | |
tdf#122607 sw: restore CalcLayout() call in getRendererCount()
Effectively revert commit 1ecca673b40fedc53db125e332b087d1c120a254.
There are some documents that aren't formatted correctly.
Change-Id: I4b0cf6313c249a0ed916c2630cd5194d809bfb48
Diffstat (limited to 'sw/source/uibase/uno')
| -rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 4a5dcee452aa..5b95045842a3 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -2614,9 +2614,10 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( // should be set for printing as well ... pViewShell->SetPDFExportOption( true ); - // tdf#122607 Re-layout the doc. Calling CalcLayout here is not enough, as it depends - // on the currently visible area which is 0 when doing headless conversion. - pViewShell->Reformat(); + // there is some redundancy between those two function calls, but right now + // there is no time to sort this out. + //TODO: check what exactly needs to be done and make just one function for that + pViewShell->CalcLayout(); pViewShell->CalcPagesForPrint( pViewShell->GetPageCount() ); |