From 636718c960a36bc28d37a69ac102dd6cb696bfba Mon Sep 17 00:00:00 2001 From: Eilidh McAdam Date: Fri, 25 Jul 2014 20:35:43 +0100 Subject: Make UNO and wizard mail merge use same function. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Björn Michaelsen --- sw/inc/dbmgr.hxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sw/inc/dbmgr.hxx') 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. -- cgit