mailmerge: Create toolbar buttons for the Save/Print/Email dialogs.

Change-Id: Ia983a313a02b470a23244b2844ff01b12593f723

6 files changed, 37 insertions, 18 deletions

diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index 967480626d8a..2ab51277da26 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -24,7 +24,6 @@
 #include <mmpreparemergepage.hxx>
 #include <mmmergepage.hxx>
 #include <mmgreetingspage.hxx>
-#include <mmoutputpage.hxx>
 #include <mmlayoutpage.hxx>
 #include <mmconfigitem.hxx>
 #include <swabstdlg.hxx>
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index a3c8526751a7..0bdcc0084d56 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -24,6 +24,20 @@
 #include <dbui.hrc>
 #include <swtypes.hxx>
 
+#include <rtl/ref.hxx>
+#include <com/sun/star/mail/XSmtpService.hpp>
+#include <vcl/svapp.hxx>
+#include <vcl/idle.hxx>
+
+#include <helpid.h>
+#include <cmdid.h>
+#include <swunohelper.hxx>
+#include <mmresultdialogs.hxx>
+#include <maildispatcher.hxx>
+#include <imaildsplistener.hxx>
+
+using namespace ::com::sun::star;
+
 SwMailMergeOutputTypePage::SwMailMergeOutputTypePage(SwMailMergeWizard* pParent)
     : svt::OWizardPage(pParent, "MMOutputTypePage",
         "modules/swriter/ui/mmoutputtypepage.ui")
@@ -73,21 +87,6 @@ IMPL_LINK_NOARG_TYPED(SwMailMergeOutputTypePage, TypeHdl_Impl, Button*, void)
     m_pWizard->UpdateRoadmap();
 }
 
-
-#include <rtl/ref.hxx>
-#include <com/sun/star/mail/XSmtpService.hpp>
-#include <vcl/svapp.hxx>
-#include <vcl/idle.hxx>
-
-#include <helpid.h>
-#include <cmdid.h>
-#include <swunohelper.hxx>
-#include <mmoutputpage.hxx>
-#include <maildispatcher.hxx>
-#include <imaildsplistener.hxx>
-
-using namespace ::com::sun::star;
-
 struct SwSendMailDialog_Impl
 {
     friend class SwSendMailDialog;
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index e385d59e6991..07c9523a6d87 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <mmoutputpage.hxx>
+#include <mmresultdialogs.hxx>
 #include <mailmergewizard.hxx>
 #include <mmconfigitem.hxx>
 #include <mailmergechildwindow.hxx>
@@ -53,7 +53,6 @@
 
 #include <unotools/tempfile.hxx>
 #include <osl/file.hxx>
-#include <mmgreetingspage.hxx>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdb/XColumn.hpp>
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 4312e94421f5..6b31000a6dd9 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -91,6 +91,7 @@
 #include <mailmergewizard.hxx>
 #include <mailconfigpage.hxx>
 #include <uiborder.hxx>
+#include <mmresultdialogs.hxx>
 
 using namespace ::com::sun::star;
 
@@ -1190,4 +1191,22 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI
     return pRet;
 }
 
+void SwAbstractDialogFactory_Impl::ExecuteMMResultSaveDialog()
+{
+    ScopedVclPtrInstance<SwMMResultSaveDialog> pDialog;
+    pDialog->Execute();
+}
+
+void SwAbstractDialogFactory_Impl::ExecuteMMResultPrintDialog()
+{
+    ScopedVclPtrInstance<SwMMResultPrintDialog> pDialog;
+    pDialog->Execute();
+}
+
+void SwAbstractDialogFactory_Impl::ExecuteMMResultEmailDialog()
+{
+    ScopedVclPtrInstance<SwMMResultEmailDialog> pDialog;
+    pDialog->Execute();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 7005058c6bea..f760ebbea31b 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -496,6 +496,9 @@ public:
     // For TabPage
     virtual CreateTabPage               GetTabPageCreatorFunc( sal_uInt16 nId ) override;
 
+    virtual void ExecuteMMResultSaveDialog();
+    virtual void ExecuteMMResultPrintDialog();
+    virtual void ExecuteMMResultEmailDialog();
 };
 
 #endif
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index 521bc4d66da1..521bc4d66da1 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx