Kaydet (Commit) d2b6f15d authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: tdf#122889 Mail config dialog is empty

revert...

commit 7ec12ce7
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/66784Reviewed-by: 's avatarXisco Faulí <xiscofauli@libreoffice.org>
Tested-by: 's avatarXisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst fe07e2b6
...@@ -373,12 +373,11 @@ void SwTestAccountSettingsDialog::Test() ...@@ -373,12 +373,11 @@ void SwTestAccountSettingsDialog::Test()
} }
} }
SwMailConfigDlg::SwMailConfigDlg(weld::Window* pParent, SfxItemSet& rSet) SwMailConfigDlg::SwMailConfigDlg(vcl::Window* pParent, SfxItemSet& rSet)
: SfxSingleTabDialogController(pParent, rSet) : SfxSingleTabDialog(pParent, rSet)
{ {
TabPageParent pPageParent(get_content_area(), this);
// create TabPage // create TabPage
SetTabPage(SwMailConfigPage::Create(pPageParent, &rSet)); SetTabPage(SwMailConfigPage::Create(get_content_area(), &rSet));
} }
SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog( SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(
......
...@@ -850,8 +850,8 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog, SendDocumentsHdl_Impl, weld::Button&, voi ...@@ -850,8 +850,8 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog, SendDocumentsHdl_Impl, weld::Button&, voi
{ {
SwView* pConfigView = pTargetView ? pTargetView : pView; SwView* pConfigView = pTargetView ? pTargetView : pView;
SfxAllItemSet aSet(pConfigView->GetPool()); SfxAllItemSet aSet(pConfigView->GetPool());
SwMailConfigDlg aDlg(m_xDialog.get(), aSet); ScopedVclPtrInstance<SwMailConfigDlg> pDlg(nullptr, aSet);
nRet = aDlg.run(); nRet = pDlg->Execute();
} }
if(nRet != RET_OK && nRet != RET_YES) if(nRet != RET_OK && nRet != RET_YES)
......
...@@ -68,10 +68,10 @@ public: ...@@ -68,10 +68,10 @@ public:
}; };
class SwMailConfigDlg : public SfxSingleTabDialogController class SwMailConfigDlg : public SfxSingleTabDialog
{ {
public: public:
SwMailConfigDlg(weld::Window* pParent, SfxItemSet& rSet); SwMailConfigDlg(vcl::Window* pParent, SfxItemSet& rSet);
}; };
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment