diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-09-20 20:29:36 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-09-26 09:54:18 +0200 |
commit | a37e559ed123789f6bc8f7972242d6461ce692ab (patch) | |
tree | 7c6304b4541335b2bb706efda58b882132fe3819 /sw/source/ui/config/mailconfigpage.cxx | |
parent | b3f249c1351642be6f2774230ff80a6d20bd1401 (diff) |
disinherit OWizardPage and SfxTabPage from vcl TabPage
Now that there's no need to support weld/unwelded mixes of
pages in dialog any more.
inherit from a BuilderPage which contains a Builder and
Toplevel container
BuilderPage Activate and Deactivate replace TabPage ActivatePage and
DeactivatePage, allowing disambiguation wrt SfxTabPage ActivatePage and
DeactivatePage.
Change-Id: I5706e50fd92f712a25328ee9791e054bb9ad9812
Reviewed-on: https://gerrit.libreoffice.org/79317
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui/config/mailconfigpage.cxx')
-rw-r--r-- | sw/source/ui/config/mailconfigpage.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index a4c8a1f3a7a8..eff36f3e1f54 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -47,7 +47,7 @@ class SwTestAccountSettingsDialog : public SfxDialogController OUString m_sErrorServer; bool m_bStop; - VclPtr<SwMailConfigPage> m_pParent; + SwMailConfigPage* m_pParent; std::unique_ptr<weld::Button> m_xStopPB; std::unique_ptr<weld::TextView> m_xErrorsED; @@ -125,18 +125,12 @@ SwMailConfigPage::SwMailConfigPage(TabPageParent pParent, const SfxItemSet& rSet SwMailConfigPage::~SwMailConfigPage() { - disposeOnce(); -} - -void SwMailConfigPage::dispose() -{ m_pConfigItem.reset(); - SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SwMailConfigPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet) +std::unique_ptr<SfxTabPage> SwMailConfigPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr<SwMailConfigPage>::Create(pParent, *rAttrSet); + return std::make_unique<SwMailConfigPage>(pParent, *rAttrSet); } bool SwMailConfigPage::FillItemSet( SfxItemSet* /*rSet*/ ) |