summaryrefslogtreecommitdiff
path: root/sw/source/ui/envelp/envprt.hxx
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/envelp/envprt.hxx
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/envelp/envprt.hxx')
-rw-r--r--sw/source/ui/envelp/envprt.hxx10
1 files changed, 1 insertions, 9 deletions
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index 6e5e7d9ea8c6..e86c0df1a582 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -53,19 +53,11 @@ class SwEnvPrtPage : public SfxTabPage
SwEnvDlg* GetParentSwEnvDlg() {return static_cast<SwEnvDlg*>(GetDialogController()); }
- using TabPage::ActivatePage;
- using TabPage::DeactivatePage;
-
public:
SwEnvPrtPage(TabPageParent pParent, const SfxItemSet& rSet);
- virtual void dispose() override
- {
- m_xPrt.clear();
- SfxTabPage::dispose();
- }
virtual ~SwEnvPrtPage() override;
- static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;