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/fldui/flddok.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/fldui/flddok.cxx')
| -rw-r--r-- | sw/source/ui/fldui/flddok.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 6d6b9ff7e98c..d1d04e96457b 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -74,7 +74,6 @@ SwFieldDokPage::SwFieldDokPage(TabPageParent pParent, const SfxItemSet *const pC SwFieldDokPage::~SwFieldDokPage() { - disposeOnce(); } void SwFieldDokPage::Reset(const SfxItemSet* ) @@ -609,10 +608,10 @@ bool SwFieldDokPage::FillItemSet(SfxItemSet* ) return false; } -VclPtr<SfxTabPage> SwFieldDokPage::Create(TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwFieldDokPage::Create(TabPageParent pParent, const SfxItemSet *const pAttrSet) { - return VclPtr<SwFieldDokPage>::Create(pParent, pAttrSet); + return std::make_unique<SwFieldDokPage>(pParent, pAttrSet); } sal_uInt16 SwFieldDokPage::GetGroup() |