1 files changed, 15 insertions, 18 deletions

diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index 18151a810f99..3af52dc4c5d1 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMOUTPUTPAGE_HXX
-#define INCLUDED_SW_SOURCE_UI_DBUI_MMOUTPUTPAGE_HXX
+
+#pragma once
 
 #include <vcl/weld.hxx>
 #include <vcl/print.hxx>
@@ -27,24 +27,25 @@
 class SwMailMergeWizard;
 class SfxPrinter;
 class SwSendMailDialog;
+class Timer;
 namespace com::sun::star::mail { class XMailMessage; }
 
 
 /// Dialog implementing the saving as of the result document.
-class SwMMResultSaveDialog : public SfxDialogController
+class SwMMResultSaveDialog final : public SfxDialogController
 {
     bool                   m_bCancelSaving;
 
     std::unique_ptr<weld::RadioButton> m_xSaveAsOneRB;
     std::unique_ptr<weld::RadioButton> m_xSaveIndividualRB;
-    std::unique_ptr<weld::RadioButton> m_xFromRB;
+    std::unique_ptr<weld::CheckButton> m_xFromRB;
     std::unique_ptr<weld::SpinButton> m_xFromNF;
     std::unique_ptr<weld::Label> m_xToFT;
     std::unique_ptr<weld::SpinButton> m_xToNF;
     std::unique_ptr<weld::Button> m_xOKButton;
 
     DECL_LINK(SaveOutputHdl_Impl, weld::Button& , void);
-    DECL_LINK(DocumentSelectionHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(DocumentSelectionHdl_Impl, weld::Toggleable&, void);
 
 public:
     SwMMResultSaveDialog(weld::Window* pParent);
@@ -52,11 +53,10 @@ public:
 };
 
 /// Dialog implementing the printing of the result document.
-class SwMMResultPrintDialog : public SfxDialogController
+class SwMMResultPrintDialog final : public SfxDialogController
 {
     VclPtr<Printer>        m_pTempPrinter;
 
-    std::unique_ptr<weld::Label>        m_xPrinterFT;
     std::unique_ptr<weld::ComboBox> m_xPrinterLB;
     std::unique_ptr<weld::Button>       m_xPrinterSettingsPB;
     std::unique_ptr<weld::RadioButton>  m_xPrintAllRB;
@@ -69,7 +69,7 @@ class SwMMResultPrintDialog : public SfxDialogController
     DECL_LINK(PrinterChangeHdl_Impl, weld::ComboBox&, void );
     DECL_LINK(PrintHdl_Impl, weld::Button&, void);
     DECL_LINK(PrinterSetupHdl_Impl, weld::Button&, void );
-    DECL_LINK(DocumentSelectionHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(DocumentSelectionHdl_Impl, weld::Toggleable&, void);
 
     void FillInPrinterSettings();
 
@@ -79,19 +79,16 @@ public:
 };
 
 /// Dialog implementing the sending as email of the result document.
-class SwMMResultEmailDialog : public SfxDialogController
+class SwMMResultEmailDialog final : public SfxDialogController
 {
     OUString        m_sConfigureMail;
     OUString        m_sCC;
     OUString        m_sBCC;
     OUString        m_sBody;
 
-    std::unique_ptr<weld::Label> m_xMailToFT;
     std::unique_ptr<weld::ComboBox> m_xMailToLB;
     std::unique_ptr<weld::Button> m_xCopyToPB;
-    std::unique_ptr<weld::Label> m_xSubjectFT;
     std::unique_ptr<weld::Entry> m_xSubjectED;
-    std::unique_ptr<weld::Label> m_xSendAsFT;
     std::unique_ptr<weld::ComboBox> m_xSendAsLB;
     std::unique_ptr<weld::Button> m_xSendAsPB;
     std::unique_ptr<weld::Widget> m_xAttachmentGroup;
@@ -110,8 +107,8 @@ class SwMMResultEmailDialog : public SfxDialogController
     DECL_LINK(SendTypeHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(SendAsHdl_Impl, weld::Button&, void);
     DECL_LINK(SendDocumentsHdl_Impl, weld::Button&, void);
-    DECL_LINK(DocumentSelectionHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(CheckHdl, weld::ToggleButton&, void );
+    DECL_LINK(DocumentSelectionHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(CheckHdl, weld::Toggleable&, void );
 
     void FillInEmailSettings();
 
@@ -135,15 +132,17 @@ struct SwMailDescriptor
 };
 struct SwSendMailDialog_Impl;
 class SwMailMergeConfigItem;
-class SwSendMailDialog : public weld::GenericDialogController
+class SwSendMailDialog final : public weld::GenericDialogController
 {
     OUString                m_sContinue;
     OUString                m_sStop;
+    OUString                m_sClose;
     OUString                m_sTransferStatus;
     OUString                m_sErrorStatus;
     OUString                m_sSendingTo;
     OUString                m_sCompleted;
     OUString                m_sFailed;
+    OUString                m_sAddressInvalid;
 
     bool                    m_bCancel;
     bool                    m_bDestructionEnabled;
@@ -151,7 +150,7 @@ class SwSendMailDialog : public weld::GenericDialogController
     std::unique_ptr<SwSendMailDialog_Impl> m_pImpl;
     SwMailMergeConfigItem*  m_pConfigItem;
     sal_Int32               m_nExpectedCount;
-    sal_Int32               m_nSendCount;
+    sal_Int32               m_nProcessedCount;
     sal_Int32               m_nErrorCount;
 
     std::unique_ptr<weld::Label> m_xTransferStatus;
@@ -161,7 +160,6 @@ class SwSendMailDialog : public weld::GenericDialogController
     std::unique_ptr<weld::TreeView> m_xStatus;
     std::unique_ptr<weld::Button> m_xStop;
     std::unique_ptr<weld::Button> m_xCancel;
-    std::unique_ptr<weld::Expander> m_xExpander;
 
     DECL_LINK( StopHdl_Impl, weld::Button&, void );
     DECL_LINK( CancelHdl_Impl, weld::Button& , void);
@@ -187,6 +185,5 @@ public:
     void                AllMailsSent();
 
 };
-#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */