diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2018-06-11 17:20:44 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-06-12 16:17:50 +0200 |
| commit | da482424a86f848155d1db14ef5b4a28af62f61d (patch) | |
| tree | b17487e49ffce708622721378287155347708c2a | |
| parent | tdf#62268: allow row height recalculation on document load (diff) | |
| download | core-da482424a86f848155d1db14ef5b4a28af62f61d.tar.gz core-da482424a86f848155d1db14ef5b4a28af62f61d.zip | |
tdf#118113 MM: Make sure page count is up to date
Since the page layout may have changed, e.g. due to
the visibility status of hidden sections having changed
in the call to 'pWorkShell->SwViewShell::UpdateFields()',
it's necessary to recalculate the layout to ensure that
the correct page count is retrieved when calling
'pWorkShell->CalcLayout()'.
This fixes a regression introduced by the performance
optimization done in commit
ae5afe9bcebdd220a457829d47882fe8a0cf69fd, while
still avoiding to have to do the expensive layout for the
target document.
Change-Id: I46f1b68758e4df330c17358a8e852e8b040a9520
Reviewed-on: https://gerrit.libreoffice.org/55636
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
(cherry picked from commit 89f896d2cfd84b711583f98a6343e9835a9aed11)
Reviewed-on: https://gerrit.libreoffice.org/55699
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 36a14daf5982..2f2e76a072c3 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1445,6 +1445,8 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, ++targetDocPageCount; // Docs always start on odd pages (so offset must be even). SwNodeIndex appendedDocStart = pTargetDoc->AppendDoc( *pWorkDoc, nStartingPageNo, !bWorkDocInitialized, targetDocPageCount, nDocNo); + // ensure layout is up to date in order to get correct page count + pWorkShell->CalcLayout(); targetDocPageCount += pWorkShell->GetPageCnt(); if ( (nMaxDumpDocs < 0) || (nDocNo <= nMaxDumpDocs) ) |