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 /chart2/source/controller/dialogs/tp_AxisPositions.hxx | |
| parent | tdf#127673 lok: On double-click, don't enter the embedded objects in Writer. (diff) | |
| download | core-a37e559ed123789f6bc8f7972242d6461ce692ab.tar.gz core-a37e559ed123789f6bc8f7972242d6461ce692ab.zip | |
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 'chart2/source/controller/dialogs/tp_AxisPositions.hxx')
| -rw-r--r-- | chart2/source/controller/dialogs/tp_AxisPositions.hxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index 1b4f2e0b816d..3e20edcb6e67 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -30,10 +30,9 @@ public: AxisPositionsTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); virtual ~AxisPositionsTabPage() override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs ); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override; virtual void Reset( const SfxItemSet* rInAttrs ) override; - using TabPage::DeactivatePage; virtual DeactivateRC DeactivatePage( SfxItemSet* pItemSet ) override; void SetNumFormatter( SvNumberFormatter* pFormatter ); |