diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-09-15 00:13:06 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-10-01 10:32:42 +0200 |
| commit | 9835bb562cfe3a5d386c24d86176ba7bb5ab26d2 (patch) | |
| tree | 4f799aae7b90d8b23e487765d67243b00a205131 /sw/inc/dbmgr.hxx | |
| parent | 0a5cd87e591d7f87bfab92716079af719259f143 (diff) | |
MM: export the SwDocShell mail merge via UNO
This saves the loading time for large document. Use it if you
want to present the generated document to the user or write a
mail merge unit tests.
This includes:
* renaming "only" to "shell" at multiple occurences
* dropping the DBMGR_MERGE_SINGLE_FILE special type for the mail
merge wizard in favour of an additional SwMergeDescriptor
boolean
* cleanup and renaming of the internal merge type enums, so these
actually match the diffferent merge targets: printer, email,
file and shell
Change-Id: I33c6773972195193687ba9c3e12b562310d330c1
Diffstat (limited to 'sw/inc/dbmgr.hxx')
| -rw-r--r-- | sw/inc/dbmgr.hxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 61eb74027c6e..797e64ce7832 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -77,11 +77,10 @@ class SwCalc; 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 merge as files. - DBMGR_MERGE_SINGLE_FILE, ///< Save merge as single file. - DBMGR_MERGE_ONLY ///< Create merge doc w/o save/print. + DBMGR_MERGE_PRINTER, ///< Print mail merge. + DBMGR_MERGE_EMAIL, ///< Send mail merge as email. + DBMGR_MERGE_FILE, ///< Save mail merge as files. + DBMGR_MERGE_SHELL ///< Create merge doc and keep the doc shell. }; // Administration of (new) logical databases. @@ -154,6 +153,7 @@ struct SwMergeDescriptor bool bPrintAsync; bool bCreateSingleFile; + bool bSubjectIsFilename; SwMailMergeConfigItem* pMailMergeConfigItem; @@ -167,6 +167,7 @@ struct SwMergeDescriptor bSendAsAttachment( false ), bPrintAsync( false ), bCreateSingleFile( false ), + bSubjectIsFilename( false ), pMailMergeConfigItem(0) {} @@ -277,7 +278,7 @@ public: /// check if a data source is open bool IsDataSourceOpen(const OUString& rDataSource, - const OUString& rTableOrQuery, bool bMergeOnly); + const OUString& rTableOrQuery, bool bMergeShell); /// open the source while fields are updated - for the calculator only! bool OpenDataSource(const OUString& rDataSource, const OUString& rTableOrQuery, |