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 /starmath/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 'starmath/inc')
| -rw-r--r-- | starmath/inc/dialog.hxx | 2 | ||||
| -rw-r--r-- | starmath/inc/smmod.hxx | 2 | ||||
| -rw-r--r-- | starmath/inc/view.hxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 713ecb5ae8e5..0c6c6a91f271 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -57,7 +57,7 @@ class SmPrintOptionsTabPage : public SfxTabPage virtual void Reset(const SfxItemSet* rSet) override; public: - static VclPtr<SfxTabPage> Create(TabPageParent pWindow, const SfxItemSet &rSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pWindow, const SfxItemSet &rSet); SmPrintOptionsTabPage(TabPageParent pPage, const SfxItemSet &rOptions); virtual ~SmPrintOptionsTabPage() override; diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index 8c33f5a76baf..8e3759e575ea 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -97,7 +97,7 @@ public: //virtual methods for options dialog virtual std::unique_ptr<SfxItemSet> CreateItemSet( sal_uInt16 nId ) override; virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override; - virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) override; + virtual std::unique_ptr<SfxTabPage> CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) override; }; #define SM_MOD() ( static_cast<SmModule*>(SfxApplication::GetModule(SfxToolsModule::Math)) ) diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index fb27546c456f..62068e586824 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -249,8 +249,8 @@ protected: void InsertFrom(SfxMedium &rMedium); virtual bool HasPrintOptionsPage() const override; - virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent, - const SfxItemSet &rOptions) override; + virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent, + const SfxItemSet &rOptions) override; virtual void Deactivate(bool IsMDIActivate) override; virtual void Activate(bool IsMDIActivate) override; virtual void InnerResizePixel(const Point &rOfs, const Size &rSize, bool inplaceEditModeChange) override; |