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 /sc/source/ui/inc/tpsort.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 'sc/source/ui/inc/tpsort.hxx')
| -rw-r--r-- | sc/source/ui/inc/tpsort.hxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 755b9f8bb529..655ff11747aa 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -43,17 +43,14 @@ class ScTabPageSortFields : public SfxTabPage { public: ScTabPageSortFields(TabPageParent pParent, const SfxItemSet& rArgSet); - virtual void dispose() override; + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rArgSet); virtual ~ScTabPageSortFields() override; - static VclPtr<SfxTabPage> Create ( TabPageParent pParent, - const SfxItemSet* rArgSet ); + virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override; protected: virtual void ActivatePage ( const SfxItemSet& rSet ) override; - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override; private: @@ -98,15 +95,13 @@ class ScTabPageSortOptions : public SfxTabPage { public: ScTabPageSortOptions(TabPageParent pParent, const SfxItemSet& rArgSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* pArgSet); - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* pArgSet); virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override; protected: virtual void ActivatePage ( const SfxItemSet& rSet ) override; - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override; private: |