diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-08-10 11:23:23 +0200 |
---|---|---|
committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-08-29 13:13:16 +0200 |
commit | adf4c82b6c4ec9d8892f5c417e4a81cf04808447 (patch) | |
tree | 6119262e1a154bcf5ddc7277a1767b3abbbe94d3 | |
parent | 0b5352f67e9c684e59c4f8653ed7fcdd9ae5aa05 (diff) |
Flush the page break for correct layouting
This is a workaround to create correct SwPageFrm objects for
layouting, so the page break is actually visible when
copying nodes, so we create the correct SwPageFrm.
This is especially problematic for mail merge after the fix in
commit 60d34e1c840d2c317bb7d0a5b14f4602c22b3fcc, which -
correctly - checks all later SwPageDesc for every fix done by
CheckPageDescs().
Change-Id: Ie6ea2e9a0587199be4dbaf3ed63a94c29b318ce2
-rw-r--r-- | sw/source/core/doc/docnew.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 3e162fdfb6dd..07ac968c241c 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -1066,6 +1066,13 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu for (sw::mark::IMark* pMark : aSeenMarks) pMarkAccess->repositionMark(pMark, aPaM); } + + // Flush the page break, if we want to keep it + if ( !bDeletePrevious ) + { + pTargetShell->EndAllAction(); + pTargetShell->StartAllAction(); + } } } #ifdef DBG_UTIL |