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/source/ui/dialog/swdlgfact.cxx | |
| 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/source/ui/dialog/swdlgfact.cxx')
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index b62e4223ccda..3b79a38c69dd 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -497,9 +497,9 @@ uno::Reference< sdbc::XResultSet> AbstractMailMergeDlg_Impl::GetResultSet() cons return pDlg->GetResultSet(); } -bool AbstractMailMergeDlg_Impl::IsSaveIndividualDocs() const +bool AbstractMailMergeDlg_Impl::IsSaveSingleDoc() const { - return pDlg->IsSaveIndividualDocs(); + return pDlg->IsSaveSingleDoc(); } bool AbstractMailMergeDlg_Impl::IsGenerateFromDataBase() const |