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/source/ui/dbui/mmoutputpage.hxx | |
| parent | drop XPersistObject support from SvNumberFormatsSupplierService (diff) | |
| download | core-a305a2c91420652db450b7f8edd140e1d69f42cf.tar.gz core-a305a2c91420652db450b7f8edd140e1d69f42cf.zip | |
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/source/ui/dbui/mmoutputpage.hxx')
| -rw-r--r-- | sw/source/ui/dbui/mmoutputpage.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index 735501688d3e..a31ddeaa3564 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -116,6 +116,10 @@ class SwMailMergeOutputPage : public svt::OWizardPage DECL_LINK(SendDocumentsHdl_Impl, PushButton*); DECL_LINK(DocumentSelectionHdl_Impl, RadioButton*); DECL_LINK(SaveCancelHdl_Impl, void *); + + int documentStartPageNumber( int document ) const; + int documentEndPageNumber( int document ) const; + protected: virtual bool canAdvance() const SAL_OVERRIDE; virtual void ActivatePage() SAL_OVERRIDE; |