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

1 files changed, 3 insertions, 3 deletions

diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx
index 143e06b08cef..f3d67eeb831f 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/sw/source/uibase/inc/mailmrge.hxx
@@ -115,8 +115,8 @@ class SwMailMergeDlg : public SvxStandardDialog
     bool            ExecQryShell();
 
 public:
-     SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rSh,
-         const OUString& rSourceName,
+    SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rSh,
+        const OUString& rSourceName,
         const OUString& rTblName,
         sal_Int32 nCommandType,
         const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
@@ -125,7 +125,7 @@ public:
 
     inline DBManagerOptions GetMergeType() { return nMergeType; }
 
-    bool IsSaveIndividualDocs() const { return m_pSaveIndividualRB->IsChecked(); }
+    bool IsSaveSingleDoc() const { return m_pSaveSingleDocRB->IsChecked(); }
     bool IsGenerateFromDataBase() const { return m_pGenerateFromDataBaseCB->IsChecked(); }
     OUString GetColumnName() const { return m_pColumnLB->GetSelectEntry();}
     OUString GetPath() const { return m_pPathED->GetText();}