diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-01-23 10:25:04 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-01-23 13:54:35 +0100 |
| commit | d5344e45ab0b7f096efd6e86ecdecd96cfa68fa5 (patch) | |
| tree | 6af9ce70853c684244c54691139049f659124eb3 | |
| parent | e1e78e53d3065d440a1af52733074496aada9329 (diff) | |
Resolves: tdf#122889 Mail config dialog is empty
revert...
commit 7ec12ce7e449d7849b3e67c443783110e2a50a17
Author: Caolán McNamara <caolanm@redhat.com>
Date: Fri Sep 28 20:24:35 2018 +0100
weld SwMailConfigDlg
the contained page needs to be converted first
Change-Id: I9788132b0ad11cec853be7339be1829386794511
Reviewed-on: https://gerrit.libreoffice.org/66785
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/ui/config/mailconfigpage.cxx | 7 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmresultdialogs.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/inc/mailconfigpage.hxx | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index caf1759c83bb..3d3090c61002 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -373,12 +373,11 @@ void SwTestAccountSettingsDialog::Test() } } -SwMailConfigDlg::SwMailConfigDlg(weld::Window* pParent, SfxItemSet& rSet) - : SfxSingleTabDialogController(pParent, rSet) +SwMailConfigDlg::SwMailConfigDlg(vcl::Window* pParent, SfxItemSet& rSet) + : SfxSingleTabDialog(pParent, rSet) { - TabPageParent pPageParent(get_content_area(), this); // create TabPage - SetTabPage(SwMailConfigPage::Create(pPageParent, &rSet)); + SetTabPage(SwMailConfigPage::Create(get_content_area(), &rSet)); } SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog( diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index dfde81645aa8..a103d4001023 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -850,8 +850,8 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog, SendDocumentsHdl_Impl, weld::Button&, voi { SwView* pConfigView = pTargetView ? pTargetView : pView; SfxAllItemSet aSet(pConfigView->GetPool()); - SwMailConfigDlg aDlg(m_xDialog.get(), aSet); - nRet = aDlg.run(); + ScopedVclPtrInstance<SwMailConfigDlg> pDlg(nullptr, aSet); + nRet = pDlg->Execute(); } if(nRet != RET_OK && nRet != RET_YES) diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index 0108662a5bcb..697bebb26827 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -68,10 +68,10 @@ public: }; -class SwMailConfigDlg : public SfxSingleTabDialogController +class SwMailConfigDlg : public SfxSingleTabDialog { public: - SwMailConfigDlg(weld::Window* pParent, SfxItemSet& rSet); + SwMailConfigDlg(vcl::Window* pParent, SfxItemSet& rSet); }; #endif |