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 /sfx2/source/inc | |
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 'sfx2/source/inc')
-rw-r--r-- | sfx2/source/inc/documentfontsdialog.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sfx2/source/inc/documentfontsdialog.hxx b/sfx2/source/inc/documentfontsdialog.hxx index 32ca1b5160fe..c9de2b74f285 100644 --- a/sfx2/source/inc/documentfontsdialog.hxx +++ b/sfx2/source/inc/documentfontsdialog.hxx @@ -29,7 +29,7 @@ class SfxDocumentFontsPage: public SfxTabPage public: SfxDocumentFontsPage(TabPageParent parent, const SfxItemSet& set); virtual ~SfxDocumentFontsPage() override; - static VclPtr<SfxTabPage> Create(TabPageParent parent, const SfxItemSet* set); + static std::unique_ptr<SfxTabPage> Create(TabPageParent parent, const SfxItemSet* set); protected: virtual bool FillItemSet( SfxItemSet* set ) override; virtual void Reset( const SfxItemSet* set ) override; |