summaryrefslogtreecommitdiff
path: root/sw/source/ui/misc/num.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-09-20 20:29:36 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-09-26 09:54:18 +0200
commita37e559ed123789f6bc8f7972242d6461ce692ab (patch)
tree7c6304b4541335b2bb706efda58b882132fe3819 /sw/source/ui/misc/num.cxx
parentb3f249c1351642be6f2774230ff80a6d20bd1401 (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/misc/num.cxx')
-rw-r--r--sw/source/ui/misc/num.cxx10
1 files changed, 2 insertions, 8 deletions
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 20c74684f54b..a11e639f3797 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -136,14 +136,8 @@ SwNumPositionTabPage::SwNumPositionTabPage(TabPageParent pParent, const SfxItemS
SwNumPositionTabPage::~SwNumPositionTabPage()
{
- disposeOnce();
-}
-
-void SwNumPositionTabPage::dispose()
-{
pActNum.reset();
pOutlineDlg = nullptr;
- SfxTabPage::dispose();
}
void SwNumPositionTabPage::InitControls()
@@ -497,10 +491,10 @@ void SwNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode()
m_xIndentAtMF->set_visible( bLabelAlignmentPosAndSpaceModeActive );
}
-VclPtr<SfxTabPage> SwNumPositionTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwNumPositionTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
- return VclPtr<SwNumPositionTabPage>::Create(pParent, *rAttrSet);
+ return std::make_unique<SwNumPositionTabPage>(pParent, *rAttrSet);
}
void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh)