diff options
Diffstat (limited to 'cui/source/inc')
34 files changed, 100 insertions, 296 deletions
diff --git a/cui/source/inc/SvxMenuConfigPage.hxx b/cui/source/inc/SvxMenuConfigPage.hxx index 309428d41c2a..78061d9fd562 100644 --- a/cui/source/inc/SvxMenuConfigPage.hxx +++ b/cui/source/inc/SvxMenuConfigPage.hxx @@ -58,7 +58,6 @@ private: public: SvxMenuConfigPage(TabPageParent pParent, const SfxItemSet& rItemSet, bool bIsMenuBar = true); virtual ~SvxMenuConfigPage() override; - virtual void dispose() override; SaveInData* CreateSaveInData( const css::uno::Reference < diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx b/cui/source/inc/SvxToolbarConfigPage.hxx index c7e86e6a34df..a4998e9862d6 100644 --- a/cui/source/inc/SvxToolbarConfigPage.hxx +++ b/cui/source/inc/SvxToolbarConfigPage.hxx @@ -57,7 +57,6 @@ private: public: SvxToolbarConfigPage(TabPageParent pParent, const SfxItemSet& rItemSet); virtual ~SvxToolbarConfigPage() override; - virtual void dispose() override; void AddFunction(int nTarget = -1); diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index e61fe5199832..c351274dc281 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -141,7 +141,6 @@ private: public: SfxAcceleratorConfigPage(TabPageParent pParent, const SfxItemSet& rItemSet); virtual ~SfxAcceleratorConfigPage() override; - virtual void dispose() override; virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 063d5b1f59f5..69ae8ead2e82 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -46,25 +46,20 @@ namespace svx { class AlignmentTabPage : public SfxTabPage { - using TabPage::DeactivatePage; - friend class VclPtr<AlignmentTabPage>; static const sal_uInt16 s_pRanges[]; public: virtual ~AlignmentTabPage() override; - virtual void dispose() override; + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); + explicit AlignmentTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet); - static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges() { return s_pRanges; } virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; private: - explicit AlignmentTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet); - void InitVsRefEgde(); void UpdateEnableControls(); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 8d2c9ea1c0d9..61a239b968bf 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -51,8 +51,6 @@ public: class OfaAutocorrOptionsPage : public SfxTabPage { - using TabPage::ActivatePage; - private: OUString m_sInput; OUString m_sDoubleCaps; @@ -71,7 +69,7 @@ public: OfaAutocorrOptionsPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~OfaAutocorrOptionsPage() override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; @@ -84,9 +82,6 @@ public: class OfaSwAutoFmtOptionsPage : public SfxTabPage { - friend class VclPtr<OfaSwAutoFmtOptionsPage>; - using TabPage::ActivatePage; - OUString sDeleteEmptyPara; OUString sUseReplaceTbl; OUString sCapitalStartWord; @@ -123,13 +118,12 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage void CreateEntry(const OUString& rTxt, sal_uInt16 nCol); +public: OfaSwAutoFmtOptionsPage(TabPageParent pParent, const SfxItemSet& rSet); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, + const SfxItemSet* rAttrSet); virtual ~OfaSwAutoFmtOptionsPage() 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; virtual void ActivatePage( const SfxItemSet& ) override; @@ -156,9 +150,6 @@ typedef std::map<LanguageType, StringChangeList> StringChangeTable; class OfaAutocorrReplacePage : public SfxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; - private: StringChangeTable aChangesTable; @@ -201,9 +192,8 @@ private: public: OfaAutocorrReplacePage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~OfaAutocorrReplacePage() 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; @@ -228,9 +218,6 @@ typedef std::map<LanguageType, StringsArrays> StringsTable; class OfaAutocorrExceptPage : public SfxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; - private: StringsTable aStringsTable; std::unique_ptr<CollatorWrapper> pCompareClass; @@ -260,9 +247,8 @@ private: public: OfaAutocorrExceptPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~OfaAutocorrExceptPage() 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; @@ -277,9 +263,6 @@ public: class OfaQuoteTabPage : public SfxTabPage { - friend class VclPtr<OfaQuoteTabPage>; - using TabPage::ActivatePage; - private: OUString sNonBrkSpace; OUString sOrdinal; @@ -317,12 +300,11 @@ private: static void CreateEntry(weld::TreeView& rLstBox, const OUString& rTxt, sal_uInt16 nCol, sal_uInt16 nTextCol); - OfaQuoteTabPage(TabPageParent pParent, const SfxItemSet& rSet); public: - virtual ~OfaQuoteTabPage() override; - - static VclPtr<SfxTabPage> Create(TabPageParent pParent, + OfaQuoteTabPage(TabPageParent pParent, const SfxItemSet& rSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + virtual ~OfaQuoteTabPage() override; virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; @@ -333,9 +315,7 @@ public: class OfaAutoCompleteTabPage : public SfxTabPage { - friend class VclPtr<OfaAutoCompleteTabPage>; private: - using TabPage::ActivatePage; editeng::SortedAutoCompleteStrings* m_pAutoCompleteList; sal_uInt16 m_nAutoCmpltListCnt; @@ -355,11 +335,11 @@ private: DECL_LINK(CheckHdl, weld::ToggleButton&, void); DECL_LINK(KeyReleaseHdl, const KeyEvent&, bool); - OfaAutoCompleteTabPage(TabPageParent pParent, const SfxItemSet& rSet); public: - virtual ~OfaAutoCompleteTabPage() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, + OfaAutoCompleteTabPage(TabPageParent pParent, const SfxItemSet& rSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + virtual ~OfaAutoCompleteTabPage() override; virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; @@ -377,8 +357,6 @@ public: */ class OfaSmartTagOptionsTabPage : public SfxTabPage { - using TabPage::ActivatePage; - private: // controls @@ -423,7 +401,7 @@ public: OfaSmartTagOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~OfaSmartTagOptionsTabPage() 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/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 099997775374..86d52da29511 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -42,11 +42,12 @@ class SvxBrushItem; class SvxBackgroundTabPage : public SvxTabPage { - using TabPage::DeactivatePage; - friend class VclPtr<SvxBackgroundTabPage>; static const sal_uInt16 pPageRanges[]; public: - static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); + SvxBackgroundTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); + virtual ~SvxBackgroundTabPage() override; + // returns the area of the which-values static const sal_uInt16* GetRanges() { return pPageRanges; } @@ -65,10 +66,6 @@ protected: virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; private: - SvxBackgroundTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet); - virtual ~SvxBackgroundTabPage() override; - virtual void dispose() override; - // DDListBox for Writer ------------------------------- Color aBgdColor; @@ -166,14 +163,10 @@ class SvxBkgTabPage : public SvxAreaTabPage DECL_LINK(TblDestinationHdl_Impl, weld::ComboBox&, void); public: - using SvxAreaTabPage::ActivatePage; - using SvxAreaTabPage::DeactivatePage; - SvxBkgTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); virtual ~SvxBkgTabPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); + static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) override; virtual void ActivatePage( const SfxItemSet& ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index 92790ea285e5..30e2ad5318df 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -76,15 +76,12 @@ private: class SvxBorderTabPage : public SfxTabPage { - friend class VclPtr<SvxBorderTabPage>; - using TabPage::DeactivatePage; - static const sal_uInt16 pRanges[]; public: + SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs); virtual ~SvxBorderTabPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); static const sal_uInt16* GetRanges() { return pRanges; } @@ -97,11 +94,8 @@ public: void SetTableMode(); protected: virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; private: - SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs); - std::vector<Image> m_aShadowImgVec; std::vector<Image> m_aBorderImgVec; diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 4b4e308803bd..eeb7644049b8 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -318,7 +318,7 @@ class SvxMenuEntriesListBox protected: std::unique_ptr<weld::TreeView> m_xControl; ScopedVclPtr<VirtualDevice> m_xDropDown; - VclPtr<SvxConfigPage> pPage; + SvxConfigPage* m_pPage; public: SvxMenuEntriesListBox(std::unique_ptr<weld::TreeView> xControl, SvxConfigPage* pPage); diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 68e6879e92e0..8d98176d3bfc 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -52,11 +52,7 @@ protected: public: virtual ~SvxCharBasePage() override; - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; - virtual void ActivatePage( const SfxItemSet& rSet ) override; - }; // class SvxCharNamePage ------------------------------------------------- @@ -65,8 +61,6 @@ struct SvxCharNamePage_Impl; class SvxCharNamePage : public SvxCharBasePage { - friend class VclPtr<SvxCharNamePage>; - private: static const sal_uInt16 pNameRanges[]; @@ -108,8 +102,6 @@ private: std::unique_ptr<weld::Label> m_xCTLFontTypeFT; std::unique_ptr<weld::Button> m_xCTLFontFeaturesButton; - SvxCharNamePage(TabPageParent pParent, const SfxItemSet& rSet); - void Initialize(); const FontList* GetFontList() const; void UpdatePreview_Impl(); @@ -142,17 +134,14 @@ private: void FontModifyHdl_Impl(const weld::Widget&); public: - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; - virtual void ActivatePage( const SfxItemSet& rSet ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: - virtual ~SvxCharNamePage() override; - virtual void dispose() override; + SvxCharNamePage(TabPageParent pParent, const SfxItemSet& rSet); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); + virtual ~SvxCharNamePage() override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pNameRanges; } virtual void Reset( const SfxItemSet* rSet ) override; @@ -171,8 +160,6 @@ public: class SvxCharEffectsPage : public SvxCharBasePage { - friend class VclPtr<SvxCharEffectsPage>; - private: static const sal_uInt16 pEffectsRanges[]; bool m_bOrigFontColor; @@ -206,8 +193,6 @@ private: std::unique_ptr<weld::ComboBox> m_xPositionLB; std::unique_ptr<weld::Label> m_xA11yWarningFT; - SvxCharEffectsPage(TabPageParent pParent, const SfxItemSet& rSet); - void Initialize(); void UpdatePreview_Impl(); void SetCaseMap_Impl( SvxCaseMap eCaseMap ); @@ -224,14 +209,13 @@ private: DECL_LINK(ColorBoxSelectHdl_Impl, ColorListBox&, void); public: + SvxCharEffectsPage(TabPageParent pParent, const SfxItemSet& rSet); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); virtual ~SvxCharEffectsPage() override; - virtual void dispose() override; - using SfxTabPage::DeactivatePage; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: - static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pEffectsRanges; } virtual void Reset( const SfxItemSet* rSet ) override; @@ -243,11 +227,8 @@ public: }; // class SvxCharPositionPage --------------------------------------------- - - class SvxCharPositionPage : public SvxCharBasePage { - friend class VclPtr<SvxCharPositionPage>; static const sal_uInt16 pPositionRanges[]; private: @@ -283,8 +264,6 @@ private: std::unique_ptr<weld::MetricSpinButton> m_xKerningMF; std::unique_ptr<weld::CheckButton> m_xPairKerningBtn; - SvxCharPositionPage(TabPageParent pParent, const SfxItemSet& rSet); - void Initialize(); void UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ); void SetEscapement_Impl( SvxEscapement nEsc ); @@ -300,14 +279,13 @@ private: void FontModifyHdl_Impl(); public: + SvxCharPositionPage(TabPageParent pParent, const SfxItemSet& rSet); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); virtual ~SvxCharPositionPage() override; - using SfxTabPage::DeactivatePage; - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: - static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pPositionRanges; } virtual void Reset( const SfxItemSet* rSet ) override; @@ -321,7 +299,6 @@ public: class SvxCharTwoLinesPage : public SvxCharBasePage { - friend class VclPtr<SvxCharTwoLinesPage>; private: static const sal_uInt16 pTwoLinesRanges[]; sal_uInt16 m_nStartBracketPosition; @@ -332,8 +309,6 @@ private: std::unique_ptr<weld::TreeView> m_xStartBracketLB; std::unique_ptr<weld::TreeView> m_xEndBracketLB; - SvxCharTwoLinesPage(TabPageParent pParent, const SfxItemSet& rSet); - void UpdatePreview_Impl(); void Initialize(); void SelectCharacter(weld::TreeView* pBox); @@ -343,15 +318,13 @@ private: DECL_LINK(CharacterMapHdl_Impl, weld::TreeView&, void); public: + SvxCharTwoLinesPage(TabPageParent pParent, const SfxItemSet& rSet); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); virtual ~SvxCharTwoLinesPage() override; - using SfxTabPage::ActivatePage; - using SfxTabPage::DeactivatePage; - virtual void ActivatePage( const SfxItemSet& rSet ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pTwoLinesRanges; } virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index 70e54e6fd8f4..d89fa4521676 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -60,9 +60,8 @@ public: SvxConnectionPage(TabPageParent pWindow, const SfxItemSet& rInAttrs); virtual ~SvxConnectionPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); + static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } virtual bool FillItemSet( SfxItemSet* ) override; diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 064bc660bb2e..751557c850fa 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -50,7 +50,7 @@ class SearchThread: public salhelper::Thread private: SearchProgress* mpProgress; - VclPtr<TPGalleryThemeProperties> mpBrowser; + TPGalleryThemeProperties* mpBrowser; INetURLObject maStartURL; void ImplSearch( const INetURLObject& rStartURL, @@ -71,7 +71,7 @@ class SearchProgress : public weld::GenericDialogController { private: INetURLObject startUrl_; - VclPtr<TPGalleryThemeProperties> m_xTabPage; + TPGalleryThemeProperties* m_pTabPage; rtl::Reference< SearchThread > m_aSearchThread; std::unique_ptr<weld::Label> m_xFtSearchDir; std::unique_ptr<weld::Label> m_xFtSearchType; @@ -95,7 +95,7 @@ class TakeThread: public salhelper::Thread private: TakeProgress* mpProgress; - VclPtr<TPGalleryThemeProperties> mpBrowser; + TPGalleryThemeProperties* mpBrowser; TokenList_impl& mrTakenList; virtual ~TakeThread() override; @@ -114,7 +114,7 @@ class TakeProgress : public weld::GenericDialogController { private: weld::Window* m_pParent; - VclPtr<TPGalleryThemeProperties> m_xTabPage; + TPGalleryThemeProperties* m_pTabPage; rtl::Reference< TakeThread > maTakeThread; TokenList_impl maTakenList; std::unique_ptr<weld::Label> m_xFtTakeFile; @@ -205,7 +205,7 @@ private: public: TPGalleryThemeGeneral(TabPageParent pParent, const SfxItemSet& rSet); void SetXChgData( ExchangeData* pData ); - static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); }; class TPGalleryThemeProperties : public SfxTabPage @@ -263,14 +263,13 @@ class TPGalleryThemeProperties : public SfxTabPage public: TPGalleryThemeProperties(TabPageParent pWindow, const SfxItemSet& rSet); virtual ~TPGalleryThemeProperties() override; - virtual void dispose() override; void SetXChgData( ExchangeData* pData ); const ExchangeData* GetXChgData() const { return pData; } void StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult ); - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet); }; #endif // INCLUDED_CUI_SOURCE_INC_CUIGALDLG_HXX diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index 204cab1e90c7..64c152699315 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -30,7 +30,6 @@ class SvxGeneralTabPage : public SfxTabPage { - using TabPage::DeactivatePage; private: // the "Use data for document properties" checkbox std::unique_ptr<weld::CheckButton> m_xUseDataCB; @@ -64,7 +63,7 @@ public: SvxGeneralTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SvxGeneralTabPage() 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/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index 08b18187f30f..fc16a4a10d51 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.hxx @@ -26,7 +26,7 @@ class SvxJSearchOptionsPage; class SvxJSearchOptionsDialog : public SfxSingleTabDialogController { - VclPtr<SvxJSearchOptionsPage> m_xPage; + SvxJSearchOptionsPage* m_pPage; SvxJSearchOptionsDialog( const SvxJSearchOptionsDialog & ) = delete; SvxJSearchOptionsDialog & operator == ( const SvxJSearchOptionsDialog & ) = delete; diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 652e38b59d07..368090dc14bf 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -128,8 +128,6 @@ public: class SvxTransparenceTabPage : public SfxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; static const sal_uInt16 pTransparenceRanges[]; const SfxItemSet& rOutAttrs; @@ -191,7 +189,7 @@ public: SvxTransparenceTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); virtual ~SvxTransparenceTabPage() override; - static VclPtr<SfxTabPage> Create(TabPageParent, const SfxItemSet*); + static std::unique_ptr<SfxTabPage> Create(TabPageParent, const SfxItemSet*); static const sal_uInt16* GetRanges() { return pTransparenceRanges; } virtual bool FillItemSet(SfxItemSet*) override; @@ -211,7 +209,7 @@ class SvxAreaTabPage : public SfxTabPage { static const sal_uInt16 pAreaRanges[]; private: - ScopedVclPtr<SfxTabPage> m_pFillTabPage; + std::unique_ptr<SfxTabPage> m_xFillTabPage; ButtonBox maBox; XColorListRef m_pColorList; @@ -249,7 +247,7 @@ protected: void SetOptimalSize(weld::DialogController* pController); void SelectFillType( weld::ToggleButton& rButton, const SfxItemSet* _pSet = nullptr ); - SfxTabPage* GetFillTabPage() { return m_pFillTabPage; } + SfxTabPage* GetFillTabPage() { return m_xFillTabPage.get(); } bool IsBtnClicked() const { return m_bBtnClicked; } @@ -264,14 +262,10 @@ private: DeactivateRC DeactivatePage_Impl( SfxItemSet* pSet ); public: - using TabPage::ActivatePage; - using TabPage::DeactivatePage; - SvxAreaTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); virtual ~SvxAreaTabPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); + static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pAreaRanges; } virtual bool FillItemSet( SfxItemSet* ) override; @@ -298,8 +292,6 @@ public: class SvxShadowTabPage : public SvxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; static const sal_uInt16 pShadowRanges[]; private: @@ -331,9 +323,8 @@ private: public: SvxShadowTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); virtual ~SvxShadowTabPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); + static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pShadowRanges; } virtual bool FillItemSet( SfxItemSet* ) override; @@ -353,9 +344,6 @@ public: class SvxGradientTabPage : public SfxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; - private: const SfxItemSet& m_rOutAttrs; @@ -410,11 +398,10 @@ private: public: SvxGradientTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); virtual ~SvxGradientTabPage() override; - virtual void dispose() override; void Construct(); - 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; @@ -432,9 +419,6 @@ public: class SvxHatchTabPage : public SfxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; - private: const SfxItemSet& m_rOutAttrs; @@ -482,11 +466,10 @@ private: public: SvxHatchTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); virtual ~SvxHatchTabPage() override; - virtual void dispose() override; void Construct(); - 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; @@ -499,16 +482,12 @@ public: void SetHtchChgd( ChangeType* pIn ) { m_pnHatchingListState = pIn; } void SetColorChgd( ChangeType* pIn ) { m_pnColorListState = pIn; } - - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; /************************************************************************/ class SvxBitmapTabPage : public SfxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; static const sal_uInt16 pBitmapRanges[]; private: @@ -567,11 +546,10 @@ private: public: SvxBitmapTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); virtual ~SvxBitmapTabPage() override; - virtual void dispose() override; void Construct(); - 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; @@ -586,9 +564,6 @@ public: class SvxPatternTabPage : public SvxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; - private: const SfxItemSet& m_rOutAttrs; @@ -625,11 +600,10 @@ private: public: SvxPatternTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); virtual ~SvxPatternTabPage() override; - virtual void dispose() override; void Construct(); - 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; @@ -655,9 +629,6 @@ enum class ColorModel class SvxColorTabPage : public SfxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; - private: const SfxItemSet& rOutAttrs; @@ -743,11 +714,10 @@ private: public: SvxColorTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); virtual ~SvxColorTabPage() override; - virtual void dispose() override; void Construct(); - 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; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 305c6b3d3f90..ae42ecc947bb 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -87,8 +87,6 @@ struct SvxBmpItemInfo class SvxLineTabPage : public SfxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; static const sal_uInt16 pLineRanges[]; private: //#58425# symbols on a line (e. g. StarChart) -> @@ -204,11 +202,10 @@ public: SvxLineTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); virtual ~SvxLineTabPage() override; - virtual void dispose() override; void Construct(); - static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); + static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pLineRanges; } virtual bool FillItemSet( SfxItemSet* ) override; @@ -233,15 +230,12 @@ public: void SetColorChgd( ChangeType* pIn ) { m_pnColorListState = pIn; } virtual void PageCreated(const SfxAllItemSet& aSet) override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; /*************************************************************************/ class SvxLineDefTabPage : public SfxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; private: const SfxItemSet& rOutAttrs; XDash aDash; @@ -299,11 +293,10 @@ private: public: SvxLineDefTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); virtual ~SvxLineDefTabPage() override; - virtual void dispose() override; void Construct(); - 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; @@ -317,17 +310,12 @@ public: void SetPosDashLb( sal_Int32* pInPos ) { pPosDashLb = pInPos; } void SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; } - - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; /*************************************************************************/ class SvxLineEndDefTabPage : public SfxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; - private: const SfxItemSet& rOutAttrs; const SdrObject* pPolyObj; @@ -365,11 +353,10 @@ private: public: SvxLineEndDefTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); virtual ~SvxLineEndDefTabPage() override; - virtual void dispose() override; void Construct(); - 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; @@ -384,8 +371,6 @@ public: void SetPosLineEndLb( sal_Int32* pInPos ) { pPosLineEndLb = pInPos; } void SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; } - - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; #endif // INCLUDED_CUI_SOURCE_INC_CUITABLINE_HXX diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index b177fb3b0de2..dc3d9d17b232 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -70,9 +70,8 @@ namespace svx public: DbRegistrationOptionsPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~DbRegistrationOptionsPage() 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 ); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index f1e7dbe6f718..7e3987a795e1 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -54,7 +54,7 @@ public: class SvxDistributeDialog : public SfxSingleTabDialogController { - VclPtr<SvxDistributePage> mpPage; + SvxDistributePage* mpPage; public: SvxDistributeDialog(weld::Window* pParent, const SfxItemSet& rAttr, diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 9843e32387e4..1294c2cbab77 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -49,9 +49,6 @@ public: class SvxGrfCropPage : public SfxTabPage { friend class VclPtr<SvxGrfCropPage>; - using Window::CalcZoom; - using TabPage::ActivatePage; - using TabPage::DeactivatePage; OUString aGraphicName; Size aOrigSize; @@ -86,10 +83,6 @@ class SvxGrfCropPage : public SfxTabPage // Example std::unique_ptr<weld::CustomWeld> m_xExampleWN; - SvxGrfCropPage(TabPageParent pParent, const SfxItemSet &rSet); - virtual ~SvxGrfCropPage() override; - virtual void dispose() override; - DECL_LINK(ZoomHdl, weld::MetricSpinButton&, void); DECL_LINK(SizeHdl, weld::MetricSpinButton&, void); DECL_LINK(CropModifyHdl, weld::MetricSpinButton&, void); @@ -100,9 +93,11 @@ class SvxGrfCropPage : public SfxTabPage void GraphicHasChanged(bool bFound); virtual void ActivatePage(const SfxItemSet& rSet) override; - Size GetGrfOrigSize( const Graphic& ) const; + static Size GetGrfOrigSize(const Graphic&); public: - static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet *rSet ); + SvxGrfCropPage(TabPageParent pParent, const SfxItemSet &rSet); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet *rSet ); + virtual ~SvxGrfCropPage() override; virtual bool FillItemSet( SfxItemSet *rSet ) override; virtual void Reset( const SfxItemSet *rSet ) override; diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 07d802a730b3..267d4b8f9233 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -80,9 +80,8 @@ private: public: SvxCaptionTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); virtual ~SvxCaptionTabPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); + static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pCaptionRanges; } virtual bool FillItemSet( SfxItemSet* ) override; @@ -91,7 +90,6 @@ public: void SetView( const SdrView* pSdrView ) { pView = pSdrView; } - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void FillValueSet(); }; diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 0ad8c4816bd2..07ed15d2108a 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -57,13 +57,11 @@ public: ); virtual ~SfxMacroTabPage() override; - virtual void dispose() override; void AddEvent( const OUString & rEventName, SvMacroItemId nEventId ); void ScriptChanged(); virtual void PageCreated (const SfxAllItemSet& aSet) override; - using TabPage::ActivatePage; // FIXME WTF is this nonsense? virtual void ActivatePage( const SfxItemSet& ) override; void LaunchFillGroup(); @@ -74,7 +72,7 @@ public: bool IsReadOnly() const override; // --------- inherit from the base ------------- - static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); }; class SfxMacroAssignDlg : public SfxSingleTabDialogController diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index 8cb4e5466b19..145463fadea5 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -79,7 +79,6 @@ protected: public: virtual ~SvxMacroTabPage_() override; - virtual void dispose() override; void InitResources(); void InitAndSetHandler( const css::uno::Reference< css::container::XNameReplace >& xAppEvents, const css::uno::Reference< css::container::XNameReplace >& xDocEvents, const css::uno::Reference< css::util::XModifiable >& xModifiable ); diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 9cca6a37199f..58a38e822f2b 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -69,9 +69,8 @@ public: SvxMeasurePage(TabPageParent pWindow, const SfxItemSet& rInAttrs); virtual ~SvxMeasurePage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); + static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } virtual bool FillItemSet( SfxItemSet* ) override; diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index cbce3ffbb1b1..b822cd369f9b 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -57,16 +57,13 @@ public: class SvxNumberFormatTabPage : public SfxTabPage { - friend class VclPtr<SvxNumberFormatTabPage>; - using SfxTabPage::DeactivatePage; static const sal_uInt16 pRanges[]; public: - virtual ~SvxNumberFormatTabPage() override; - virtual void dispose() override; - - static VclPtr<SfxTabPage> Create( TabPageParent pParent, + SvxNumberFormatTabPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); + virtual ~SvxNumberFormatTabPage() override; // Returns area information. static const sal_uInt16* GetRanges() { return pRanges; } @@ -76,9 +73,8 @@ public: void HideLanguage(bool bFlag=true); virtual void PageCreated(const SfxAllItemSet& aSet) override; -private: - SvxNumberFormatTabPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs); +private: std::unique_ptr<SvxNumberInfoItem> pNumItem; std::unique_ptr<SvxNumberFormatShell> pNumFmtShell; sal_uLong nInitFormat; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 391094109005..fffe71e4dee4 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -57,9 +57,6 @@ typedef std::vector<std::unique_ptr<SvxNumSettings_Impl> > SvxNumSettingsArr_Imp class SvxSingleNumPickTabPage final : public SfxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; - SvxNumSettingsArr_Impl aNumSettingsArr; std::unique_ptr<SvxNumRule> pActNum; std::unique_ptr<SvxNumRule> pSaveNum; @@ -78,9 +75,8 @@ class SvxSingleNumPickTabPage final : public SfxTabPage public: SvxSingleNumPickTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SvxSingleNumPickTabPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) override; @@ -91,9 +87,6 @@ public: class SvxBulletPickTabPage final : public SfxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; - std::unique_ptr<SvxNumRule> pActNum; std::unique_ptr<SvxNumRule> pSaveNum; sal_uInt16 nActNumLvl; @@ -111,9 +104,8 @@ class SvxBulletPickTabPage final : public SfxTabPage public: SvxBulletPickTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SvxBulletPickTabPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) override; @@ -129,9 +121,6 @@ public: /// TabPage for complete numeration class SvxNumPickTabPage final : public SfxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; - OUString sNumCharFmtName; OUString sBulletCharFormatName; @@ -153,9 +142,8 @@ class SvxNumPickTabPage final : public SfxTabPage public: SvxNumPickTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SvxNumPickTabPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) override; @@ -171,9 +159,6 @@ public: class SvxBitmapPickTabPage final : public SfxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; - std::vector<OUString> aGrfNames; std::unique_ptr<SvxNumRule> pActNum; @@ -196,9 +181,8 @@ class SvxBitmapPickTabPage final : public SfxTabPage public: SvxBitmapPickTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SvxBitmapPickTabPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) override; @@ -209,9 +193,6 @@ public: class SvxNumOptionsTabPage : public SfxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; - OUString m_sNumCharFmtName; OUString m_sBulletCharFormatName; @@ -300,9 +281,8 @@ class SvxNumOptionsTabPage : public SfxTabPage public: SvxNumOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SvxNumOptionsTabPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) override; @@ -324,9 +304,6 @@ public: class SvxNumPositionTabPage : public SfxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; - std::unique_ptr<SvxNumRule> pActNum; std::unique_ptr<SvxNumRule> pSaveNum; @@ -389,14 +366,13 @@ class SvxNumPositionTabPage : public SfxTabPage public: SvxNumPositionTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SvxNumPositionTabPage() 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 SetMetric(FieldUnit eSet); diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 1aaeafa583df..ab38e033811a 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -50,7 +50,7 @@ public: SvxAsianLayoutPage(TabPageParent pParent, const SfxItemSet& rSet ); virtual ~SvxAsianLayoutPage() override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index b214115ddb0d..e0740cf8602a 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -79,7 +79,6 @@ public: class SvxLinguTabPage : public SfxTabPage { - friend class VclPtr<SvxLinguTabPage>; private: OUString sCapitalWords; OUString sWordsWithDigits; @@ -119,8 +118,6 @@ private: std::unique_ptr<weld::Button> m_xLinguOptionsEditPB; std::unique_ptr<weld::LinkButton> m_xMoreDictsLink; - SvxLinguTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet); - void AddDicBoxEntry( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); static sal_uInt32 GetDicUserData( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); @@ -136,9 +133,9 @@ private: void UpdateDicBox_Impl(); public: - virtual ~SvxLinguTabPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); + SvxLinguTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); + virtual ~SvxLinguTabPage() override; virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 1082f1354f85..7dd36f6b47ab 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -59,11 +59,9 @@ private: public: SvxPathTabPage( TabPageParent pParent, const SfxItemSet& rSet ); - virtual void dispose() override; + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); virtual ~SvxPathTabPage() override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; }; diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index a52ca0cffc53..3448d8572202 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -64,10 +64,6 @@ typedef sal_uInt16 MarginPosition; class SvxPageDescPage : public SfxTabPage { - friend class VclPtr<SvxPageDescPage>; - using TabPage::ActivatePage; - using TabPage::DeactivatePage; - static const sal_uInt16 pRanges[]; private: OUString sStandardRegister; @@ -160,14 +156,15 @@ private: void CheckMarginEdits( bool _bClear ); bool IsMarginOutOfRange() const; - SvxPageDescPage(TabPageParent pParent, const SfxItemSet& rSet); - protected: virtual void ActivatePage( const SfxItemSet& rSet ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: - static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); + SvxPageDescPage(TabPageParent pParent, const SfxItemSet& rSet); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); + virtual ~SvxPageDescPage() override; + // returns the range of the Which values static const sal_uInt16* GetRanges() { return pRanges; } @@ -175,9 +172,6 @@ public: virtual void Reset( const SfxItemSet* rSet ) override; virtual void FillUserData() override; - virtual ~SvxPageDescPage() override; - virtual void dispose() override; - void SetPaperFormatRanges( Paper eStart ) { ePaperStart = eStart; } diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 35a9bea4b30c..3df98a5bed07 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -41,14 +41,9 @@ class SvxLineSpacingItem; class SvxStdParagraphTabPage: public SfxTabPage { - friend class VclPtr<SvxStdParagraphTabPage>; - using TabPage::ActivatePage; - using TabPage::DeactivatePage; static const sal_uInt16 pStdRanges[]; private: - SvxStdParagraphTabPage(TabPageParent pParent, const SfxItemSet& rSet); - long nWidth; long nMinFixDist; bool bRelativeMode; @@ -103,11 +98,12 @@ protected: public: + SvxStdParagraphTabPage(TabPageParent pParent, const SfxItemSet& rSet); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); virtual ~SvxStdParagraphTabPage() override; DECL_LINK(ELRLoseFocusHdl, weld::MetricSpinButton&, void); - static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pStdRanges; } virtual bool FillItemSet( SfxItemSet* rSet ) override; @@ -127,9 +123,6 @@ public: class SvxParaAlignTabPage : public SfxTabPage { - friend class VclPtr<SvxParaAlignTabPage>; - using TabPage::ActivatePage; - using TabPage::DeactivatePage; static const sal_uInt16 pAlignRanges[]; SvxParaPrevWindow m_aExampleWin; @@ -163,16 +156,15 @@ class SvxParaAlignTabPage : public SfxTabPage void UpdateExample_Impl(); - SvxParaAlignTabPage(TabPageParent pParent, const SfxItemSet& rSet); - protected: virtual void ActivatePage( const SfxItemSet& rSet ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: + SvxParaAlignTabPage(TabPageParent pParent, const SfxItemSet& rSet); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); virtual ~SvxParaAlignTabPage() override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pAlignRanges; } virtual bool FillItemSet( SfxItemSet* rSet ) override; @@ -199,15 +191,14 @@ public: class SvxExtParagraphTabPage: public SfxTabPage { - friend class VclPtr<SvxExtParagraphTabPage>; - using TabPage::DeactivatePage; static const sal_uInt16 pExtRanges[]; public: + SvxExtParagraphTabPage(TabPageParent pParent, const SfxItemSet& rSet); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, + const SfxItemSet* rSet ); virtual ~SvxExtParagraphTabPage() override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, - const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pExtRanges; } virtual bool FillItemSet( SfxItemSet* rSet ) override; @@ -220,8 +211,6 @@ protected: virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; private: - SvxExtParagraphTabPage(TabPageParent pParent, const SfxItemSet& rSet); - weld::TriStateEnabled aHyphenState; weld::TriStateEnabled aPageBreakState; weld::TriStateEnabled aApplyCollState; @@ -292,24 +281,20 @@ private: class SvxAsianTabPage : public SfxTabPage { - friend class VclPtr<SvxAsianTabPage>; - std::unique_ptr<weld::CheckButton> m_xForbiddenRulesCB; std::unique_ptr<weld::CheckButton> m_xHangingPunctCB; std::unique_ptr<weld::CheckButton> m_xScriptSpaceCB; - SvxAsianTabPage(TabPageParent pParent, const SfxItemSet& rSet); - public: + SvxAsianTabPage(TabPageParent pParent, const SfxItemSet& rSet); + static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet); virtual ~SvxAsianTabPage() override; - static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; virtual void ChangesApplied() override; - }; #endif // INCLUDED_CUI_SOURCE_INC_PARAGRPH_HXX diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 4f5c276a6714..d02d915a3b6e 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -31,8 +31,6 @@ enum class SvxAnchorIds; class SvxSwPosSizeTabPage : public SfxTabPage { - using TabPage::DeactivatePage; - Link<SvxSwFrameValidation&,void> m_aValidateLink; ::tools::Rectangle m_aRect; //size of all selected objects @@ -112,10 +110,9 @@ class SvxSwPosSizeTabPage : public SfxTabPage public: SvxSwPosSizeTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); - virtual void dispose() override; + static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); virtual ~SvxSwPosSizeTabPage() override; - static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) override; diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index a0c8e7ce7b5d..38c95d2f52ce 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -59,14 +59,13 @@ public: class SvxTabulatorTabPage : public SfxTabPage { - friend class VclPtr<SvxTabulatorTabPage>; - using TabPage::DeactivatePage; static const sal_uInt16 pRanges[]; public: + SvxTabulatorTabPage(TabPageParent pParent, const SfxItemSet& rSet); + static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); virtual ~SvxTabulatorTabPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); + static const sal_uInt16* GetRanges() { return pRanges; } virtual bool FillItemSet( SfxItemSet* rSet ) override; @@ -78,8 +77,6 @@ protected: virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; private: - SvxTabulatorTabPage(TabPageParent pParent, const SfxItemSet& rSet); - // local variables, internal functions SvxTabStop aCurrentTab; std::unique_ptr<SvxTabStopItem> aNewTabs; diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index ecc725edcb7b..b5b2ae409e1e 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -81,7 +81,7 @@ public: SvxTextAnimationPage(TabPageParent pPage, const SfxItemSet& rInAttrs); virtual ~SvxTextAnimationPage() override; - static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); + static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } virtual bool FillItemSet( SfxItemSet* ) override; diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 42b998ae7b32..0cc80c9e64ff 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -77,7 +77,7 @@ public: SvxTextAttrPage(TabPageParent pWindow, const SfxItemSet& rInAttrs); virtual ~SvxTextAttrPage() override; - static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); + static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } virtual bool FillItemSet( SfxItemSet* ) override; diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 0d7b6fe5a75b..f90b7318534a 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -61,8 +61,6 @@ public: class SvxPositionSizeTabPage : public SvxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; static const sal_uInt16 pPosSizeRanges[]; private: @@ -134,7 +132,7 @@ public: SvxPositionSizeTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); virtual ~SvxPositionSizeTabPage() override; - static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); + static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pPosSizeRanges; } virtual bool FillItemSet( SfxItemSet* ) override; @@ -163,8 +161,6 @@ public: \************************************************************************/ class SvxAngleTabPage : public SvxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; static const sal_uInt16 pAngleRanges[]; private: @@ -193,7 +189,7 @@ public: SvxAngleTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); virtual ~SvxAngleTabPage() override; - static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); + static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pAngleRanges; } virtual bool FillItemSet( SfxItemSet* ) override; @@ -215,8 +211,6 @@ public: \************************************************************************/ class SvxSlantTabPage : public SfxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; static const sal_uInt16 pSlantRanges[]; private: @@ -241,7 +235,7 @@ public: SvxSlantTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); virtual ~SvxSlantTabPage() override; - static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); + static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pSlantRanges; } virtual bool FillItemSet( SfxItemSet* ) override; |