diff options
| author | Eilidh McAdam <eilidh.mcadam@gmail.com> | 2014-07-25 20:35:43 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2014-09-16 08:37:43 +0000 |
| commit | 636718c960a36bc28d37a69ac102dd6cb696bfba (patch) | |
| tree | 33637a0c465cff7175c4486ed3e83bda98dee8e3 /sw/inc/dbmgr.hxx | |
| parent | 4851cde7b98226b0f82ae2b191c290173e9b06c6 (diff) | |
Make UNO and wizard mail merge use same function.
Instead of MergeDocuments and MergeMailFiles duplicating largely the
same functionality, the only user of MergeDocuments (MM wizard) now
uses MergeMailFiles.
Change-Id: Ifad183bdeabf5ca1eb08b4b1df557404a54a9fdd
Reviewed-on: https://gerrit.libreoffice.org/10981
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'sw/inc/dbmgr.hxx')
| -rw-r--r-- | sw/inc/dbmgr.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 29fa03b8b2fe..18105cff4411 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -79,8 +79,9 @@ enum DBManagerOptions DBMGR_MERGE, ///< Data records in fields. DBMGR_MERGE_MAILMERGE, ///< Print mail merge. DBMGR_MERGE_MAILING, ///< Send mail merge as email. - DBMGR_MERGE_MAILFILES, ///< Save mail merg as files. - DBMGR_MERGE_SINGLE_FILE ///< Save merge as single file. + DBMGR_MERGE_MAILFILES, ///< Save mail merge as files. + DBMGR_MERGE_SINGLE_FILE, ///< Save merge as single file. + DBMGR_MERGE_ONLY ///< Create merge doc w/o save/print. }; // Administration of (new) logical databases. |