summaryrefslogtreecommitdiff
path: root/cui/source/options/fontsubs.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 /cui/source/options/fontsubs.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 'cui/source/options/fontsubs.hxx')
-rw-r--r--cui/source/options/fontsubs.hxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 4f33ab24525e..a250a80c8bfa 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -49,11 +49,10 @@ class SvxFontSubstTabPage : public SfxTabPage
void CheckEnable();
void setColSizes();
- virtual ~SvxFontSubstTabPage() override;
-
public:
SvxFontSubstTabPage(TabPageParent pParent, const SfxItemSet& rSet);
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
+ virtual ~SvxFontSubstTabPage() override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
};