diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2016-05-18 14:29:01 +0200 |
|---|---|---|
| committer | Oliver Specht <oliver.specht@cib.de> | 2016-05-19 07:08:33 +0000 |
| commit | 7b24f21a46d8f9321434e40e6f9821df0ed2e2d3 (patch) | |
| tree | 38e44c93b0805a234ce8a71ae1c152b64117791c /sw/inc/dbmgr.hxx | |
| parent | 5cf5dc32202e2b785f5a7979a16da3b2a35dee5f (diff) | |
tdf#98985 create merge results at the right time
When using mail merge toolbar the resulting documents are now created
on OK in Save/Print and Send dialogs.
Additionally the 'To' is set in the save dialog and the
MailMergeConfigItem ist not deleted twice anymore.
Change-Id: I21f1f49d8bbd40c11b6f771e15b89e0f6c4bc87a
Reviewed-on: https://gerrit.libreoffice.org/25104
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'sw/inc/dbmgr.hxx')
| -rw-r--r-- | sw/inc/dbmgr.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index c916542ca462..8acdc55009c8 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -296,6 +296,8 @@ public: inline bool IsMergeCancel() { return MergeStatus::CANCEL <= m_aMergeStatus; }; inline bool IsMergeError() { return MergeStatus::ERROR <= m_aMergeStatus; }; + static SwMailMergeConfigItem* PerformMailMerge(SwView* pView); + /// Initialize data fields that lack name of database. inline bool IsInitDBFields() const { return bInitDBFields; } inline void SetInitDBFields(bool b) { bInitDBFields = b; } |