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 /sd/source/ui/inc/tpaction.hxx | |
| 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 'sd/source/ui/inc/tpaction.hxx')
| -rw-r--r-- | sd/source/ui/inc/tpaction.hxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index bd862e2135c4..fec2110a8008 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -90,7 +90,7 @@ public: SdTPAction(TabPageParent pParent, const SfxItemSet& rInAttrs); virtual ~SdTPAction() override; - static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet& ); + static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; @@ -101,9 +101,6 @@ public: void Construct(); void SetView( const ::sd::View* pSdView ); - - using TabPage::ActivatePage; - using TabPage::DeactivatePage; }; #endif // INCLUDED_SD_SOURCE_UI_INC_TPACTION_HXX |