diff options
Diffstat (limited to 'sw/source/uibase/inc')
23 files changed, 49 insertions, 113 deletions
diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 5b20909e163d..58067ee3fe2a 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -62,8 +62,7 @@ public: SwCharURLPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SwCharURLPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 427c802abebd..8b339c8aa48e 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -37,7 +37,7 @@ class SwColumnPage; class SwColumnDlg : public SfxDialogController { SwWrtShell& m_rWrtShell; - VclPtr<SwColumnPage> m_pTabPage; + std::unique_ptr<SwColumnPage> m_xTabPage; std::unique_ptr<SfxItemSet> m_pPageSet; std::unique_ptr<SfxItemSet> m_pSectionSet; std::unique_ptr<SfxItemSet> m_pSelectionSet; @@ -158,9 +158,6 @@ class SwColumnPage : public SfxTabPage void ResetColWidth(); void SetLabels( sal_uInt16 nVis ); - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; - virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; @@ -173,9 +170,8 @@ class SwColumnPage : public SfxTabPage public: SwColumnPage(TabPageParent pParent, const SfxItemSet &rSet); virtual ~SwColumnPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } virtual bool FillItemSet(SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx index 7ffbccc933b3..86c4a018412b 100644 --- a/sw/source/uibase/inc/docstdlg.hxx +++ b/sw/source/uibase/inc/docstdlg.hxx @@ -29,7 +29,7 @@ public: SwDocStatPage(TabPageParent pParent, const SfxItemSet &rSet); virtual ~SwDocStatPage() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); private: virtual bool FillItemSet( SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index 454385a60ea4..140f43347056 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -38,7 +38,7 @@ class SwDropCapsPage; class SwDropCapsPict : public weld::CustomWidgetController { - VclPtr<SwDropCapsPage> mpPage; + SwDropCapsPage* mpPage; OUString maText; OUString maScriptText; Color maBackColor; @@ -144,16 +144,13 @@ friend class SwDropCapsPict; DECL_LINK(SelectHdl, weld::ComboBox&, void); DECL_LINK(WholeWordHdl, weld::ToggleButton&, void); - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; - static const sal_uInt16 aPageRg[]; public: SwDropCapsPage(TabPageParent pParent, const SfxItemSet &rSet); virtual ~SwDropCapsPage() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 04686afdf93f..d62fd85f7477 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -103,15 +103,12 @@ class SwEnvPage : public SfxTabPage SwEnvDlg* GetParentSwEnvDlg() { return m_pDialog; } - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; - public: SwEnvPage(TabPageParent pParent, const SfxItemSet& rSet); void Init(SwEnvDlg* pDialog); virtual ~SwEnvPage() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; diff --git a/sw/source/uibase/inc/fldedt.hxx b/sw/source/uibase/inc/fldedt.hxx index c10cda5b0032..9f512ea3f7b8 100644 --- a/sw/source/uibase/inc/fldedt.hxx +++ b/sw/source/uibase/inc/fldedt.hxx @@ -38,7 +38,7 @@ class SwFieldEditDlg : public SfxSingleTabDialogController DECL_LINK(NextPrevHdl, weld::Button&, void); void Init(); - VclPtr<SfxTabPage> CreatePage(sal_uInt16 nGroup); + SfxTabPage* CreatePage(sal_uInt16 nGroup); void EnsureSelection(SwField *pCurField, SwFieldMgr &rMgr); public: diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 8e89292dd9c2..34c76fa25500 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -173,16 +173,13 @@ class SwFramePage: public SfxTabPage SwWrtShell *getFrameDlgParentShell(); - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; - static const sal_uInt16 aPageRg[]; public: SwFramePage(TabPageParent pParent, const SfxItemSet &rSet); virtual ~SwFramePage() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } virtual bool FillItemSet(SfxItemSet *rSet) override; @@ -230,16 +227,11 @@ class SwGrfExtPage : public SfxTabPage DECL_LINK(BrowseHdl, weld::Button&, void); virtual void ActivatePage(const SfxItemSet& rSet) override; - virtual ~SwGrfExtPage() override; - virtual void dispose() override; - - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; public: SwGrfExtPage(TabPageParent pParent, const SfxItemSet &rSet); - - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + virtual ~SwGrfExtPage() override; virtual bool FillItemSet(SfxItemSet *rSet) override; virtual void Reset(const SfxItemSet *rSet) override; @@ -260,14 +252,11 @@ class SwFrameURLPage : public SfxTabPage DECL_LINK(InsertFileHdl, weld::Button&, void); - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; - public: SwFrameURLPage(TabPageParent pParent, const SfxItemSet &rSet); virtual ~SwFrameURLPage() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) override; virtual void Reset(const SfxItemSet *rSet) override; @@ -316,9 +305,8 @@ class SwFrameAddPage : public SfxTabPage public: SwFrameAddPage(TabPageParent pParent, const SfxItemSet &rSet); virtual ~SwFrameAddPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aAddPgRg; } virtual bool FillItemSet(SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/label.hxx b/sw/source/uibase/inc/label.hxx index b014e408b6a8..463f4e34c89d 100644 --- a/sw/source/uibase/inc/label.hxx +++ b/sw/source/uibase/inc/label.hxx @@ -33,7 +33,7 @@ class SwLabDlg : public SfxTabDialogController { SwLabelConfig aLabelsCfg; SwDBManager* const pDBManager; - VclPtr<SwLabPrtPage> pPrtPage; + SwLabPrtPage* m_pPrtPage; std::vector<sal_uInt16> aTypeIds; std::vector<OUString> aMakes; diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index f883b4100454..651589229c93 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -50,9 +50,8 @@ class SwMailConfigPage : public SfxTabPage public: SwMailConfigPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SwMailConfigPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/mailmergewizard.hxx b/sw/source/uibase/inc/mailmergewizard.hxx index 3b1e3324a012..cac0942546fc 100644 --- a/sw/source/uibase/inc/mailmergewizard.hxx +++ b/sw/source/uibase/inc/mailmergewizard.hxx @@ -54,7 +54,7 @@ class SwMailMergeWizard : public ::vcl::RoadmapWizardMachine using vcl::WizardMachine::skipUntil; protected: - virtual VclPtr<TabPage> createPage( WizardState _nState ) override; + virtual std::unique_ptr<BuilderPage> createPage( WizardState _nState ) override; virtual void enterState( WizardState _nState ) override; virtual OUString getStateDisplayName( WizardState _nState ) const override; diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index dcd92d8fd8e3..ed1844fd9dcb 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -90,21 +90,17 @@ class SwNumPositionTabPage : public SfxTabPage DECL_LINK(AlignAtHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(IndentAtHdl_Impl, weld::MetricSpinButton&, void); - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; - public: SwNumPositionTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SwNumPositionTabPage() override; - virtual void dispose() override; virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;} diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index 44dab6ae265e..fe2d66e5530d 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -65,7 +65,7 @@ public: SwParagraphNumTabPage(TabPageParent pParent, const SfxItemSet& rSet ); virtual ~SwParagraphNumTabPage() override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return aPageRg; } diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx index c153a4d9eed1..e19f10f8aa68 100644 --- a/sw/source/uibase/inc/optcomp.hxx +++ b/sw/source/uibase/inc/optcomp.hxx @@ -68,7 +68,7 @@ public: SwCompatibilityOptPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SwCompatibilityOptPage() override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index d277a4d89e26..2c3461eab7d4 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -84,7 +84,7 @@ public: SwLoadOptPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SwLoadOptPage() override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; @@ -185,9 +185,8 @@ private: public: SwCaptionOptPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SwCaptionOptPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index f6ef68d9d769..2778ea6ae131 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -62,7 +62,7 @@ public: SwContentOptPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SwContentOptPage() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -106,7 +106,7 @@ public: SwAddPrinterTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SwAddPrinterTabPage() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -117,7 +117,6 @@ public: class SwStdFontTabPage : public SfxTabPage { - friend class VclPtr<SwStdFontTabPage>; OUString m_sShellStd; OUString m_sShellTitle; OUString m_sShellList; @@ -166,12 +165,10 @@ class SwStdFontTabPage : public SfxTabPage DECL_LINK(ModifyHdl, weld::ComboBox&, void ); DECL_LINK(LoseFocusHdl, weld::Widget&, void ); +public: SwStdFontTabPage(TabPageParent pParent, const SfxItemSet& rSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual ~SwStdFontTabPage() override; - virtual void dispose() override; - -public: - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -209,7 +206,7 @@ public: SwTableOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SwTableOptionsTabPage() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -250,7 +247,7 @@ public: SwShdwCursorOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SwShdwCursorOptionsTabPage() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; @@ -322,9 +319,8 @@ class SwRedlineOptionsTabPage : public SfxTabPage public: SwRedlineOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SwRedlineOptionsTabPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; @@ -340,7 +336,7 @@ public: SwTestTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SwTestTabPage() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; @@ -381,7 +377,7 @@ public: SwCompareOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SwCompareOptionsTabPage() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet ); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index f57ce394cbf7..76bc778c3d80 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -98,11 +98,10 @@ class SwOutlineSettingsTabPage : public SfxTabPage void SetModified() { m_aPreviewWIN.Invalidate(); } void CheckForStartValue_Impl(sal_uInt16 nNumberingType); - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; - public: SwOutlineSettingsTabPage(TabPageParent pParent, const SfxItemSet& rSet); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, + const SfxItemSet* rAttrSet); virtual ~SwOutlineSettingsTabPage() override; void SetWrtShell(SwWrtShell* pShell); @@ -112,8 +111,6 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, - const SfxItemSet* rAttrSet); void SetNumRule(SwNumRule *pRule) { pNumRule = pRule; diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index 1333672518f8..b74e522f8a9d 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -27,18 +27,17 @@ // footnote settings TabPage class SwFootNotePage: public SfxTabPage { - friend class VclPtr<SwFootNotePage>; static const sal_uInt16 aPageRg[]; - SwFootNotePage(TabPageParent pParent, const SfxItemSet &rSet); public: - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + SwFootNotePage(TabPageParent pParent, const SfxItemSet &rSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + virtual ~SwFootNotePage() override; + static const sal_uInt16* GetRanges() { return aPageRg; } virtual bool FillItemSet(SfxItemSet *rSet) override; virtual void Reset(const SfxItemSet *rSet) override; - virtual ~SwFootNotePage() override; - virtual void dispose() override; private: long lMaxHeight; @@ -60,9 +59,6 @@ private: DECL_LINK(LineWidthChanged_Impl, weld::MetricSpinButton&, void); DECL_LINK(LineColorSelected_Impl, ColorListBox&, void); - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; - virtual void ActivatePage( const SfxItemSet& rSet ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index 9da77f57239f..826c67f44c2f 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -72,15 +72,11 @@ class SwTextGridPage: public SfxTabPage DECL_LINK(GridModifyClickHdl, weld::ToggleButton&, void); DECL_LINK(DisplayGridHdl, weld::ToggleButton&, void); - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; - public: SwTextGridPage(TabPageParent pParent, const SfxItemSet &rSet); virtual ~SwTextGridPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index f33822807ee1..4d1414efe362 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -201,7 +201,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) override; SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ) override; SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const override; - SAL_DLLPRIVATE virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions) override; + SAL_DLLPRIVATE virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions) override; SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill ); diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index 52719c41e3b3..f4597d9f1f33 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -165,7 +165,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); }; @@ -202,7 +202,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); }; @@ -221,7 +221,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); void SetWrtShell(SwWrtShell const & rSh); }; diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index c3f10021a74a..a00b7c354def 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -43,8 +43,6 @@ class SwCondCollPage : public SfxTabPage std::unique_ptr<weld::Button> m_xRemovePB; std::unique_ptr<weld::Button> m_xAssignPB; - virtual ~SwCondCollPage() override; - virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; DECL_LINK(OnOffHdl, weld::ToggleButton&, void); @@ -55,15 +53,13 @@ class SwCondCollPage : public SfxTabPage void AssignRemove(const weld::Widget*); void SelectHdl(const weld::Widget*); - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; - static const sal_uInt16 m_aPageRg[]; public: SwCondCollPage(TabPageParent pParent, const SfxItemSet &rSet); + virtual ~SwCondCollPage() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return m_aPageRg; } virtual bool FillItemSet( SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index b3613020a1db..a0e3da23cd54 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -203,13 +203,9 @@ class SwTOXSelectTabPage : public SfxTabPage void ApplyTOXDescription(); void FillTOXDescription(); - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; - public: SwTOXSelectTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXSelectTabPage() override; - virtual void dispose() override; virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; @@ -217,7 +213,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); void SelectType(TOXTypes eSet); //preset TOXType, GlobalDoc @@ -242,7 +238,7 @@ class SwTokenWindow Idle m_aAdjustPositionsIdle; - VclPtr<SwTOXEntryTabPage> m_pParent; + SwTOXEntryTabPage* m_pParent; std::unique_ptr<weld::Container> m_xParentWidget; std::unique_ptr<weld::Builder> m_xBuilder; std::unique_ptr<weld::Container> m_xContainer; @@ -385,20 +381,16 @@ class SwTOXEntryTabPage : public SfxTabPage void OnModify(bool bAllLevels); DECL_LINK(ModifyClickHdl, weld::ToggleButton&, void); - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; - public: SwTOXEntryTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXEntryTabPage() override; - virtual void dispose() override; virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; virtual void ActivatePage( const SfxItemSet& ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); void SetWrtShell(SwWrtShell& rSh); @@ -429,9 +421,6 @@ class SwTOXStylesTabPage : public SfxTabPage return *pDlg->GetForm(pDlg->GetCurrentTOXType()); } - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; - public: SwTOXStylesTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXStylesTabPage() override; @@ -442,7 +431,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); }; diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index bffc69bb1c28..4abeca2a4fa6 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -68,8 +68,6 @@ class SwWrapTabPage: public SfxTabPage std::unique_ptr<weld::CheckButton> m_xWrapOutsideCB; std::unique_ptr<weld::CheckButton> m_xAllowOverlapCB; - virtual ~SwWrapTabPage() override; - void SetImages(); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; @@ -78,15 +76,12 @@ class SwWrapTabPage: public SfxTabPage DECL_LINK(WrapTypeHdl, weld::ToggleButton&, void); DECL_LINK(ContourHdl, weld::ToggleButton&, void); - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; - static const sal_uInt16 m_aWrapPageRg[]; public: SwWrapTabPage(TabPageParent pParent, const SfxItemSet &rSet); - - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + virtual ~SwWrapTabPage() override; virtual bool FillItemSet(SfxItemSet *rSet) override; virtual void Reset(const SfxItemSet *rSet) override; |