diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-12-11 20:57:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-12-12 21:12:10 +0100 |
| commit | 2431477337f4ac4384ba615f76bfb5904f1a3b47 (patch) | |
| tree | 6f676441983e9b3c8440600d09a49478353e1faf /include | |
| parent | 23cfd3d1004f5ddda8cd79878c00b6c64f20068c (diff) | |
use covariant return type for SfxPoolItem::Clone
and can then remove some casting
Change-Id: Id821c32ca2cbcdb7f57ef7a5fa1960042e630ffc
Reviewed-on: https://gerrit.libreoffice.org/85022
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
197 files changed, 276 insertions, 280 deletions
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index e309b0b29ce2..b30689c6fe30 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -72,7 +72,7 @@ public: virtual ~MediaItem() override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual MediaItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreUnit, MapUnit ePresUnit, diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx index 92158376f17e..5075901273ba 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -64,7 +64,7 @@ public: static OUString GetValueTextByPos( sal_uInt16 nPos ); virtual sal_uInt16 GetEnumValue() const override; virtual void SetEnumValue( sal_uInt16 nNewVal ) override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxAdjustItem* Clone( SfxItemPool *pPool = nullptr ) const override; void SetOneWord( const SvxAdjust eType ) { diff --git a/include/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx index 6274f144aee6..798aab04bd97 100644 --- a/include/editeng/autokernitem.hxx +++ b/include/editeng/autokernitem.hxx @@ -38,7 +38,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxAutoKernItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx index 037397a5fde9..54f6da995e87 100644 --- a/include/editeng/blinkitem.hxx +++ b/include/editeng/blinkitem.hxx @@ -38,7 +38,7 @@ public: SvxBlinkItem( const bool bBlink /*= false*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxBlinkItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index ee317ec4fc99..c63953cf5909 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -82,7 +82,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxBoxItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; @@ -195,7 +195,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxBoxInfoItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index 3455d1bfa925..61550a15d2a6 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -86,7 +86,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxBrushItem* Clone( SfxItemPool *pPool = nullptr ) const override; const Color& GetColor() const { return aColor; } Color& GetColor() { return aColor; } diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx index a9931de515a6..35266d8a4e94 100644 --- a/include/editeng/bulletitem.hxx +++ b/include/editeng/bulletitem.hxx @@ -61,7 +61,7 @@ public: SvxBulletItem( const SvxBulletItem& ); virtual ~SvxBulletItem() override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxBulletItem* Clone( SfxItemPool *pPool = nullptr ) const override; OUString GetFullText() const; diff --git a/include/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx index 8cc8df501149..ed72e08dcec0 100644 --- a/include/editeng/charhiddenitem.hxx +++ b/include/editeng/charhiddenitem.hxx @@ -34,7 +34,7 @@ class EDITENG_DLLPUBLIC SvxCharHiddenItem final : public SfxBoolItem public: SvxCharHiddenItem( const bool bHidden /*= false*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxCharHiddenItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx index 94eb995eede4..78b57fa7df00 100644 --- a/include/editeng/charreliefitem.hxx +++ b/include/editeng/charreliefitem.hxx @@ -39,7 +39,7 @@ public: SvxCharReliefItem( FontRelief eValue /*= FontRelief::NONE*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxCharReliefItem* Clone( SfxItemPool *pPool = nullptr ) const override; static OUString GetValueTextByPos( sal_uInt16 nPos ); virtual sal_uInt16 GetValueCount() const override; diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx index 07a35599a61f..0ce60bb1a05b 100644 --- a/include/editeng/charrotateitem.hxx +++ b/include/editeng/charrotateitem.hxx @@ -36,7 +36,7 @@ class EDITENG_DLLPUBLIC SvxTextRotateItem : public SfxUInt16Item public: SvxTextRotateItem(sal_uInt16 nValue, const sal_uInt16 nId); - virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override; + virtual SvxTextRotateItem* Clone(SfxItemPool *pPool = nullptr) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, @@ -79,7 +79,7 @@ public: bool bFitIntoLine /*= false*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxCharRotateItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx index 7a2da36ade63..fff4fa8efae9 100644 --- a/include/editeng/charscaleitem.hxx +++ b/include/editeng/charscaleitem.hxx @@ -40,7 +40,7 @@ public: SvxCharScaleWidthItem( sal_uInt16 nValue /*= 100*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxCharScaleWidthItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx index fea86c443fae..d0b4bff258bf 100644 --- a/include/editeng/cmapitem.hxx +++ b/include/editeng/cmapitem.hxx @@ -44,7 +44,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxCaseMapItem* Clone( SfxItemPool *pPool = nullptr ) const override; static OUString GetValueTextByPos( sal_uInt16 nPos ); virtual sal_uInt16 GetValueCount() const override; diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index e1bf9e0c0a5d..1eab79723577 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -48,7 +48,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, const IntlWrapper& rIntlWrapper) const override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual SvxColorItem* Clone(SfxItemPool* pPool = nullptr) const override; SvxColorItem(SvxColorItem const &) = default; // SfxPoolItem copy function dichotomy const Color& GetValue() const @@ -63,15 +63,15 @@ public: // XXX: to be moved in a separate header. class EDITENG_DLLPUBLIC SvxBackgroundColorItem final : public SvxColorItem { - public: - static SfxPoolItem* CreateDefault(); +public: + static SfxPoolItem* CreateDefault(); - SvxBackgroundColorItem(const sal_uInt16 nId); - SvxBackgroundColorItem(const Color& rCol, const sal_uInt16 nId); + SvxBackgroundColorItem(const sal_uInt16 nId); + SvxBackgroundColorItem(const Color& rCol, const sal_uInt16 nId); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; - virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override; - virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; + virtual SvxBackgroundColorItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override; + virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; }; #endif diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx index a656ccd7b4c0..9c67384fc8d2 100644 --- a/include/editeng/contouritem.hxx +++ b/include/editeng/contouritem.hxx @@ -37,7 +37,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxContourItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx index 945b19185d83..5d8b18fe2650 100644 --- a/include/editeng/crossedoutitem.hxx +++ b/include/editeng/crossedoutitem.hxx @@ -43,7 +43,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxCrossedOutItem* Clone( SfxItemPool *pPool = nullptr ) const override; static OUString GetValueTextByPos( sal_uInt16 nPos ); virtual sal_uInt16 GetValueCount() const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx index 720b2ee655af..f54c857353c9 100644 --- a/include/editeng/emphasismarkitem.hxx +++ b/include/editeng/emphasismarkitem.hxx @@ -45,7 +45,7 @@ public: OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxEmphasisMarkItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx index f84d18dd8f57..6811511c4076 100644 --- a/include/editeng/escapementitem.hxx +++ b/include/editeng/escapementitem.hxx @@ -60,7 +60,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxEscapementItem* Clone( SfxItemPool *pPool = nullptr ) const override; void SetEscapement( const SvxEscapement eNew ) { diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index 1c3ec9987466..fd636afa54ee 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -62,7 +62,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxFontHeightItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index 6de611b82310..c7cd1e02209a 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -79,7 +79,7 @@ public: virtual ~SvxFieldItem() override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxFieldItem* Clone( SfxItemPool *pPool = nullptr ) const override; const SvxFieldData* GetField() const { return mpField.get(); } }; diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx index 86cd6c9a593a..71756464e5b0 100644 --- a/include/editeng/flstitem.hxx +++ b/include/editeng/flstitem.hxx @@ -46,7 +46,7 @@ public: const sal_uInt16 nId ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxFontListItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx index 6d6d105aa0fb..9a73a051f79e 100644 --- a/include/editeng/fontitem.hxx +++ b/include/editeng/fontitem.hxx @@ -46,7 +46,7 @@ public: // "pure virtual Methods" from SfxPoolItem virtual bool operator==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override; + virtual SvxFontItem* Clone(SfxItemPool *pPool = nullptr) const override; virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override; virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; diff --git a/include/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx index 9eaf4692c838..93e46b433b29 100644 --- a/include/editeng/forbiddenruleitem.hxx +++ b/include/editeng/forbiddenruleitem.hxx @@ -35,7 +35,7 @@ public: SvxForbiddenRuleItem( bool bOn /*= false*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxForbiddenRuleItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx index 3774639ff5b5..36aacdf4d919 100644 --- a/include/editeng/formatbreakitem.hxx +++ b/include/editeng/formatbreakitem.hxx @@ -53,7 +53,7 @@ public: OUString &rText, const IntlWrapper& ) const override; static OUString GetValueTextByPos( sal_uInt16 nPos ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxFormatBreakItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; SvxBreak GetBreak() const { return GetValue(); } diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx index 89524b743a4f..2a439aa50ca7 100644 --- a/include/editeng/frmdiritem.hxx +++ b/include/editeng/frmdiritem.hxx @@ -39,7 +39,7 @@ public: SvxFrameDirectionItem & operator =(SvxFrameDirectionItem const &) = delete; SvxFrameDirectionItem & operator =(SvxFrameDirectionItem &&) = delete; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxFrameDirectionItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx index e22feddfa1a4..c59d4db0cf0d 100644 --- a/include/editeng/hngpnctitem.hxx +++ b/include/editeng/hngpnctitem.hxx @@ -34,7 +34,7 @@ class EDITENG_DLLPUBLIC SvxHangingPunctuationItem final : public SfxBoolItem public: SvxHangingPunctuationItem( bool bOn /*= false*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxHangingPunctuationItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx index 0b573f43c9f5..9b3abd338839 100644 --- a/include/editeng/hyphenzoneitem.hxx +++ b/include/editeng/hyphenzoneitem.hxx @@ -55,7 +55,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxHyphenZoneItem* Clone( SfxItemPool *pPool = nullptr ) const override; void SetHyphen( const bool bNew ) { bHyphen = bNew; } bool IsHyphen() const { return bHyphen; } diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index e087f85be141..616427f466f9 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -46,7 +46,7 @@ public: virtual sal_uInt16 GetValueCount() const override; static OUString GetValueText( SvxCellHorJustify nVal ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxHorJustifyItem* Clone( SfxItemPool *pPool = nullptr ) const override; SvxHorJustifyItem(SvxHorJustifyItem const &) = default; // SfxPoolItem copy function dichotomy }; @@ -73,7 +73,7 @@ public: virtual sal_uInt16 GetValueCount() const override; static OUString GetValueText( SvxCellVerJustify nVal ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxVerJustifyItem* Clone( SfxItemPool *pPool = nullptr ) const override; SvxVerJustifyItem(SvxVerJustifyItem const &) = default; // SfxPoolItem copy function dichotomy }; @@ -96,7 +96,7 @@ public: virtual sal_uInt16 GetValueCount() const override; static OUString GetValueText( SvxCellJustifyMethod nVal ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxJustifyMethodItem* Clone( SfxItemPool *pPool = nullptr ) const override; }; #endif diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx index 9e910e73e661..6d511d04b0a2 100644 --- a/include/editeng/keepitem.hxx +++ b/include/editeng/keepitem.hxx @@ -40,7 +40,7 @@ public: SvxFormatKeepItem(SvxFormatKeepItem const &) = default; // SfxPoolItem copy function dichotomy // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxFormatKeepItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/kernitem.hxx b/include/editeng/kernitem.hxx index c5ea4f3b3f1c..a95eae9efa8a 100644 --- a/include/editeng/kernitem.hxx +++ b/include/editeng/kernitem.hxx @@ -40,7 +40,7 @@ public: SvxKerningItem( const short nKern /*= 0*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxKerningItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx index 19d50c2a0ce0..4d3852141666 100644 --- a/include/editeng/langitem.hxx +++ b/include/editeng/langitem.hxx @@ -52,7 +52,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper&) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxLanguageItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; SvxLanguageItem(SvxLanguageItem const &) = default; // SfxPoolItem copy function dichotomy diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx index ff06a26b58eb..88a0bf768d91 100644 --- a/include/editeng/lineitem.hxx +++ b/include/editeng/lineitem.hxx @@ -53,7 +53,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxLineItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx index 3c5a06f1fe83..b4ad3e433d9a 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -81,7 +81,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxLRSpaceItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx index 202a4c848f0d..e4c97cfcd460 100644 --- a/include/editeng/lspcitem.hxx +++ b/include/editeng/lspcitem.hxx @@ -59,7 +59,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxLineSpacingItem* Clone( SfxItemPool *pPool = nullptr ) const override; // Methods to query and edit. InterlineSpace is added to the height. short GetInterLineSpace() const { return nInterLineSpace; } diff --git a/include/editeng/nhypitem.hxx b/include/editeng/nhypitem.hxx index fdfba7a28534..1078a055b769 100644 --- a/include/editeng/nhypitem.hxx +++ b/include/editeng/nhypitem.hxx @@ -29,7 +29,7 @@ public: SvxNoHyphenItem( const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxNoHyphenItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index 699f82928069..399250c9c13a 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -300,7 +300,7 @@ public: SvxNumBulletItem(const SvxNumBulletItem& rCopy); virtual ~SvxNumBulletItem() override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxNumBulletItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; SvxNumRule* GetNumRule() const {return pNumRule.get();} diff --git a/include/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx index 62918296bbae..d38747747c55 100644 --- a/include/editeng/opaqitem.hxx +++ b/include/editeng/opaqitem.hxx @@ -36,7 +36,7 @@ public: explicit SvxOpaqueItem( const sal_uInt16 nId , const bool bOpa = true ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxOpaqueItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx index 4403cdf0792b..f4cbd2df81ab 100644 --- a/include/editeng/optitems.hxx +++ b/include/editeng/optitems.hxx @@ -40,7 +40,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxHyphenRegionItem* Clone( SfxItemPool *pPool = nullptr ) const override; sal_uInt8 &GetMinLead() { return nMinLead; } sal_uInt8 GetMinLead() const { return nMinLead; } diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx index 6cec0ca0b592..4181e7c741eb 100644 --- a/include/editeng/orphitem.hxx +++ b/include/editeng/orphitem.hxx @@ -37,7 +37,7 @@ public: SvxOrphansItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxOrphansItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx index 99460639108e..335b15f3769b 100644 --- a/include/editeng/paravertalignitem.hxx +++ b/include/editeng/paravertalignitem.hxx @@ -40,7 +40,7 @@ public: SvxParaVertAlignItem( Align nValue /*= 0*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxParaVertAlignItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/pbinitem.hxx b/include/editeng/pbinitem.hxx index 8bdeba98c281..d6bf7229b676 100644 --- a/include/editeng/pbinitem.hxx +++ b/include/editeng/pbinitem.hxx @@ -42,7 +42,7 @@ public: const sal_uInt8 nTray = PAPERBIN_PRINTER_SETTINGS ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPaperBinItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/editeng/pgrditem.hxx b/include/editeng/pgrditem.hxx index d23967faba1c..ef8c24e66290 100644 --- a/include/editeng/pgrditem.hxx +++ b/include/editeng/pgrditem.hxx @@ -37,7 +37,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxParaGridItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx index cc3f8120e200..f4bfa53c47fa 100644 --- a/include/editeng/pmdlitem.hxx +++ b/include/editeng/pmdlitem.hxx @@ -41,7 +41,7 @@ public: inline SvxPageModelItem( const OUString& rModel, bool bA /*= false*/, sal_uInt16 nWh ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPageModelItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx index 59fe71590098..93ed44b6b794 100644 --- a/include/editeng/postitem.hxx +++ b/include/editeng/postitem.hxx @@ -44,7 +44,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPostureItem* Clone( SfxItemPool *pPool = nullptr ) const override; static OUString GetValueTextByPos( sal_uInt16 nPos ); virtual sal_uInt16 GetValueCount() const override; diff --git a/include/editeng/prntitem.hxx b/include/editeng/prntitem.hxx index 1ba68e1f5267..8f0e6a8fc855 100644 --- a/include/editeng/prntitem.hxx +++ b/include/editeng/prntitem.hxx @@ -38,7 +38,7 @@ public: explicit SvxPrintItem( const sal_uInt16 nId , const bool bPrt = true ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPrintItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx index 9709c3f1e46c..4f3f1c4acd22 100644 --- a/include/editeng/protitem.hxx +++ b/include/editeng/protitem.hxx @@ -51,7 +51,7 @@ public: OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxProtectItem* Clone( SfxItemPool *pPool = nullptr ) const override; bool IsContentProtected() const { return bCntnt; } bool IsSizeProtected() const { return bSize; } diff --git a/include/editeng/rsiditem.hxx b/include/editeng/rsiditem.hxx index 482338f158f3..78ab9b8bface 100644 --- a/include/editeng/rsiditem.hxx +++ b/include/editeng/rsiditem.hxx @@ -26,7 +26,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SvxRsidItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx index a28a02e8204b..9a4cac3de2b5 100644 --- a/include/editeng/scriptspaceitem.hxx +++ b/include/editeng/scriptspaceitem.hxx @@ -36,7 +36,7 @@ public: SvxScriptSpaceItem( bool bOn /*= false*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxScriptSpaceItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/scripttypeitem.hxx b/include/editeng/scripttypeitem.hxx index 7fb5a74a9056..e69ea0bdc4da 100644 --- a/include/editeng/scripttypeitem.hxx +++ b/include/editeng/scripttypeitem.hxx @@ -28,7 +28,7 @@ class EDITENG_DLLPUBLIC SvxScriptSetItem final : public SfxSetItem public: SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxScriptSetItem* Clone( SfxItemPool *pPool = nullptr ) const override; static const SfxPoolItem* GetItemOfScriptSet( const SfxItemSet& rSet, sal_uInt16 nWhich ); diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx index 80f7adb2e4f8..8a843c84b19a 100644 --- a/include/editeng/shaditem.hxx +++ b/include/editeng/shaditem.hxx @@ -57,7 +57,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxShadowItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx index 5b494ca7b620..dbe30a672265 100644 --- a/include/editeng/shdditem.hxx +++ b/include/editeng/shdditem.hxx @@ -38,7 +38,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxShadowedItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx index bd4f86f7d070..c1ff51f5ae3e 100644 --- a/include/editeng/sizeitem.hxx +++ b/include/editeng/sizeitem.hxx @@ -51,7 +51,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxSizeItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx index 37c5e4ab610d..553e3263f7a5 100644 --- a/include/editeng/spltitem.hxx +++ b/include/editeng/spltitem.hxx @@ -44,7 +44,7 @@ public: SvxFormatSplitItem & operator =(SvxFormatSplitItem &&) = delete; // due to SfxBoolItem // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxFormatSplitItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx index 48b5817dd7f5..b5aab04bc92d 100644 --- a/include/editeng/tstpitem.hxx +++ b/include/editeng/tstpitem.hxx @@ -139,7 +139,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxTabStopItem* Clone( SfxItemPool *pPool = nullptr ) const override; void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; diff --git a/include/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx index 34bc607aa22c..d39a3ac6035d 100644 --- a/include/editeng/twolinesitem.hxx +++ b/include/editeng/twolinesitem.hxx @@ -41,7 +41,7 @@ public: // "pure virtual Methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SvxTwoLinesItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx index 7240f0ef4c5f..e190348bb6ac 100644 --- a/include/editeng/udlnitem.hxx +++ b/include/editeng/udlnitem.hxx @@ -41,7 +41,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxTextLineItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetValueCount() const override; @@ -77,7 +77,7 @@ public: SvxUnderlineItem( const FontLineStyle eSt, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxUnderlineItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; }; @@ -93,7 +93,7 @@ public: SvxOverlineItem( const FontLineStyle eSt, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxOverlineItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; }; diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx index c9196bafcece..e6686d658911 100644 --- a/include/editeng/ulspitem.hxx +++ b/include/editeng/ulspitem.hxx @@ -56,7 +56,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxULSpaceItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx index 4a7161294cc9..121cfcf318a6 100644 --- a/include/editeng/wghtitem.hxx +++ b/include/editeng/wghtitem.hxx @@ -44,7 +44,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxWeightItem* Clone( SfxItemPool *pPool = nullptr ) const override; static OUString GetValueTextByPos( sal_uInt16 nPos ); virtual sal_uInt16 GetValueCount() const override; diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx index 0eb8f76f6231..5d64962d32ef 100644 --- a/include/editeng/widwitem.hxx +++ b/include/editeng/widwitem.hxx @@ -37,7 +37,7 @@ public: SvxWidowsItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxWidowsItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx index cab2cea86ea4..f9e116d76897 100644 --- a/include/editeng/writingmodeitem.hxx +++ b/include/editeng/writingmodeitem.hxx @@ -37,7 +37,7 @@ public: SvxWritingModeItem & operator =(SvxWritingModeItem const &) = delete; // due to SfxUInt16Item SvxWritingModeItem & operator =(SvxWritingModeItem &&) = delete; // due to SfxUInt16Item - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxWritingModeItem* Clone( SfxItemPool *pPool = nullptr ) const override; css::text::WritingMode GetValue() const { return static_cast<css::text::WritingMode>(SfxUInt16Item::GetValue()); } virtual bool GetPresentation( SfxItemPresentation ePres, diff --git a/include/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx index 159f9d7b2607..6226d3262e07 100644 --- a/include/editeng/wrlmitem.hxx +++ b/include/editeng/wrlmitem.hxx @@ -39,7 +39,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxWordLineModeItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx index f5c20b3aa912..b5eb190fb5e2 100644 --- a/include/editeng/xmlcnitm.hxx +++ b/include/editeng/xmlcnitm.hxx @@ -48,7 +48,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual SfxPoolItem *Clone( SfxItemPool * = nullptr) const override + virtual SvXMLAttrContainerItem* Clone( SfxItemPool * = nullptr) const override { return new SvXMLAttrContainerItem( *this ); } bool AddAttr( const OUString& rLName, diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 925709b759e4..f08855ee8d18 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -87,7 +87,7 @@ public: SfxLinkItem( sal_uInt16 nWhichId, const Link<SfxPoolItem const *, void>& rValue ) : SfxPoolItem( nWhichId ) { aLink = rValue; } - virtual SfxPoolItem* Clone( SfxItemPool* = nullptr ) const override + virtual SfxLinkItem* Clone( SfxItemPool* = nullptr ) const override { return new SfxLinkItem( *this ); } virtual bool operator==( const SfxPoolItem& rL) const override { return static_cast<const SfxLinkItem&>(rL).aLink == aLink; } diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index b02a3138b6c8..559e529df658 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -153,7 +153,7 @@ public: GetCmisProperties() const { return m_aCmisProperties;} void SetCmisProperties(const css::uno::Sequence< css::document::CmisProperty >& cmisProps ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SfxDocumentInfoItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index 8226b711e133..0233f0810cee 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -77,7 +77,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxEventNamesItem* Clone( SfxItemPool *pPool = nullptr ) const override; const SfxEventNamesList& GetEvents() const { return aEventsList;} void AddEvent( const OUString&, const OUString&, SvMacroItemId ); diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index ed25e05d97d5..65fdd26ebefb 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -168,7 +168,7 @@ public: SfxFrameItem( sal_uInt16 nWhich, SfxFrame *p ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxFrameItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -186,7 +186,7 @@ public: const css::uno::Any& GetValue() const { return aValue; } virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxUnoAnyItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; @@ -204,7 +204,7 @@ public: GetFrame() const { return m_xFrame; } virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxUnoFrameItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx index 8132db6aad3b..8727b7815abd 100644 --- a/include/sfx2/minfitem.hxx +++ b/include/sfx2/minfitem.hxx @@ -43,7 +43,7 @@ public: const OUString &rMethodName, const OUString &rComment); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxMacroInfoItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; const OUString& GetMethod() const { return aMethodName; } diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx index 4285166b9398..b7374aa8a4f4 100644 --- a/include/sfx2/objitem.hxx +++ b/include/sfx2/objitem.hxx @@ -34,7 +34,7 @@ public: SfxObjectItem( sal_uInt16 nWhich=0, SfxShell *pSh=nullptr ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxObjectItem* Clone( SfxItemPool *pPool = nullptr ) const override; SfxShell* GetShell() const { return _pSh; } diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 0352f2f1ac2a..35fc43ad2b1d 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -870,7 +870,7 @@ public: {} virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxObjectShellItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index b8229ca338a0..f4c4b9c7b14b 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -46,7 +46,7 @@ class SFX2_DLLPUBLIC SfxTabDialogItem final : public SfxSetItem public: SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet ); SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool); - virtual SfxPoolItem* Clone(SfxItemPool* pToPool = nullptr) const override; + virtual SfxTabDialogItem* Clone(SfxItemPool* pToPool = nullptr) const override; }; class SFX2_DLLPUBLIC SfxTabDialogController : public SfxOkDialogController diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx index 9276ab5524ad..927d67e89625 100644 --- a/include/sfx2/tplpitem.hxx +++ b/include/sfx2/tplpitem.hxx @@ -36,7 +36,7 @@ public: const OUString& GetStyleName() const { return aStyle; } - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxTemplateItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual sal_uInt8 GetFlagCount() const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 20bcc4904fcb..8367cff4583b 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -260,7 +260,7 @@ public: {} virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxViewFrameItem* Clone( SfxItemPool *pPool = nullptr ) const override; SfxViewFrame* GetFrame() const { return pFrame; } diff --git a/include/sfx2/watermarkitem.hxx b/include/sfx2/watermarkitem.hxx index 4af89357d214..c298894bb518 100644 --- a/include/sfx2/watermarkitem.hxx +++ b/include/sfx2/watermarkitem.hxx @@ -18,7 +18,7 @@ class SFX2_DLLPUBLIC SfxWatermarkItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); SfxWatermarkItem(); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxWatermarkItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx index 4bc7a682cea0..32285cb704cd 100644 --- a/include/sfx2/zoomitem.hxx +++ b/include/sfx2/zoomitem.hxx @@ -69,7 +69,7 @@ public: SvxZoomType GetType() const { return eType; } void SetType( SvxZoomType eNewType ) { eType = eNewType; } - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxZoomItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx index 9b2c942b0066..9778b67e8ad9 100644 --- a/include/svl/aeitem.hxx +++ b/include/svl/aeitem.hxx @@ -38,7 +38,7 @@ public: void SetTextByPos( sal_uInt16 nPos, const OUString &rText ); OUString const & GetTextByPos( sal_uInt16 nPos ) const; sal_Int32 GetTextCount() const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxAllEnumItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( SfxPoolItem const & ) const override; }; diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index 5176d150629c..bde59c39906b 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -47,7 +47,7 @@ public: virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + virtual CntByteItem* Clone(SfxItemPool * = nullptr) const override; sal_uInt8 GetValue() const { return m_nValue; } @@ -84,7 +84,7 @@ public: virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + virtual CntUInt16Item* Clone(SfxItemPool * = nullptr) const override; sal_uInt16 GetValue() const { return m_nValue; } @@ -121,7 +121,7 @@ public: virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + virtual CntInt32Item* Clone(SfxItemPool * = nullptr) const override; sal_Int32 GetValue() const { return m_nValue; } @@ -158,7 +158,7 @@ public: virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + virtual CntUInt32Item* Clone(SfxItemPool * = nullptr) const override; sal_uInt32 GetValue() const { return m_nValue; } diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx index 5ace7fa7c5c7..d46fe011ad6c 100644 --- a/include/svl/custritm.hxx +++ b/include/svl/custritm.hxx @@ -51,7 +51,7 @@ public: virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + virtual CntUnencodedStringItem* Clone(SfxItemPool * = nullptr) const override; const OUString & GetValue() const { return m_aValue; } diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx index aaef90e75964..114e451c061d 100644 --- a/include/svl/eitem.hxx +++ b/include/svl/eitem.hxx @@ -97,7 +97,7 @@ public: virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8) override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + virtual SfxBoolItem* Clone(SfxItemPool * = nullptr) const override; virtual OUString GetValueTextByVal(bool bTheValue) const; }; diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx index db061e38c326..70b968f2c95c 100644 --- a/include/svl/flagitem.hxx +++ b/include/svl/flagitem.hxx @@ -37,7 +37,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxFlagItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx index a3ab6d3e11a6..edbb56273232 100644 --- a/include/svl/globalnameitem.hxx +++ b/include/svl/globalnameitem.hxx @@ -40,7 +40,7 @@ public: SfxGlobalNameItem & operator =(SfxGlobalNameItem &&) = delete; // due to SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxGlobalNameItem* Clone( SfxItemPool *pPool = nullptr ) const override; const SvGlobalName& GetValue() const { return m_aName; } virtual bool PutValue ( const css::uno::Any& rVal, diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx index 3614e79a18e5..77a619aec4c1 100644 --- a/include/svl/grabbagitem.hxx +++ b/include/svl/grabbagitem.hxx @@ -36,7 +36,7 @@ public: std::map<OUString, css::uno::Any>& GetGrabBag() { return m_aMap; } bool operator==(const SfxPoolItem& rItem) const override; - SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + SfxGrabBagItem* Clone(SfxItemPool* pPool = nullptr) const override; bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override; diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx index 592743d71182..ec40762b6a43 100644 --- a/include/svl/ilstitem.hxx +++ b/include/svl/ilstitem.hxx @@ -45,7 +45,7 @@ public: const std::vector< sal_Int32 >& GetList() const { return m_aList; } virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxIntegerListItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool PutValue ( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; }; diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx index cee429ba892b..ccecc5356637 100644 --- a/include/svl/imageitm.hxx +++ b/include/svl/imageitm.hxx @@ -34,7 +34,7 @@ public: SfxImageItem( const SfxImageItem& ); virtual ~SfxImageItem() override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SfxImageItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx index b4f30d9b3337..70a502c645a8 100644 --- a/include/svl/int64item.hxx +++ b/include/svl/int64item.hxx @@ -39,7 +39,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual SfxPoolItem* Clone( SfxItemPool* pOther = nullptr ) const override; + virtual SfxInt64Item* Clone( SfxItemPool* pOther = nullptr ) const override; sal_Int64 GetValue() const { return mnValue;} diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index 5bf9785cbf43..92999568b7f2 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -33,7 +33,7 @@ public: explicit SfxByteItem(sal_uInt16 which = 0, sal_uInt8 nValue = 0): CntByteItem(which, nValue) {} - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override + virtual SfxByteItem* Clone(SfxItemPool * = nullptr) const override { return new SfxByteItem(*this); } }; @@ -64,7 +64,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + virtual SfxInt16Item* Clone(SfxItemPool * = nullptr) const override; sal_Int16 GetValue() const { return m_nValue; } @@ -86,7 +86,7 @@ public: explicit SfxUInt16Item(sal_uInt16 which = 0, sal_uInt16 nValue = 0): CntUInt16Item(which, nValue) {} - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override + virtual SfxUInt16Item* Clone(SfxItemPool * = nullptr) const override { return new SfxUInt16Item(*this); } void dumpAsXml(xmlTextWriterPtr pWriter) const override; @@ -102,7 +102,7 @@ public: explicit SfxInt32Item(sal_uInt16 which = 0, sal_Int32 nValue = 0): CntInt32Item(which, nValue) {} - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override + virtual SfxInt32Item* Clone(SfxItemPool * = nullptr) const override { return new SfxInt32Item(*this); } void dumpAsXml(xmlTextWriterPtr pWriter) const override; @@ -118,7 +118,7 @@ public: explicit SfxUInt32Item(sal_uInt16 which = 0, sal_uInt32 nValue = 0): CntUInt32Item(which, nValue) {} - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override + virtual SfxUInt32Item* Clone(SfxItemPool * = nullptr) const override { return new SfxUInt32Item(*this); } void dumpAsXml(xmlTextWriterPtr pWriter) const override; diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx index 0e0f7dd6dd81..5625a7aac098 100644 --- a/include/svl/lckbitem.hxx +++ b/include/svl/lckbitem.hxx @@ -38,7 +38,7 @@ public: SfxLockBytesItem & operator =(SfxLockBytesItem &&) = delete; // due to SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxLockBytesItem* Clone( SfxItemPool *pPool = nullptr ) const override; SvLockBytes* GetValue() const { return _xVal.get(); } diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index f796d1d3586b..19a49dde97c3 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -118,7 +118,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxMacroItem* Clone( SfxItemPool *pPool = nullptr ) const override; const SvxMacroTableDtor& GetMacroTable() const { return aMacroTable;} void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aMacroTable = rTbl; } diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index d3b95e0cf9f5..f1bb0cfab4d3 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -268,7 +268,7 @@ public: virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override; // create a copy of itself - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxVoidItem* Clone( SfxItemPool *pPool = nullptr ) const override; /** Always returns true as this is an SfxVoidItem. */ virtual bool IsVoidItem() const override; @@ -295,7 +295,7 @@ public: const IntlWrapper& ) const override; // create a copy of itself - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override = 0; + virtual SfxSetItem* Clone( SfxItemPool *pPool = nullptr ) const override = 0; const SfxItemSet& GetItemSet() const { return *pSet; } diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index c98a2fe81adf..2ceb39410695 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.hxx @@ -43,7 +43,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxPointItem* Clone( SfxItemPool *pPool = nullptr ) const override; const Point& GetValue() const { return aVal; } void SetValue( const Point& rNewVal ) { diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index 5da145bb2da9..94465bad4149 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -41,7 +41,7 @@ public: const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxRectangleItem* Clone( SfxItemPool *pPool = nullptr ) const override; const tools::Rectangle& GetValue() const { return aVal; } virtual bool QueryValue( css::uno::Any& rVal, diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index 5b33e3d3574d..08404d83e6ef 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -39,7 +39,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxRangeItem* Clone( SfxItemPool *pPool = nullptr ) const override; sal_uInt16& From() { return nFrom; } }; diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index ef2a1b83b8b5..9215cf82d7c8 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -60,7 +60,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxStringListItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool PutValue ( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index 9b46d07e26b2..c7f7381f77c6 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -99,7 +99,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool operator == ( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxSearchItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/svl/stritem.hxx b/include/svl/stritem.hxx index 37546d88b4b2..fe3695f7947b 100644 --- a/include/svl/stritem.hxx +++ b/include/svl/stritem.hxx @@ -34,7 +34,7 @@ public: SfxStringItem(sal_uInt16 which, const OUString & rValue): CntUnencodedStringItem(which, rValue) {} - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + virtual SfxStringItem* Clone(SfxItemPool * = nullptr) const override; void dumpAsXml(xmlTextWriterPtr pWriter) const override; diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index 457ac02f7e68..4ae5cdd550c1 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -49,7 +49,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + virtual SfxVisibilityItem* Clone(SfxItemPool * = nullptr) const override; bool GetValue() const { return m_nValue.bVisible; } }; diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx index 6b3cbebf872f..4c9f9cf06a6c 100644 --- a/include/svx/AffineMatrixItem.hxx +++ b/include/svx/AffineMatrixItem.hxx @@ -37,7 +37,7 @@ public: virtual ~AffineMatrixItem() override; virtual bool operator==(const SfxPoolItem&) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual AffineMatrixItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx index 00f52f7883dc..3fe96af56fd2 100644 --- a/include/svx/SmartTagItem.hxx +++ b/include/svx/SmartTagItem.hxx @@ -63,7 +63,7 @@ public: // "purely virtual methods" from the SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxSmartTagItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index 67837566c81e..cb37a21ba869 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -50,7 +50,7 @@ public: virtual sal_uInt16 GetValueCount() const override; static OUString GetValueText( SvxCellOrientation nVal ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxOrientationItem* Clone( SfxItemPool *pPool = nullptr ) const override; /** Returns sal_True, if the item represents STACKED state. */ bool IsStacked() const; @@ -77,7 +77,7 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxMarginItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index a1e4f8d8edbc..07b0b5eea7c5 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -83,7 +83,7 @@ public: SvxChartRegressItem(SvxChartRegress eRegress /*= SvxChartRegress::Linear*/, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual SvxChartRegressItem* Clone(SfxItemPool* pPool = nullptr) const override; sal_uInt16 GetValueCount() const override { return CHREGRESS_COUNT; } }; @@ -94,7 +94,7 @@ public: SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= SvxChartTextOrder::SideBySide*/, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual SvxChartTextOrderItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -108,7 +108,7 @@ public: SvxChartKindErrorItem(SvxChartKindError /*eOrient = SvxChartKindError::NONE*/, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual SvxChartKindErrorItem* Clone(SfxItemPool* pPool = nullptr) const override; sal_uInt16 GetValueCount() const override { return CHERROR_COUNT; } }; @@ -119,7 +119,7 @@ public: SvxChartIndicateItem(SvxChartIndicate eOrient /*= SvxChartIndicate::NONE*/, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual SvxChartIndicateItem* Clone(SfxItemPool* pPool = nullptr) const override; sal_uInt16 GetValueCount() const override { return CHINDICATE_COUNT; } }; @@ -142,7 +142,7 @@ public: OUString &rText, const IntlWrapper&) const override; virtual bool operator == (const SfxPoolItem&) const override; - virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override; + virtual SvxDoubleItem* Clone(SfxItemPool *pPool = nullptr) const override; double GetValue() const { return fVal; } }; diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx index 3ea11ca0ead4..74054a1d88bf 100644 --- a/include/svx/clipfmtitem.hxx +++ b/include/svx/clipfmtitem.hxx @@ -34,7 +34,7 @@ struct SvxClipboardFormatItem_Impl; class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxClipboardFormatItem final : public SfxPoolItem { virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxClipboardFormatItem* Clone( SfxItemPool *pPool = nullptr ) const override; public: static SfxPoolItem* CreateDefault(); diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx index f49c0833a252..a7b0933559a4 100644 --- a/include/svx/drawitem.hxx +++ b/include/svx/drawitem.hxx @@ -41,7 +41,7 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxColorListItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -66,7 +66,7 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxGradientListItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -90,7 +90,7 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxHatchListItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -115,7 +115,7 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxBitmapListItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -139,7 +139,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPatternListItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -164,7 +164,7 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxDashListItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -189,7 +189,7 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxLineEndListItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx index 20e030980e62..8216c61ab3a1 100644 --- a/include/svx/e3ditem.hxx +++ b/include/svx/e3ditem.hxx @@ -34,7 +34,7 @@ public: virtual ~SvxB3DVectorItem() override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxB3DVectorItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx index ed8b635ced66..aa513ed270c0 100644 --- a/include/svx/galleryitem.hxx +++ b/include/svx/galleryitem.hxx @@ -57,7 +57,7 @@ public: // pure virtual methods from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxGalleryItem* Clone( SfxItemPool *pPool = nullptr ) const override; // bridge to UNO virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx index f51749e0d448..08eded81b517 100644 --- a/include/svx/hlnkitem.hxx +++ b/include/svx/hlnkitem.hxx @@ -70,7 +70,7 @@ public: SvxMacroTableDtor const *pMacroTbl ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxHyperlinkItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx index b10a2e144e09..de3c88101449 100644 --- a/include/svx/numinf.hxx +++ b/include/svx/numinf.hxx @@ -44,7 +44,7 @@ public: virtual ~SvxNumberInfoItem() override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxNumberInfoItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/ofaitem.hxx b/include/svx/ofaitem.hxx index f36c3d904ff1..1d8b5e2ceeca 100644 --- a/include/svx/ofaitem.hxx +++ b/include/svx/ofaitem.hxx @@ -32,7 +32,7 @@ public: OfaPtrItem( sal_uInt16 nWhich, void *pPtr ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual OfaPtrItem* Clone( SfxItemPool *pPool = nullptr ) const override; void* GetValue() const { return pPtr; } }; @@ -51,7 +51,7 @@ public: return SfxPoolItem::operator==(rItem) && mxRef == static_cast<OfaRefItem<reference_type> const &>(rItem).mxRef; } - virtual SfxPoolItem* Clone( SfxItemPool* /*pPool = 0*/ ) const override + virtual OfaRefItem<reference_type>* Clone( SfxItemPool* /*pPool = 0*/ ) const override { return new OfaRefItem( *this ); } diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index ba3c21c63ce3..33be89ecb89a 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -76,7 +76,7 @@ class SVX_DLLPUBLIC SvxGridItem : public SvxOptionsGrid, public SfxPoolItem public: SvxGridItem( sal_uInt16 _nWhich) : SfxPoolItem(_nWhich){}; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxGridItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index f47bcdf463c5..b22eb15e1e47 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -65,7 +65,7 @@ public: virtual ~SvxPageItem() override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPageItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, @@ -103,7 +103,7 @@ public: SvxSetItem( const SvxSetItem& rItem ); SvxSetItem( const sal_uInt16 nId, std::unique_ptr<SfxItemSet>&& pSet ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxSetItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx index b175c208cb63..2ff44c84b344 100644 --- a/include/svx/postattr.hxx +++ b/include/svx/postattr.hxx @@ -38,7 +38,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPostItAuthorItem* Clone( SfxItemPool *pPool = nullptr ) const override; }; @@ -58,7 +58,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPostItDateItem* Clone( SfxItemPool *pPool = nullptr ) const override; }; /** The text of a note @@ -78,7 +78,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPostItTextItem* Clone( SfxItemPool *pPool = nullptr ) const override; }; @@ -92,7 +92,7 @@ public: SvxPostItIdItem( sal_uInt16 nWhich ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPostItIdItem* Clone( SfxItemPool *pPool = nullptr ) const override; }; #endif diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index 013bf98d1240..0c2e6bfb50aa 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -44,7 +44,7 @@ public: virtual ~SvxRotateModeItem() override; virtual sal_uInt16 GetValueCount() const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxRotateModeItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index 7b7a33b8e8fc..2f0df198f099 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -38,7 +38,7 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem final : public SfxPoolItem MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxLongLRSpaceItem* Clone( SfxItemPool *pPool = nullptr ) const override; const SvxLongLRSpaceItem& operator=(const SvxLongLRSpaceItem &) = delete; @@ -67,7 +67,7 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem final : public SfxPoolItem MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxLongULSpaceItem* Clone( SfxItemPool *pPool = nullptr ) const override; const SvxLongULSpaceItem& operator=(const SvxLongULSpaceItem &) = delete; @@ -97,7 +97,7 @@ class SVX_DLLPUBLIC SvxPagePosSizeItem final : public SfxPoolItem MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPagePosSizeItem* Clone( SfxItemPool *pPool = nullptr ) const override; private: const SvxPagePosSizeItem& operator=(const SvxPagePosSizeItem &) = delete; @@ -159,7 +159,7 @@ class SVX_DLLPUBLIC SvxColumnItem final : public SfxPoolItem OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxColumnItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -205,7 +205,7 @@ class SVX_DLLPUBLIC SvxObjectItem final : public SfxPoolItem MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxObjectItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx index a8a925939f7b..3ee62cef7df0 100644 --- a/include/svx/sdangitm.hxx +++ b/include/svx/sdangitm.hxx @@ -27,7 +27,7 @@ class SVX_DLLPUBLIC SdrAngleItem: public SfxInt32Item { public: SdrAngleItem(sal_uInt16 nId, sal_Int32 nAngle): SfxInt32Item(nId,nAngle) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrAngleItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index e0aeaddab83a..a66fdefdd1e0 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -64,7 +64,7 @@ private: MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper&) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrCustomShapeGeometryItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/sdgcoitm.hxx b/include/svx/sdgcoitm.hxx index 2c9c67cc8688..5031bb336dbf 100644 --- a/include/svx/sdgcoitm.hxx +++ b/include/svx/sdgcoitm.hxx @@ -35,7 +35,7 @@ public: SdrGrafRedItem( short nRedPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFRED, nRedPercent ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafRedItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; @@ -49,7 +49,7 @@ public: SdrGrafGreenItem( short nGreenPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, nGreenPercent ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafGreenItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; @@ -63,7 +63,7 @@ public: SdrGrafBlueItem( short nBluePercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, nBluePercent ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafBlueItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; #endif // INCLUDED_SVX_SDGCOITM_HXX diff --git a/include/svx/sdgcpitm.hxx b/include/svx/sdgcpitm.hxx index 26459d83c55d..ba5bd28688b8 100644 --- a/include/svx/sdgcpitm.hxx +++ b/include/svx/sdgcpitm.hxx @@ -36,7 +36,7 @@ public: sal_Int32 nRightCrop = 0, sal_Int32 nBottomCrop = 0 ) : SvxGrfCrop( nLeftCrop, nRightCrop, nTopCrop, nBottomCrop, SDRATTR_GRAFCROP ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafCropItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; #endif // INCLUDED_SVX_SDGCPITM_HXX diff --git a/include/svx/sdggaitm.hxx b/include/svx/sdggaitm.hxx index 96e0647c41bd..3d84c44e13a8 100644 --- a/include/svx/sdggaitm.hxx +++ b/include/svx/sdggaitm.hxx @@ -35,7 +35,7 @@ public: SdrGrafGamma100Item( sal_uInt32 nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100 ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafGamma100Item* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/sdginitm.hxx b/include/svx/sdginitm.hxx index 99c9bc1b2b9a..975c0b8c7be8 100644 --- a/include/svx/sdginitm.hxx +++ b/include/svx/sdginitm.hxx @@ -35,7 +35,7 @@ public: SdrGrafInvertItem( bool bInvert = false ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafInvertItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; #endif // INCLUDED_SVX_SDGINITM_HXX diff --git a/include/svx/sdgluitm.hxx b/include/svx/sdgluitm.hxx index 5fab3bdb0c44..9e2b328cd56e 100644 --- a/include/svx/sdgluitm.hxx +++ b/include/svx/sdgluitm.hxx @@ -36,7 +36,7 @@ public: SdrGrafLuminanceItem( short nLuminancePercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, nLuminancePercent ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafLuminanceItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; @@ -50,7 +50,7 @@ public: SdrGrafContrastItem( short nContrastPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFCONTRAST, nContrastPercent ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafContrastItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; #endif // INCLUDED_SVX_SDGLUITM_HXX diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index d070868b432b..94c1a3076496 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -37,7 +37,7 @@ class SVX_DLLPUBLIC SdrGrafModeItem : public SdrGrafModeItem_Base public: SdrGrafModeItem( GraphicDrawMode eMode = GraphicDrawMode::Standard ) : SdrGrafModeItem_Base( eMode ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafModeItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; static OUString GetValueTextByPos( sal_uInt16 nPos ); diff --git a/include/svx/sdgtritm.hxx b/include/svx/sdgtritm.hxx index 8e84db29f235..ed65a379303a 100644 --- a/include/svx/sdgtritm.hxx +++ b/include/svx/sdgtritm.hxx @@ -34,7 +34,7 @@ public: SdrGrafTransparenceItem( sal_uInt16 nTransparencePercent = 0 ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafTransparenceItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; #endif // INCLUDED_SVX_SDGTRITM_HXX diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx index 2dee63ee4e47..f7342778b12c 100644 --- a/include/svx/sdmetitm.hxx +++ b/include/svx/sdmetitm.hxx @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item { public: SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal): SfxInt32Item(nId,nVal) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMetricItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual bool HasMetrics() const override; virtual void ScaleMetrics(long nMul, long nDiv) override; diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx index 0e8035432890..4010c8700549 100644 --- a/include/svx/sdooitm.hxx +++ b/include/svx/sdooitm.hxx @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC SdrOnOffItem: public SfxBoolItem { public: SdrOnOffItem(sal_uInt16 nId, bool bOn): SfxBoolItem(nId,bOn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrOnOffItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual OUString GetValueTextByVal(bool bVal) const override; diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx index ee7ec94588cb..a3ad78402342 100644 --- a/include/svx/sdprcitm.hxx +++ b/include/svx/sdprcitm.hxx @@ -31,7 +31,7 @@ class SVX_DLLPUBLIC SdrPercentItem : public SfxUInt16Item { public: SdrPercentItem(sal_uInt16 nId, sal_uInt16 nVal): SfxUInt16Item(nId,nVal) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrPercentItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; @@ -45,7 +45,7 @@ class SVX_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item { public: SdrSignedPercentItem( sal_uInt16 nId, sal_Int16 nVal ) : SfxInt16Item( nId,nVal ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrSignedPercentItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx index 6d4c313a8514..03aba5f9b9fd 100644 --- a/include/svx/sdtaaitm.hxx +++ b/include/svx/sdtaaitm.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC SdrTextAniAmountItem final : public SfxInt16Item { public: SdrTextAniAmountItem(sal_Int16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrTextAniAmountItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual bool HasMetrics() const override; virtual void ScaleMetrics(long nMul, long nDiv) override; diff --git a/include/svx/sdtacitm.hxx b/include/svx/sdtacitm.hxx index bf145c8b6b6c..c8bf4b773efa 100644 --- a/include/svx/sdtacitm.hxx +++ b/include/svx/sdtacitm.hxx @@ -27,7 +27,7 @@ class SdrTextAniCountItem final : public SfxUInt16Item { public: SdrTextAniCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {} - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override + virtual SdrTextAniCountItem* Clone(SfxItemPool * = nullptr) const override { return new SdrTextAniCountItem(*this); } }; diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index 2f4c4ef78535..87788994ad6e 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -34,7 +34,7 @@ enum class SdrTextAniDirection class SVX_DLLPUBLIC SdrTextAniDirectionItem: public SfxEnumItem<SdrTextAniDirection> { public: SdrTextAniDirectionItem(SdrTextAniDirection eDir=SdrTextAniDirection::Left): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION, eDir) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrTextAniDirectionItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/sdtaiitm.hxx b/include/svx/sdtaiitm.hxx index c998393720eb..37291ce62bd8 100644 --- a/include/svx/sdtaiitm.hxx +++ b/include/svx/sdtaiitm.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC SdrTextAniStartInsideItem final : public SdrYesNoItem { public: SdrTextAniStartInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {} virtual ~SdrTextAniStartInsideItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrTextAniStartInsideItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrTextAniStartInsideItem(SdrTextAniStartInsideItem const &) = default; SdrTextAniStartInsideItem(SdrTextAniStartInsideItem &&) = default; @@ -38,7 +38,7 @@ class SVX_DLLPUBLIC SdrTextAniStopInsideItem final : public SdrYesNoItem { public: SdrTextAniStopInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {} virtual ~SdrTextAniStopInsideItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrTextAniStopInsideItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrTextAniStopInsideItem(SdrTextAniStopInsideItem const &) = default; SdrTextAniStopInsideItem(SdrTextAniStopInsideItem &&) = default; diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index bfedb5c39117..5a7ecdfc73bf 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -36,7 +36,7 @@ class SVX_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem<SdrTextVertAdjust> public: SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST, eAdj) {} SdrTextVertAdjustItem(SdrTextVertAdjust eAdj, sal_uInt16 nWhich): SfxEnumItem(nWhich, eAdj) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrTextVertAdjustItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 5; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -59,7 +59,7 @@ enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // left adjusted class SVX_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem<SdrTextHorzAdjust> { public: SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST, eAdj) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrTextHorzAdjustItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index 5c06ef484378..d4d481cf40f7 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -79,7 +79,7 @@ enum class SdrTextAniKind { class SVX_DLLPUBLIC SdrTextAniKindItem: public SfxEnumItem<SdrTextAniKind> { public: SdrTextAniKindItem(SdrTextAniKind eKind=SdrTextAniKind::NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND, eKind) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrTextAniKindItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 5; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx index 774a1ef135e8..b20172854838 100644 --- a/include/svx/sdtayitm.hxx +++ b/include/svx/sdtayitm.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC SdrTextAniDelayItem final : public SfxUInt16Item { public: SdrTextAniDelayItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,nVal) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrTextAniDelayItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx index 3120647c7726..03faae2747b5 100644 --- a/include/svx/sdtfchim.hxx +++ b/include/svx/sdtfchim.hxx @@ -32,7 +32,7 @@ public: MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper&) const override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual SdrTextFixedCellHeightItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index ac5b71cec722..c95b5dd6754c 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -38,7 +38,7 @@ public: SdrTextFitToSizeTypeItem( css::drawing::TextFitToSizeType const eFit = css::drawing::TextFitToSizeType_NONE) : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE, eFit) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrTextFitToSizeTypeItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx index 33bdcd0e4934..d17fbdfa1f69 100644 --- a/include/svx/sdynitm.hxx +++ b/include/svx/sdynitm.hxx @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC SdrYesNoItem: public SfxBoolItem { public: SdrYesNoItem(sal_uInt16 nId, bool bOn): SfxBoolItem(nId,bOn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrYesNoItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual OUString GetValueTextByVal(bool bVal) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx index 831a02984dbf..0a079e1f060d 100644 --- a/include/svx/svdpool.hxx +++ b/include/svx/svdpool.hxx @@ -36,7 +36,7 @@ private: virtual ~SdrItemPool() override; public: - virtual SfxItemPool* Clone() const override; + virtual SdrItemPool* Clone() const override; virtual bool GetPresentation(const SfxPoolItem& rItem, MapUnit ePresentationMetric, OUString& rText, diff --git a/include/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx index 7a7d663e77c6..58887e2ac04a 100644 --- a/include/svx/svx3ditems.hxx +++ b/include/svx/svx3ditems.hxx @@ -63,7 +63,7 @@ inline SfxBoolItem makeSvx3DDoubleSidedItem(bool bVal) { class Svx3DReducedLineGeometryItem : public SfxBoolItem { public: Svx3DReducedLineGeometryItem(bool bVal = false); - SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + Svx3DReducedLineGeometryItem* Clone(SfxItemPool * = nullptr) const override; }; class SVX_DLLPUBLIC Svx3DNormalsKindItem : public SfxUInt16Item { @@ -73,7 +73,7 @@ public: // use drawing::NormalsKind SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + SVX_DLLPRIVATE virtual Svx3DNormalsKindItem* Clone(SfxItemPool* pPool = nullptr) const override; }; inline SfxBoolItem makeSvx3DNormalsInvertItem(bool bVal) { @@ -87,7 +87,7 @@ public: // use drawing::TextureProjectionMode SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + SVX_DLLPRIVATE virtual Svx3DTextureProjectionXItem* Clone(SfxItemPool* pPool = nullptr) const override; }; class SVX_DLLPUBLIC Svx3DTextureProjectionYItem : public SfxUInt16Item { @@ -97,7 +97,7 @@ public: // use drawing::TextureProjectionMode virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual Svx3DTextureProjectionYItem* Clone(SfxItemPool* pPool = nullptr) const override; }; inline SfxBoolItem makeSvx3DShadow3DItem(bool bVal) { @@ -123,7 +123,7 @@ public: // use drawing::TextureKind SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + SVX_DLLPRIVATE virtual Svx3DTextureKindItem* Clone(SfxItemPool* pPool = nullptr) const override; }; class SVX_DLLPUBLIC Svx3DTextureModeItem final : public SfxUInt16Item { @@ -133,7 +133,7 @@ public: // use drawing:TextureMode SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + SVX_DLLPRIVATE virtual Svx3DTextureModeItem* Clone(SfxItemPool* pPool = nullptr) const override; }; inline SfxBoolItem makeSvx3DTextureFilterItem(bool bVal) { @@ -148,7 +148,7 @@ public: // use drawing::ProjectionMode SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + SVX_DLLPRIVATE virtual Svx3DPerspectiveItem* Clone(SfxItemPool* pPool = nullptr) const override; }; inline SfxUInt32Item makeSvx3DDistanceItem(sal_uInt32 nVal) { @@ -274,7 +274,7 @@ public: // use drawing::ShadeMode SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + SVX_DLLPRIVATE virtual Svx3DShadeModeItem* Clone(SfxItemPool* pPool = nullptr) const override; }; @@ -282,35 +282,35 @@ public: class Svx3DSmoothNormalsItem : public SfxBoolItem { public: Svx3DSmoothNormalsItem(bool bVal = true); - SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + Svx3DSmoothNormalsItem* Clone(SfxItemPool * = nullptr) const override; }; // #107245# Item to replace bExtrudeSmoothFrontBack and bLatheSmoothFrontBack class Svx3DSmoothLidsItem : public SfxBoolItem { public: Svx3DSmoothLidsItem(bool bVal = false); - SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + Svx3DSmoothLidsItem* Clone(SfxItemPool * = nullptr) const override; }; // #107245# Item to replace bExtrudeCharacterMode and bLatheCharacterMode class Svx3DCharacterModeItem : public SfxBoolItem { public: Svx3DCharacterModeItem(bool bVal = false); - SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + Svx3DCharacterModeItem* Clone(SfxItemPool * = nullptr) const override; }; // #107245# Item to replace bExtrudeCloseFront and bLatheCloseFront class SVX_DLLPUBLIC Svx3DCloseFrontItem : public SfxBoolItem { public: Svx3DCloseFrontItem(bool bVal = true); - SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + Svx3DCloseFrontItem* Clone(SfxItemPool * = nullptr) const override; }; // #107245# Item to replace bExtrudeCloseBack and bLatheCloseBack class SVX_DLLPUBLIC Svx3DCloseBackItem : public SfxBoolItem { public: Svx3DCloseBackItem(bool bVal = true); - SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + Svx3DCloseBackItem* Clone(SfxItemPool * = nullptr) const override; }; #endif // INCLUDED_SVX_SVX3DITEMS_HXX diff --git a/include/svx/svxgrahicitem.hxx b/include/svx/svxgrahicitem.hxx index c946047b440d..cff7f6ad4a49 100644 --- a/include/svx/svxgrahicitem.hxx +++ b/include/svx/svxgrahicitem.hxx @@ -33,7 +33,7 @@ public: SvxGraphicItem( const Graphic& rGraphic); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxGraphicItem* Clone( SfxItemPool *pPool = nullptr ) const override; const Graphic& GetGraphic() const { return aGraphic; } diff --git a/include/svx/sxcaitm.hxx b/include/svx/sxcaitm.hxx index 28b14614d040..50ed46c0c5ce 100644 --- a/include/svx/sxcaitm.hxx +++ b/include/svx/sxcaitm.hxx @@ -35,7 +35,7 @@ class SdrCaptionAngleItem final : public SdrAngleItem { public: SdrCaptionAngleItem(long nAngle=0): SdrAngleItem(SDRATTR_CAPTIONANGLE,nAngle) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrCaptionAngleItem* Clone(SfxItemPool*) const override { return new SdrCaptionAngleItem(*this); } diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index d3617f94bbd6..f15dc1a30ecc 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -33,7 +33,7 @@ enum class SdrCaptionEscDir { Horizontal, Vertical, BestFit }; class SVX_DLLPUBLIC SdrCaptionEscDirItem: public SfxEnumItem<SdrCaptionEscDir> { public: SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SdrCaptionEscDir::Horizontal): SfxEnumItem(SDRATTR_CAPTIONESCDIR, eDir) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrCaptionEscDirItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 3; } static OUString GetValueTextByPos(sal_uInt16 nPos); @@ -50,7 +50,7 @@ class SVX_DLLPUBLIC SdrCaptionEscIsRelItem: public SdrYesNoItem { public: SdrCaptionEscIsRelItem(bool bRel=true): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {} virtual ~SdrCaptionEscIsRelItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrCaptionEscIsRelItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrCaptionEscIsRelItem(SdrCaptionEscIsRelItem const &) = default; SdrCaptionEscIsRelItem(SdrCaptionEscIsRelItem &&) = default; @@ -69,7 +69,7 @@ class SVX_DLLPUBLIC SdrCaptionEscRelItem: public SfxInt32Item { public: SdrCaptionEscRelItem(long nEscRel=5000): SfxInt32Item(SDRATTR_CAPTIONESCREL,nEscRel) {} virtual ~SdrCaptionEscRelItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrCaptionEscRelItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrCaptionEscRelItem(SdrCaptionEscRelItem const &) = default; SdrCaptionEscRelItem(SdrCaptionEscRelItem &&) = default; @@ -87,7 +87,7 @@ public: class SdrCaptionEscAbsItem: public SdrMetricItem { public: SdrCaptionEscAbsItem(long nEscAbs=0): SdrMetricItem(SDRATTR_CAPTIONESCABS,nEscAbs) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrCaptionEscAbsItem* Clone(SfxItemPool*) const override { return new SdrCaptionEscAbsItem(*this); } diff --git a/include/svx/sxcgitm.hxx b/include/svx/sxcgitm.hxx index af3229c25e85..e39fff4446aa 100644 --- a/include/svx/sxcgitm.hxx +++ b/include/svx/sxcgitm.hxx @@ -29,7 +29,7 @@ class SdrCaptionGapItem final : public SdrMetricItem { public: SdrCaptionGapItem(long nGap=0) : SdrMetricItem(SDRATTR_CAPTIONGAP,nGap) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrCaptionGapItem* Clone(SfxItemPool*) const override { return new SdrCaptionGapItem(*this); } diff --git a/include/svx/sxcllitm.hxx b/include/svx/sxcllitm.hxx index 4ee4c13dbae0..0ff0f48ca56e 100644 --- a/include/svx/sxcllitm.hxx +++ b/include/svx/sxcllitm.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SdrCaptionLineLenItem: public SdrMetricItem { public: SdrCaptionLineLenItem(long nLineLen=0): SdrMetricItem(SDRATTR_CAPTIONLINELEN,nLineLen) {} virtual ~SdrCaptionLineLenItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrCaptionLineLenItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrCaptionLineLenItem(SdrCaptionLineLenItem const &) = default; SdrCaptionLineLenItem(SdrCaptionLineLenItem &&) = default; @@ -48,7 +48,7 @@ class SVX_DLLPUBLIC SdrCaptionFitLineLenItem: public SdrYesNoItem { public: SdrCaptionFitLineLenItem(bool bBestFit=true): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {} virtual ~SdrCaptionFitLineLenItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrCaptionFitLineLenItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrCaptionFitLineLenItem(SdrCaptionFitLineLenItem const &) = default; SdrCaptionFitLineLenItem(SdrCaptionFitLineLenItem &&) = default; diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx index f08c8acbbf5d..8bd222fe6d58 100644 --- a/include/svx/sxctitm.hxx +++ b/include/svx/sxctitm.hxx @@ -30,7 +30,7 @@ enum class SdrCaptionType { Type1, Type2, Type3, Type4 }; class SVX_DLLPUBLIC SdrCaptionTypeItem: public SfxEnumItem<SdrCaptionType> { public: SdrCaptionTypeItem(SdrCaptionType eStyle=SdrCaptionType::Type3): SfxEnumItem(SDRATTR_CAPTIONTYPE, eStyle) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrCaptionTypeItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 4; } static OUString GetValueTextByPos(sal_uInt16 nPos); virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index 2c302a3397e0..69d36dac1367 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -28,12 +28,10 @@ enum class SdrEdgeKind OrthoLines, ThreeLines, OneLine, Bezier, Arc }; - - class SVX_DLLPUBLIC SdrEdgeKindItem: public SfxEnumItem<SdrEdgeKind> { public: SdrEdgeKindItem(SdrEdgeKind eStyle=SdrEdgeKind::OrthoLines): SfxEnumItem(SDRATTR_EDGEKIND, eStyle) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrEdgeKindItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 5; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/sxelditm.hxx b/include/svx/sxelditm.hxx index 445f00214033..a1efd2c9185f 100644 --- a/include/svx/sxelditm.hxx +++ b/include/svx/sxelditm.hxx @@ -25,7 +25,7 @@ class SdrEdgeLineDeltaCountItem: public SfxUInt16Item { public: SdrEdgeLineDeltaCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_EDGELINEDELTACOUNT,nVal) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrEdgeLineDeltaCountItem* Clone(SfxItemPool*) const override { return new SdrEdgeLineDeltaCountItem(*this); } diff --git a/include/svx/sxenditm.hxx b/include/svx/sxenditm.hxx index d5af6ddbacf4..2dfba6016673 100644 --- a/include/svx/sxenditm.hxx +++ b/include/svx/sxenditm.hxx @@ -28,7 +28,7 @@ public: SdrEdgeNode1HorzDistItem(long nVal): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,nVal) {} virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrEdgeNode1HorzDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SVX_DLLPUBLIC SdrEdgeNode1VertDistItem: public SdrMetricItem { @@ -36,7 +36,7 @@ public: SdrEdgeNode1VertDistItem(long nVal): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,nVal) {} virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrEdgeNode1VertDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SVX_DLLPUBLIC SdrEdgeNode2HorzDistItem: public SdrMetricItem { @@ -44,7 +44,7 @@ public: SdrEdgeNode2HorzDistItem(long nVal): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,nVal) {} virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrEdgeNode2HorzDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SVX_DLLPUBLIC SdrEdgeNode2VertDistItem: public SdrMetricItem { @@ -52,19 +52,19 @@ public: SdrEdgeNode2VertDistItem(long nVal): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,nVal) {} virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrEdgeNode2VertDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SdrEdgeNode1GlueDistItem: public SdrMetricItem { public: SdrEdgeNode1GlueDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1GLUEDIST,nVal) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrEdgeNode1GlueDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SdrEdgeNode2GlueDistItem: public SdrMetricItem { public: SdrEdgeNode2GlueDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2GLUEDIST,nVal) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrEdgeNode2GlueDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; #endif diff --git a/include/svx/sxfiitm.hxx b/include/svx/sxfiitm.hxx index 24984b579316..2906b99eff9a 100644 --- a/include/svx/sxfiitm.hxx +++ b/include/svx/sxfiitm.hxx @@ -32,7 +32,7 @@ public: SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {} virtual bool operator==(const SfxPoolItem&) const override; virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper&) const override; - virtual SfxPoolItem* Clone(SfxItemPool *pPool=nullptr) const override; + virtual SdrFractionItem* Clone(SfxItemPool *pPool=nullptr) const override; const Fraction& GetValue() const { return nValue; } void SetValue(const Fraction& rVal) { nValue = rVal; } }; diff --git a/include/svx/sxmbritm.hxx b/include/svx/sxmbritm.hxx index 13ccf1620404..0177bc438972 100644 --- a/include/svx/sxmbritm.hxx +++ b/include/svx/sxmbritm.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC SdrMeasureBelowRefEdgeItem: public SdrYesNoItem { public: SdrMeasureBelowRefEdgeItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASUREBELOWREFEDGE,bOn) {} virtual ~SdrMeasureBelowRefEdgeItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMeasureBelowRefEdgeItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrMeasureBelowRefEdgeItem(SdrMeasureBelowRefEdgeItem const &) = default; SdrMeasureBelowRefEdgeItem(SdrMeasureBelowRefEdgeItem &&) = default; diff --git a/include/svx/sxmfsitm.hxx b/include/svx/sxmfsitm.hxx index 9e7c9ff4e50e..741ebc27e1d7 100644 --- a/include/svx/sxmfsitm.hxx +++ b/include/svx/sxmfsitm.hxx @@ -27,7 +27,7 @@ class SdrMeasureFormatStringItem: public SfxStringItem { public: SdrMeasureFormatStringItem() : SfxStringItem() { SetWhich(SDRATTR_MEASUREFORMATSTRING); } - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrMeasureFormatStringItem* Clone(SfxItemPool*) const override { return new SdrMeasureFormatStringItem(*this); } diff --git a/include/svx/sxmtfitm.hxx b/include/svx/sxmtfitm.hxx index b3a1daddeb6a..2ca591b0aefd 100644 --- a/include/svx/sxmtfitm.hxx +++ b/include/svx/sxmtfitm.hxx @@ -31,7 +31,7 @@ class SdrMeasureTextIsFixedAngleItem: public SdrYesNoItem { public: SdrMeasureTextIsFixedAngleItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTISFIXEDANGLE,bOn) {} virtual ~SdrMeasureTextIsFixedAngleItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMeasureTextIsFixedAngleItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrMeasureTextIsFixedAngleItem(SdrMeasureTextIsFixedAngleItem const &) = default; SdrMeasureTextIsFixedAngleItem(SdrMeasureTextIsFixedAngleItem &&) = default; @@ -44,7 +44,7 @@ class SdrMeasureTextFixedAngleItem: public SdrAngleItem { public: SdrMeasureTextFixedAngleItem(long nVal=0): SdrAngleItem(SDRATTR_MEASURETEXTFIXEDANGLE,nVal) {} virtual ~SdrMeasureTextFixedAngleItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMeasureTextFixedAngleItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrMeasureTextFixedAngleItem(SdrMeasureTextFixedAngleItem const &) = default; SdrMeasureTextFixedAngleItem(SdrMeasureTextFixedAngleItem &&) = default; @@ -57,7 +57,7 @@ class SVX_DLLPUBLIC SdrMeasureDecimalPlacesItem: public SfxInt16Item { public: SdrMeasureDecimalPlacesItem(sal_Int16 nVal=2): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,nVal) {} virtual ~SdrMeasureDecimalPlacesItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMeasureDecimalPlacesItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrMeasureDecimalPlacesItem(SdrMeasureDecimalPlacesItem const &) = default; SdrMeasureDecimalPlacesItem(SdrMeasureDecimalPlacesItem &&) = default; diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index bc152fdaf357..8b198301b76c 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -31,7 +31,7 @@ public: : SfxEnumItem(SDRATTR_MEASURETEXTHPOS, ePos) { } - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMeasureTextHPosItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 4; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -47,7 +47,7 @@ public: : SfxEnumItem(SDRATTR_MEASURETEXTVPOS, ePos) { } - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMeasureTextVPosItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 5; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/sxmtritm.hxx b/include/svx/sxmtritm.hxx index 826e224dc319..9c4fedfe7af7 100644 --- a/include/svx/sxmtritm.hxx +++ b/include/svx/sxmtritm.hxx @@ -27,7 +27,7 @@ class SVX_DLLPUBLIC SdrMeasureTextRota90Item: public SdrYesNoItem { public: SdrMeasureTextRota90Item(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTROTA90,bOn) {} virtual ~SdrMeasureTextRota90Item() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMeasureTextRota90Item* Clone(SfxItemPool* pPool=nullptr) const override; SdrMeasureTextRota90Item(SdrMeasureTextRota90Item const &) = default; SdrMeasureTextRota90Item(SdrMeasureTextRota90Item &&) = default; @@ -41,7 +41,7 @@ class SdrMeasureTextUpsideDownItem final : public SdrYesNoItem { public: SdrMeasureTextUpsideDownItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTUPSIDEDOWN,bOn) {} virtual ~SdrMeasureTextUpsideDownItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMeasureTextUpsideDownItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrMeasureTextUpsideDownItem(SdrMeasureTextUpsideDownItem const &) = default; SdrMeasureTextUpsideDownItem(SdrMeasureTextUpsideDownItem &&) = default; diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index f05de22226b5..07fc71e9615c 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC SdrMeasureUnitItem: public SfxEnumItem<FieldUnit> { public: SdrMeasureUnitItem(FieldUnit eUnit=FieldUnit::NONE): SfxEnumItem(SDRATTR_MEASUREUNIT, eUnit) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMeasureUnitItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 14; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/sxsiitm.hxx b/include/svx/sxsiitm.hxx index d7a1cd082c33..38d2d58ab205 100644 --- a/include/svx/sxsiitm.hxx +++ b/include/svx/sxsiitm.hxx @@ -25,7 +25,7 @@ class SdrScaleItem: public SdrFractionItem { public: SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {} virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper&) const override; - virtual SfxPoolItem* Clone(SfxItemPool *pPool=nullptr) const override; + virtual SdrScaleItem* Clone(SfxItemPool *pPool=nullptr) const override; }; #endif diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx index d15ecf7d1dce..0a5b3ee434b5 100644 --- a/include/svx/viewlayoutitem.hxx +++ b/include/svx/viewlayoutitem.hxx @@ -40,7 +40,7 @@ public: // "purely virtual methods" from the SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxViewLayoutItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; // empty virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; // empty }; diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index fd915fa6a214..1778722be5c8 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -43,7 +43,7 @@ public: virtual bool operator==( const SfxPoolItem& rItem ) const override; // no idea why, but this item does not play nice with the sorting optimisation, get failures in sd_import_tests virtual bool IsSortable() const override { return false; } - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual XFillBitmapItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx index 2919f2034462..be515f607546 100644 --- a/include/svx/xcolit.hxx +++ b/include/svx/xcolit.hxx @@ -46,7 +46,7 @@ public: XColorItem(const XColorItem& rItem); virtual bool operator==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XColorItem* Clone(SfxItemPool* pPool = nullptr) const override; const Color& GetColorValue() const; void SetColorValue(const Color& rNew) { aColor = rNew; Detach(); } diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx index 57443f186b8b..585eb0f87ff5 100644 --- a/include/svx/xfillit0.hxx +++ b/include/svx/xfillit0.hxx @@ -35,7 +35,7 @@ public: XFillStyleItem(css::drawing::FillStyle = css::drawing::FillStyle_SOLID); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFillStyleItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xflasit.hxx b/include/svx/xflasit.hxx index 5b187e37fbae..aee5cb7f13ac 100644 --- a/include/svx/xflasit.hxx +++ b/include/svx/xflasit.hxx @@ -36,7 +36,7 @@ public: XFillAttrSetItem(const XFillAttrSetItem& rAttr); XFillAttrSetItem(const XFillAttrSetItem& rAttr, SfxItemPool* pItemPool); - virtual SfxPoolItem* Clone( SfxItemPool* pToPool = nullptr ) const override; + virtual XFillAttrSetItem* Clone( SfxItemPool* pToPool = nullptr ) const override; }; #endif diff --git a/include/svx/xflbckit.hxx b/include/svx/xflbckit.hxx index eab189534123..6dc89e3d1fff 100644 --- a/include/svx/xflbckit.hxx +++ b/include/svx/xflbckit.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XFillBackgroundItem final : public SfxBoolItem public: XFillBackgroundItem( bool bFill = false ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual XFillBackgroundItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx index 801dccd305de..ea5f94b344f6 100644 --- a/include/svx/xflbmpit.hxx +++ b/include/svx/xflbmpit.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC XFillBmpPosItem final : public SfxEnumItem<RectPoint> public: XFillBmpPosItem( RectPoint eRP = RectPoint::MM ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual XFillBmpPosItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx index 5b54a5a012ac..7516eef0e988 100644 --- a/include/svx/xflbmsli.hxx +++ b/include/svx/xflbmsli.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC XFillBmpSizeLogItem final : public SfxBoolItem public: XFillBmpSizeLogItem( bool bLog = true ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual XFillBmpSizeLogItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx index a1120c878859..1321969723fa 100644 --- a/include/svx/xflbmsxy.hxx +++ b/include/svx/xflbmsxy.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC XFillBmpSizeXItem final : public SfxMetricItem public: XFillBmpSizeXItem( long nSizeX = 0 ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual XFillBmpSizeXItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, @@ -44,7 +44,7 @@ class SVX_DLLPUBLIC XFillBmpSizeYItem final : public SfxMetricItem public: XFillBmpSizeYItem( long nSizeY = 0 ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual XFillBmpSizeYItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx index d0baab39f84a..52998ea69394 100644 --- a/include/svx/xflbmtit.hxx +++ b/include/svx/xflbmtit.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC XFillBmpTileItem final : public SfxBoolItem public: XFillBmpTileItem( bool bTile = true ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual XFillBmpTileItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/xflboxy.hxx b/include/svx/xflboxy.hxx index 00375c95224d..b8a3bb3b874c 100644 --- a/include/svx/xflboxy.hxx +++ b/include/svx/xflboxy.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC XFillBmpPosOffsetXItem final : public SfxUInt16Item public: XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX = 0 ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual XFillBmpPosOffsetXItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, @@ -41,7 +41,7 @@ class SVX_DLLPUBLIC XFillBmpPosOffsetYItem final : public SfxUInt16Item public: XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY = 0 ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual XFillBmpPosOffsetYItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx index 6aa278912d50..a45ac6d67b9b 100644 --- a/include/svx/xflbstit.hxx +++ b/include/svx/xflbstit.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC XFillBmpStretchItem final : public SfxBoolItem public: XFillBmpStretchItem( bool bStretch = true ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual XFillBmpStretchItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/xflbtoxy.hxx b/include/svx/xflbtoxy.hxx index c457450ed30a..7a01f0eeee83 100644 --- a/include/svx/xflbtoxy.hxx +++ b/include/svx/xflbtoxy.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC XFillBmpTileOffsetXItem final : public SfxUInt16Item public: XFillBmpTileOffsetXItem( sal_uInt16 nOffX = 0 ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual XFillBmpTileOffsetXItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, @@ -41,7 +41,7 @@ class SVX_DLLPUBLIC XFillBmpTileOffsetYItem final : public SfxUInt16Item public: XFillBmpTileOffsetYItem( sal_uInt16 nOffX = 0 ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual XFillBmpTileOffsetYItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx index 3679f0f3e217..7fd1f9782e65 100644 --- a/include/svx/xflclit.hxx +++ b/include/svx/xflclit.hxx @@ -37,7 +37,7 @@ public: XFillColorItem(sal_Int32 nIndex, const Color& rTheColor); XFillColorItem(const OUString& rName, const Color& rTheColor); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFillColorItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index 87d587315d19..935bf5596264 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -42,7 +42,7 @@ public: XFillFloatTransparenceItem( const XFillFloatTransparenceItem& rItem ); virtual bool operator==( const SfxPoolItem& rItem ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual XFillFloatTransparenceItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx index 4fbf399e6389..d0fa9600bea6 100644 --- a/include/svx/xflgrit.hxx +++ b/include/svx/xflgrit.hxx @@ -42,7 +42,7 @@ public: XFillGradientItem(const XFillGradientItem& rItem); virtual bool operator==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFillGradientItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index 7a6cb5dde8fb..a0d88fffeb3e 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -41,7 +41,7 @@ public: XFillHatchItem(const XFillHatchItem& rItem); virtual bool operator==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFillHatchItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx index 491e78ef5130..c29ad9173982 100644 --- a/include/svx/xfltrit.hxx +++ b/include/svx/xfltrit.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC XFillTransparenceItem final : public SfxUInt16Item { public: XFillTransparenceItem(sal_uInt16 nFillTransparence = 0); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFillTransparenceItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/svx/xftadit.hxx b/include/svx/xftadit.hxx index b33875b92cd0..7aa4328aac09 100644 --- a/include/svx/xftadit.hxx +++ b/include/svx/xftadit.hxx @@ -36,7 +36,7 @@ public: static SfxPoolItem* CreateDefault(); XFormTextAdjustItem(XFormTextAdjust = XFormTextAdjust::Center); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextAdjustItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // #FontWork# virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/xftdiit.hxx b/include/svx/xftdiit.hxx index 819bddcaf8e6..6e292935edc9 100644 --- a/include/svx/xftdiit.hxx +++ b/include/svx/xftdiit.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XFormTextDistanceItem final : public SfxMetricItem public: static SfxPoolItem* CreateDefault(); XFormTextDistanceItem(long nDist = 0); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextDistanceItem* Clone(SfxItemPool* pPool = nullptr) const override; }; #endif diff --git a/include/svx/xftmrit.hxx b/include/svx/xftmrit.hxx index 808deeb696f4..8d3fb68ca058 100644 --- a/include/svx/xftmrit.hxx +++ b/include/svx/xftmrit.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XFormTextMirrorItem final : public SfxBoolItem public: static SfxPoolItem* CreateDefault(); XFormTextMirrorItem(bool bMirror = false); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextMirrorItem* Clone(SfxItemPool* pPool = nullptr) const override; }; #endif diff --git a/include/svx/xftouit.hxx b/include/svx/xftouit.hxx index 6c0c6a43231e..fe58b4160172 100644 --- a/include/svx/xftouit.hxx +++ b/include/svx/xftouit.hxx @@ -36,7 +36,7 @@ public: static SfxPoolItem* CreateDefault(); XFormTextOutlineItem(bool bOutline = false); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextOutlineItem* Clone(SfxItemPool* pPool = nullptr) const override; }; #endif diff --git a/include/svx/xftshcit.hxx b/include/svx/xftshcit.hxx index 15201338277e..9155449a6826 100644 --- a/include/svx/xftshcit.hxx +++ b/include/svx/xftshcit.hxx @@ -36,7 +36,7 @@ public: XFormTextShadowColorItem() {} XFormTextShadowColorItem(const OUString& rName, const Color& rTheColor); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextShadowColorItem* Clone(SfxItemPool* pPool = nullptr) const override; }; #endif diff --git a/include/svx/xftshit.hxx b/include/svx/xftshit.hxx index 33d8d31e2dc0..377d247f018e 100644 --- a/include/svx/xftshit.hxx +++ b/include/svx/xftshit.hxx @@ -36,7 +36,7 @@ public: static SfxPoolItem* CreateDefault(); XFormTextShadowItem(XFormTextShadow = XFormTextShadow::NONE); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextShadowItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // #FontWork# virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/xftshtit.hxx b/include/svx/xftshtit.hxx index 98e9a8c92872..2195386c7f49 100644 --- a/include/svx/xftshtit.hxx +++ b/include/svx/xftshtit.hxx @@ -32,7 +32,7 @@ class XFormTextShadowTranspItem final : public SfxUInt16Item { public: XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence = 0); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextShadowTranspItem* Clone(SfxItemPool* pPool = nullptr) const override; }; #endif diff --git a/include/svx/xftshxy.hxx b/include/svx/xftshxy.hxx index 13c8464febf7..478cb26c5759 100644 --- a/include/svx/xftshxy.hxx +++ b/include/svx/xftshxy.hxx @@ -35,7 +35,7 @@ public: static SfxPoolItem* CreateDefault(); XFormTextShadowXValItem(long nVal = 0); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextShadowXValItem* Clone(SfxItemPool* pPool = nullptr) const override; }; /************************************************************************* @@ -49,7 +49,7 @@ class SVX_DLLPUBLIC XFormTextShadowYValItem final : public SfxMetricItem public: static SfxPoolItem* CreateDefault(); XFormTextShadowYValItem(long nVal = 0); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextShadowYValItem* Clone(SfxItemPool* pPool = nullptr) const override; }; #endif diff --git a/include/svx/xftstit.hxx b/include/svx/xftstit.hxx index a82535c87a02..4d2e0d2c9ef0 100644 --- a/include/svx/xftstit.hxx +++ b/include/svx/xftstit.hxx @@ -35,7 +35,7 @@ public: static SfxPoolItem* CreateDefault(); XFormTextStartItem(long nStart = 0); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextStartItem* Clone(SfxItemPool* pPool = nullptr) const override; }; #endif diff --git a/include/svx/xgrscit.hxx b/include/svx/xgrscit.hxx index 125a4f47b6d7..0e61f07249d7 100644 --- a/include/svx/xgrscit.hxx +++ b/include/svx/xgrscit.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC XGradientStepCountItem final : public SfxUInt16Item { public: XGradientStepCountItem( sal_uInt16 nStepCount = 0 ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual XGradientStepCountItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx index 317fcd3edae0..f82f6a40343f 100644 --- a/include/svx/xit.hxx +++ b/include/svx/xit.hxx @@ -47,7 +47,7 @@ public: NameOrIndex(const NameOrIndex& rNameOrIndex); virtual bool operator==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual NameOrIndex* Clone(SfxItemPool* pPool = nullptr) const override; OUString const & GetName() const { return GetValue(); } void SetName(const OUString& rName) { SetValue(rName); } diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx index a561bec0375a..16f6880cf48f 100644 --- a/include/svx/xlineit0.hxx +++ b/include/svx/xlineit0.hxx @@ -31,7 +31,7 @@ class SVX_DLLPUBLIC XLineStyleItem final : public SfxEnumItem<css::drawing::Line public: static SfxPoolItem* CreateDefault(); XLineStyleItem(css::drawing::LineStyle = css::drawing::LineStyle_SOLID); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineStyleItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx index 612c747ef5b5..1f0bbd37d232 100644 --- a/include/svx/xlinjoit.hxx +++ b/include/svx/xlinjoit.hxx @@ -33,7 +33,7 @@ public: static SfxPoolItem* CreateDefault(); XLineJointItem( css::drawing::LineJoint eLineJoint = css::drawing::LineJoint_ROUND ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual XLineJointItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xlnasit.hxx b/include/svx/xlnasit.hxx index 3875fb4fdcc3..4e395610d5df 100644 --- a/include/svx/xlnasit.hxx +++ b/include/svx/xlnasit.hxx @@ -36,7 +36,7 @@ public: XLineAttrSetItem(const XLineAttrSetItem& rAttr); XLineAttrSetItem(const XLineAttrSetItem& rAttr, SfxItemPool* pItemPool); - virtual SfxPoolItem* Clone( SfxItemPool* pToPool = nullptr ) const override; + virtual XLineAttrSetItem* Clone( SfxItemPool* pToPool = nullptr ) const override; }; #endif diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx index 8657c83807b7..7b62e2c514db 100644 --- a/include/svx/xlncapit.hxx +++ b/include/svx/xlncapit.hxx @@ -33,7 +33,7 @@ public: static SfxPoolItem* CreateDefault(); XLineCapItem(css::drawing::LineCap eLineCap = css::drawing::LineCap_BUTT); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual XLineCapItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx index 8f2e6db05dff..459b85af670f 100644 --- a/include/svx/xlnclit.hxx +++ b/include/svx/xlnclit.hxx @@ -33,7 +33,7 @@ public: XLineColorItem(sal_Int32 nIndex, const Color& rTheColor); XLineColorItem(const OUString& rName, const Color& rTheColor); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineColorItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index 067b5821a8d7..33b5229ed054 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -42,7 +42,7 @@ public: XLineDashItem(const XLineDashItem& rItem); virtual bool operator==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineDashItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx index b427aca7ba05..2498237b9dbd 100644 --- a/include/svx/xlnedcit.hxx +++ b/include/svx/xlnedcit.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC XLineEndCenterItem : public SfxBoolItem { public: XLineEndCenterItem(bool bEndCenter = false); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineEndCenterItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx index 81530d5274de..f6b3b87494a6 100644 --- a/include/svx/xlnedit.hxx +++ b/include/svx/xlnedit.hxx @@ -40,7 +40,7 @@ public: XLineEndItem(const XLineEndItem& rItem); virtual bool operator==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineEndItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx index 81961d068e1e..4c0f54d27f6b 100644 --- a/include/svx/xlnedwit.hxx +++ b/include/svx/xlnedwit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XLineEndWidthItem final : public SfxMetricItem { public: XLineEndWidthItem(long nWidth = LINE_END_WIDTH_DEFAULT); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineEndWidthItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx index d3f6164cd5f3..b2a4ab1d4cdc 100644 --- a/include/svx/xlnstcit.hxx +++ b/include/svx/xlnstcit.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC XLineStartCenterItem : public SfxBoolItem { public: XLineStartCenterItem(bool bStartCenter = false); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineStartCenterItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx index 387f57b88e49..7add1df8c80f 100644 --- a/include/svx/xlnstit.hxx +++ b/include/svx/xlnstit.hxx @@ -40,7 +40,7 @@ public: XLineStartItem(const XLineStartItem& rItem); virtual bool operator==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineStartItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx index 5e8b38f5f5d6..a2e894e96486 100644 --- a/include/svx/xlnstwit.hxx +++ b/include/svx/xlnstwit.hxx @@ -31,7 +31,7 @@ class SVX_DLLPUBLIC XLineStartWidthItem final : public SfxMetricItem { public: XLineStartWidthItem(long nWidth = LINE_START_WIDTH_DEFAULT); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineStartWidthItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xlntrit.hxx b/include/svx/xlntrit.hxx index 416cd2fbcdef..bb23b8271bdb 100644 --- a/include/svx/xlntrit.hxx +++ b/include/svx/xlntrit.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC XLineTransparenceItem final : public SfxUInt16Item { public: XLineTransparenceItem(sal_uInt16 nLineTransparence = 0); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineTransparenceItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx index 114abf0b4811..fc9b2f3ad8d0 100644 --- a/include/svx/xlnwtit.hxx +++ b/include/svx/xlnwtit.hxx @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC XLineWidthItem final : public SfxMetricItem public: static SfxPoolItem* CreateDefault(); XLineWidthItem(long nWidth = 0); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineWidthItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx index 86a7921b34a6..479da4f16fae 100644 --- a/include/svx/xsflclit.hxx +++ b/include/svx/xsflclit.hxx @@ -22,14 +22,12 @@ #include <svx/xcolit.hxx> - - class SVX_DLLPUBLIC XSecondaryFillColorItem final : public XColorItem { public: XSecondaryFillColorItem(const OUString& rName, const Color& rTheColor); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + SVX_DLLPRIVATE virtual XSecondaryFillColorItem* Clone(SfxItemPool* pPool = nullptr) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/xtextit0.hxx b/include/svx/xtextit0.hxx index b924bfc595cc..b28f93898b9e 100644 --- a/include/svx/xtextit0.hxx +++ b/include/svx/xtextit0.hxx @@ -35,7 +35,7 @@ class SVX_DLLPUBLIC XFormTextStyleItem final : public SfxEnumItem<XFormTextStyle public: static SfxPoolItem* CreateDefault(); XFormTextStyleItem(XFormTextStyle = XFormTextStyle::NONE); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextStyleItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // #FontWork# virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -53,7 +53,7 @@ class SVX_DLLPUBLIC XFormTextHideFormItem final : public SfxBoolItem public: static SfxPoolItem* CreateDefault(); XFormTextHideFormItem(bool bHide = false); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextHideFormItem* Clone(SfxItemPool* pPool = nullptr) const override; }; #endif diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx index f9a6a553a952..f257f19997a9 100644 --- a/include/svx/zoomslideritem.hxx +++ b/include/svx/zoomslideritem.hxx @@ -43,7 +43,7 @@ public: // "purely virtual methods" from the SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxZoomSliderItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; |