diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2014-10-20 15:13:03 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2014-11-06 16:54:48 +0100 |
| commit | a305a2c91420652db450b7f8edd140e1d69f42cf (patch) | |
| tree | 8b8868697334854ca7ce4298592950c8cad4ab18 /sw/inc | |
| parent | 177fa1197655dea6195ccdc421b0054b7201a716 (diff) | |
use bookmarks to mark mailmerge parts in a mailmerge document (fdo#80823)
Instead of page numbers, which
- was somewhat fragile (and broken, as it was actually off-by-one)
- required repeated re-layout of the increasingly large document, making
mailmerge awfully slow. The re-layout is not removed by this commit, as
it needs further checking whether it can be removed.
See the bugreport for details.
Change-Id: Ib09bd5f5a6a549c3d38ca40b0f32c0d2831fdd4c
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/doc.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index eb1a240b62f7..8a382e1b19d0 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1659,7 +1659,7 @@ public: ::sw::UndoManager const& GetUndoManager() const; SfxObjectShell* CreateCopy(bool bCallInitNew) const; - void AppendDoc(const SwDoc& rSource, sal_uInt16 nStartPageNumber, + SwNodeIndex AppendDoc(const SwDoc& rSource, sal_uInt16 nStartPageNumber, SwPageDesc* pTargetPageDesc, bool bDeletePrevious = false ); /** |