diff options
Diffstat (limited to 'svx')
55 files changed, 249 insertions, 217 deletions
diff --git a/svx/inc/AffineMatrixItem.hxx b/svx/inc/AffineMatrixItem.hxx index c7eb5cb71e8e..0c52b691221e 100644 --- a/svx/inc/AffineMatrixItem.hxx +++ b/svx/inc/AffineMatrixItem.hxx @@ -30,6 +30,7 @@ private: css::geometry::AffineMatrix2D maMatrix; public: + DECLARE_ITEM_TYPE_FUNCTION(AffineMatrixItem) AffineMatrixItem(const css::geometry::AffineMatrix2D* pMatrix); AffineMatrixItem(const AffineMatrixItem&); virtual ~AffineMatrixItem() override; diff --git a/svx/inc/sdgcoitm.hxx b/svx/inc/sdgcoitm.hxx index 570fbd46b8d8..e42d029f204d 100644 --- a/svx/inc/sdgcoitm.hxx +++ b/svx/inc/sdgcoitm.hxx @@ -31,8 +31,8 @@ class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafRedItem final : public SdrSignedPercentItem { public: - - SdrGrafRedItem( short nRedPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFRED, nRedPercent, SfxItemType::SdrGrafRedItemType ) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrGrafRedItem) + SdrGrafRedItem( short nRedPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFRED, nRedPercent ) {} virtual SdrGrafRedItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; @@ -44,8 +44,8 @@ public: class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafGreenItem final : public SdrSignedPercentItem { public: - - SdrGrafGreenItem( short nGreenPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, nGreenPercent, SfxItemType::SdrGrafGreenItemType ) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrGrafGreenItem) + SdrGrafGreenItem( short nGreenPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, nGreenPercent ) {} virtual SdrGrafGreenItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; @@ -57,8 +57,8 @@ public: class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafBlueItem final : public SdrSignedPercentItem { public: - - SdrGrafBlueItem( short nBluePercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, nBluePercent, SfxItemType::SdrGrafBlueItemType ) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrGrafBlueItem) + SdrGrafBlueItem( short nBluePercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, nBluePercent ) {} virtual SdrGrafBlueItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; diff --git a/svx/inc/sdginitm.hxx b/svx/inc/sdginitm.hxx index 1f26cb1e4eb0..bf68e53da52a 100644 --- a/svx/inc/sdginitm.hxx +++ b/svx/inc/sdginitm.hxx @@ -29,8 +29,8 @@ class SdrGrafInvertItem final : public SdrOnOffItem { public: - - SdrGrafInvertItem( bool bInvert = false ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert, SfxItemType::SdrGrafInvertItemType ) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrGrafInvertItem) + SdrGrafInvertItem( bool bInvert = false ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert ) {} virtual SdrGrafInvertItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; diff --git a/svx/inc/sdgtritm.hxx b/svx/inc/sdgtritm.hxx index 0511826bc6ef..5599c7b33f9b 100644 --- a/svx/inc/sdgtritm.hxx +++ b/svx/inc/sdgtritm.hxx @@ -31,9 +31,9 @@ class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafTransparenceItem final : public SdrPercentItem { public: - + DECLARE_ITEM_TYPE_FUNCTION(SdrGrafTransparenceItem) SdrGrafTransparenceItem( sal_uInt16 nTransparencePercent = 0 ) - : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent, SfxItemType::SdrGrafTransparenceItemType ) {} + : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent ) {} virtual SdrGrafTransparenceItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; diff --git a/svx/inc/sxallitm.hxx b/svx/inc/sxallitm.hxx index 0afcd1802a8c..8222a600a195 100644 --- a/svx/inc/sxallitm.hxx +++ b/svx/inc/sxallitm.hxx @@ -24,7 +24,8 @@ class SdrAllPositionXItem final : public SdrMetricItem { public: - SdrAllPositionXItem(tools::Long nPosX=0): SdrMetricItem(SDRATTR_ALLPOSITIONX, nPosX, SfxItemType::SdrAllPositionXItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrAllPositionXItem) + SdrAllPositionXItem(tools::Long nPosX=0): SdrMetricItem(SDRATTR_ALLPOSITIONX, nPosX) {} virtual SdrAllPositionXItem* Clone(SfxItemPool*) const override { return new SdrAllPositionXItem(*this); @@ -33,7 +34,8 @@ public: class SdrAllPositionYItem final : public SdrMetricItem { public: - SdrAllPositionYItem(tools::Long nPosY=0): SdrMetricItem(SDRATTR_ALLPOSITIONY, nPosY, SfxItemType::SdrAllPositionYItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrAllPositionYItem) + SdrAllPositionYItem(tools::Long nPosY=0): SdrMetricItem(SDRATTR_ALLPOSITIONY, nPosY) {} virtual SdrAllPositionYItem* Clone(SfxItemPool*) const override { return new SdrAllPositionYItem(*this); @@ -42,7 +44,8 @@ public: class SdrAllSizeWidthItem final : public SdrMetricItem { public: - SdrAllSizeWidthItem(tools::Long nWdt=0): SdrMetricItem(SDRATTR_ALLSIZEWIDTH, nWdt, SfxItemType::SdrAllSizeWidthItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrAllSizeWidthItem) + SdrAllSizeWidthItem(tools::Long nWdt=0): SdrMetricItem(SDRATTR_ALLSIZEWIDTH, nWdt) {} virtual SdrAllSizeWidthItem* Clone(SfxItemPool*) const override { return new SdrAllSizeWidthItem(*this); @@ -51,7 +54,8 @@ public: class SdrAllSizeHeightItem final : public SdrMetricItem { public: - SdrAllSizeHeightItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_ALLSIZEHEIGHT, nHgt, SfxItemType::SdrAllSizeHeightItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrAllSizeHeightItem) + SdrAllSizeHeightItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_ALLSIZEHEIGHT, nHgt) {} virtual SdrAllSizeHeightItem* Clone(SfxItemPool*) const override { return new SdrAllSizeHeightItem(*this); diff --git a/svx/inc/sxcaitm.hxx b/svx/inc/sxcaitm.hxx index 4aa6b44e910d..5b927fb553f5 100644 --- a/svx/inc/sxcaitm.hxx +++ b/svx/inc/sxcaitm.hxx @@ -35,8 +35,9 @@ class SdrCaptionAngleItem final : public SdrAngleItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrCaptionAngleItem) SdrCaptionAngleItem(Degree100 nAngle = 0_deg100) - : SdrAngleItem(SDRATTR_CAPTIONANGLE, nAngle, SfxItemType::SdrCaptionAngleItemType) + : SdrAngleItem(SDRATTR_CAPTIONANGLE, nAngle) { } virtual SdrCaptionAngleItem* Clone(SfxItemPool*) const override diff --git a/svx/inc/sxcikitm.hxx b/svx/inc/sxcikitm.hxx index 7ae07ad71181..ffbda1421732 100644 --- a/svx/inc/sxcikitm.hxx +++ b/svx/inc/sxcikitm.hxx @@ -25,8 +25,9 @@ class SdrCircKindItem final : public SfxEnumItem<SdrCircKind> { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrCircKindItem) SdrCircKindItem(SdrCircKind eKind=SdrCircKind::Full) - : SfxEnumItem(SDRATTR_CIRCKIND, SfxItemType::SdrCircKindItemType, eKind) {} + : SfxEnumItem(SDRATTR_CIRCKIND, eKind) {} virtual SdrCircKindItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 4; } diff --git a/svx/inc/sxfiitm.hxx b/svx/inc/sxfiitm.hxx index 20ef28db9add..79ef11e3ad09 100644 --- a/svx/inc/sxfiitm.hxx +++ b/svx/inc/sxfiitm.hxx @@ -28,8 +28,9 @@ class SdrFractionItem: public SfxPoolItem { Fraction nValue; public: - SdrFractionItem(sal_uInt16 nId, const Fraction& rVal, SfxItemType eItemType = SfxItemType::SdrFractionItemType) - : SfxPoolItem(nId, eItemType), nValue(rVal) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrFractionItem) + 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 SdrFractionItem* Clone(SfxItemPool *pPool=nullptr) const override; diff --git a/svx/inc/sxlayitm.hxx b/svx/inc/sxlayitm.hxx index 6891f5f4c345..06eafad96fdd 100644 --- a/svx/inc/sxlayitm.hxx +++ b/svx/inc/sxlayitm.hxx @@ -26,18 +26,20 @@ class SdrLayerIdItem final : public SfxInt16Item { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrLayerIdItem) SdrLayerIdItem(SdrLayerID nId): - SfxInt16Item(SDRATTR_LAYERID,nId.get(), SfxItemType::SdrLayerIdItemType) {} + SfxInt16Item(SDRATTR_LAYERID,nId.get()) {} SdrLayerID GetValue() const { return SdrLayerID(SfxInt16Item::GetValue()); } virtual SdrLayerIdItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SdrLayerNameItem final : public SfxStringItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrLayerNameItem) SdrLayerNameItem() - : SfxStringItem(SDRATTR_LAYERNAME, SfxItemType::SdrLayerNameItemType) {} + : SfxStringItem(SDRATTR_LAYERNAME) {} SdrLayerNameItem(const OUString& rStr) - : SfxStringItem(SDRATTR_LAYERNAME, rStr, SfxItemType::SdrLayerNameItemType) {} + : SfxStringItem(SDRATTR_LAYERNAME, rStr) {} virtual SdrLayerNameItem* Clone(SfxItemPool* pPool=nullptr) const override; }; diff --git a/svx/inc/sxlogitm.hxx b/svx/inc/sxlogitm.hxx index 5fe217b77c62..140cb12965b5 100644 --- a/svx/inc/sxlogitm.hxx +++ b/svx/inc/sxlogitm.hxx @@ -24,7 +24,8 @@ class SdrLogicSizeWidthItem final : public SdrMetricItem { public: - SdrLogicSizeWidthItem(tools::Long nWdt=0): SdrMetricItem(SDRATTR_LOGICSIZEWIDTH, nWdt, SfxItemType::SdrLogicSizeWidthItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrLogicSizeWidthItem) + SdrLogicSizeWidthItem(tools::Long nWdt=0): SdrMetricItem(SDRATTR_LOGICSIZEWIDTH, nWdt) {} virtual SdrLogicSizeWidthItem* Clone(SfxItemPool*) const override { return new SdrLogicSizeWidthItem(*this); @@ -33,7 +34,8 @@ public: class SdrLogicSizeHeightItem final : public SdrMetricItem { public: - SdrLogicSizeHeightItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_LOGICSIZEHEIGHT, nHgt, SfxItemType::SdrLogicSizeHeightItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrLogicSizeHeightItem) + SdrLogicSizeHeightItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_LOGICSIZEHEIGHT, nHgt) {} virtual SdrLogicSizeHeightItem* Clone(SfxItemPool*) const override { return new SdrLogicSizeHeightItem(*this); diff --git a/svx/inc/sxmfsitm.hxx b/svx/inc/sxmfsitm.hxx index f3d6f0facf9d..56422bcc4018 100644 --- a/svx/inc/sxmfsitm.hxx +++ b/svx/inc/sxmfsitm.hxx @@ -26,7 +26,7 @@ class SdrMeasureFormatStringItem final : public SfxStringItem { public: SdrMeasureFormatStringItem() - : SfxStringItem(SDRATTR_MEASUREFORMATSTRING, SfxItemType::SdrMeasureFormatStringItemType) {} + : SfxStringItem(SDRATTR_MEASUREFORMATSTRING) {} virtual SdrMeasureFormatStringItem* Clone(SfxItemPool*) const override { return new SdrMeasureFormatStringItem(*this); diff --git a/svx/inc/sxmkitm.hxx b/svx/inc/sxmkitm.hxx index 278a7a900f62..ff5157cb7c0c 100644 --- a/svx/inc/sxmkitm.hxx +++ b/svx/inc/sxmkitm.hxx @@ -28,8 +28,9 @@ enum SdrMeasureKind {SDRMEASURE_STD,SDRMEASURE_RADIUS}; // n.i. class SdrMeasureKindItem final : public SfxEnumItem<SdrMeasureKind> { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrMeasureKindItem) SdrMeasureKindItem() - : SfxEnumItem(SDRATTR_MEASUREKIND, SfxItemType::SdrMeasureKindItemType, SDRMEASURE_STD) {} + : SfxEnumItem(SDRATTR_MEASUREKIND, SDRMEASURE_STD) {} virtual SdrMeasureKindItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 2; } diff --git a/svx/inc/sxmoitm.hxx b/svx/inc/sxmoitm.hxx index c3f6d5a3dd97..e8cd0b725fdd 100644 --- a/svx/inc/sxmoitm.hxx +++ b/svx/inc/sxmoitm.hxx @@ -27,8 +27,9 @@ class SdrMeasureOverhangItem final : public SdrMetricItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrMeasureOverhangItem) SdrMeasureOverhangItem(tools::Long nVal) - : SdrMetricItem(SDRATTR_MEASUREOVERHANG, nVal, SfxItemType::SdrMeasureOverhangItemType) + : SdrMetricItem(SDRATTR_MEASUREOVERHANG, nVal) { } virtual SdrMeasureOverhangItem* Clone(SfxItemPool*) const override diff --git a/svx/inc/sxmovitm.hxx b/svx/inc/sxmovitm.hxx index 4f8be6c545e0..b21abf8adaf9 100644 --- a/svx/inc/sxmovitm.hxx +++ b/svx/inc/sxmovitm.hxx @@ -24,7 +24,8 @@ class SdrMoveXItem final : public SdrMetricItem { public: - SdrMoveXItem(): SdrMetricItem(SDRATTR_MOVEX, 0, SfxItemType::SdrMoveXItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrMoveXItem) + SdrMoveXItem(): SdrMetricItem(SDRATTR_MOVEX, 0) {} SdrMoveXItem* Clone(SfxItemPool*) const override { return new SdrMoveXItem(*this); @@ -33,7 +34,8 @@ public: class SdrMoveYItem final : public SdrMetricItem { public: - SdrMoveYItem(): SdrMetricItem(SDRATTR_MOVEY, 0, SfxItemType::SdrMoveYItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrMoveYItem) + SdrMoveYItem(): SdrMetricItem(SDRATTR_MOVEY, 0) {} SdrMoveYItem* Clone(SfxItemPool*) const override { return new SdrMoveYItem(*this); diff --git a/svx/inc/sxmsitm.hxx b/svx/inc/sxmsitm.hxx index bc44da43da98..6a2ab87d3d1d 100644 --- a/svx/inc/sxmsitm.hxx +++ b/svx/inc/sxmsitm.hxx @@ -28,8 +28,9 @@ class SdrMeasureScaleItem final : public SdrScaleItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrMeasureScaleItem) SdrMeasureScaleItem() - : SdrScaleItem(SDRATTR_MEASURESCALE, Fraction(1, 1), SfxItemType::SdrMeasureScaleItemType) + : SdrScaleItem(SDRATTR_MEASURESCALE, Fraction(1, 1)) { } virtual SdrMeasureScaleItem* Clone(SfxItemPool*) const override diff --git a/svx/inc/sxmtaitm.hxx b/svx/inc/sxmtaitm.hxx index 94935cf2ec0c..42335f3e9620 100644 --- a/svx/inc/sxmtaitm.hxx +++ b/svx/inc/sxmtaitm.hxx @@ -27,8 +27,9 @@ // TextUpsideDown stays active and turns the text again if sal_True. class SdrMeasureTextAutoAngleItem final : public SdrYesNoItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrMeasureTextAutoAngleItem) SdrMeasureTextAutoAngleItem(bool bOn=true): - SdrYesNoItem(SDRATTR_MEASURETEXTAUTOANGLE,bOn, SfxItemType::SdrMeasureTextAutoAngleItemType) {} + SdrYesNoItem(SDRATTR_MEASURETEXTAUTOANGLE,bOn) {} virtual SdrMeasureTextAutoAngleItem* Clone(SfxItemPool*) const override { return new SdrMeasureTextAutoAngleItem(*this); @@ -39,8 +40,9 @@ public: // Angle in 1/100deg from viewpoint of the user. class SdrMeasureTextAutoAngleViewItem final : public SdrAngleItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrMeasureTextAutoAngleViewItem) SdrMeasureTextAutoAngleViewItem(Degree100 nVal=31500_deg100) - : SdrAngleItem(SDRATTR_MEASURETEXTAUTOANGLEVIEW,nVal, SfxItemType::SdrMeasureTextAutoAngleViewItemType) {} + : SdrAngleItem(SDRATTR_MEASURETEXTAUTOANGLEVIEW,nVal) {} virtual SdrMeasureTextAutoAngleViewItem* Clone(SfxItemPool*) const override { return new SdrMeasureTextAutoAngleViewItem(*this); diff --git a/svx/inc/sxoneitm.hxx b/svx/inc/sxoneitm.hxx index d395d14181f3..38395110f5e8 100644 --- a/svx/inc/sxoneitm.hxx +++ b/svx/inc/sxoneitm.hxx @@ -24,7 +24,8 @@ class SdrOnePositionXItem final : public SdrMetricItem { public: - SdrOnePositionXItem(tools::Long nPosX=0): SdrMetricItem(SDRATTR_ONEPOSITIONX, nPosX, SfxItemType::SdrOnePositionXItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrOnePositionXItem) + SdrOnePositionXItem(tools::Long nPosX=0): SdrMetricItem(SDRATTR_ONEPOSITIONX, nPosX) {} virtual SdrOnePositionXItem* Clone(SfxItemPool*) const override { return new SdrOnePositionXItem(*this); @@ -33,7 +34,8 @@ public: class SdrOnePositionYItem final : public SdrMetricItem { public: - SdrOnePositionYItem(tools::Long nPosY=0): SdrMetricItem(SDRATTR_ONEPOSITIONY, nPosY, SfxItemType::SdrOnePositionYItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrOnePositionYItem) + SdrOnePositionYItem(tools::Long nPosY=0): SdrMetricItem(SDRATTR_ONEPOSITIONY, nPosY) {} virtual SdrOnePositionYItem* Clone(SfxItemPool*) const override { return new SdrOnePositionYItem(*this); @@ -42,7 +44,8 @@ public: class SdrOneSizeWidthItem final : public SdrMetricItem { public: - SdrOneSizeWidthItem(tools::Long nWdt=0): SdrMetricItem(SDRATTR_ONESIZEWIDTH, nWdt, SfxItemType::SdrOneSizeWidthItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrOneSizeWidthItem) + SdrOneSizeWidthItem(tools::Long nWdt=0): SdrMetricItem(SDRATTR_ONESIZEWIDTH, nWdt) {} virtual SdrOneSizeWidthItem* Clone(SfxItemPool*) const override { return new SdrOneSizeWidthItem(*this); @@ -51,7 +54,8 @@ public: class SdrOneSizeHeightItem final : public SdrMetricItem { public: - SdrOneSizeHeightItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_ONESIZEHEIGHT, nHgt, SfxItemType::SdrOneSizeHeightItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrOneSizeHeightItem) + SdrOneSizeHeightItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_ONESIZEHEIGHT, nHgt) {} virtual SdrOneSizeHeightItem* Clone(SfxItemPool*) const override { return new SdrOneSizeHeightItem(*this); diff --git a/svx/inc/sxopitm.hxx b/svx/inc/sxopitm.hxx index 52389b7331c1..edf4a4bf8f1c 100644 --- a/svx/inc/sxopitm.hxx +++ b/svx/inc/sxopitm.hxx @@ -24,8 +24,9 @@ class SdrObjPrintableItem final : public SdrYesNoItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrObjPrintableItem) SdrObjPrintableItem(bool bOn=false) - : SdrYesNoItem(SDRATTR_OBJPRINTABLE,bOn, SfxItemType::SdrObjPrintableItemType) {} + : SdrYesNoItem(SDRATTR_OBJPRINTABLE,bOn) {} virtual SdrObjPrintableItem* Clone(SfxItemPool*) const override { return new SdrObjPrintableItem(*this); @@ -34,7 +35,8 @@ public: class SdrObjVisibleItem final : public SdrYesNoItem { public: - SdrObjVisibleItem(bool bOn=true): SdrYesNoItem(SDRATTR_OBJVISIBLE,bOn, SfxItemType::SdrObjVisibleItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrObjVisibleItem) + SdrObjVisibleItem(bool bOn=true): SdrYesNoItem(SDRATTR_OBJVISIBLE,bOn) {} virtual SdrObjVisibleItem* Clone(SfxItemPool*) const override { return new SdrObjVisibleItem(*this); diff --git a/svx/inc/sxreaitm.hxx b/svx/inc/sxreaitm.hxx index bc61a10086ed..45ddb0c09515 100644 --- a/svx/inc/sxreaitm.hxx +++ b/svx/inc/sxreaitm.hxx @@ -25,8 +25,9 @@ class SdrResizeXAllItem final : public SdrFractionItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrResizeXAllItem) SdrResizeXAllItem() - : SdrFractionItem(SDRATTR_RESIZEXALL,Fraction(1,1), SfxItemType::SdrResizeXAllItemType) {} + : SdrFractionItem(SDRATTR_RESIZEXALL,Fraction(1,1)) {} virtual SdrResizeXAllItem* Clone(SfxItemPool*) const override { return new SdrResizeXAllItem(*this); @@ -35,8 +36,9 @@ public: class SdrResizeYAllItem final : public SdrFractionItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrResizeYAllItem) SdrResizeYAllItem() - : SdrFractionItem(SDRATTR_RESIZEYALL,Fraction(1,1), SfxItemType::SdrResizeYAllItemType) {} + : SdrFractionItem(SDRATTR_RESIZEYALL,Fraction(1,1)) {} virtual SdrResizeYAllItem* Clone(SfxItemPool*) const override { return new SdrResizeYAllItem(*this); diff --git a/svx/inc/sxreoitm.hxx b/svx/inc/sxreoitm.hxx index c99ff4adc66d..ad3eb62dfbc0 100644 --- a/svx/inc/sxreoitm.hxx +++ b/svx/inc/sxreoitm.hxx @@ -25,8 +25,9 @@ class SdrResizeXOneItem final : public SdrFractionItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrResizeXOneItem) SdrResizeXOneItem() - : SdrFractionItem(SDRATTR_RESIZEXONE,Fraction(1,1), SfxItemType::SdrResizeXOneItemType) {} + : SdrFractionItem(SDRATTR_RESIZEXONE,Fraction(1,1)) {} SdrResizeXOneItem* Clone(SfxItemPool*) const override { return new SdrResizeXOneItem(*this); @@ -35,8 +36,9 @@ public: class SdrResizeYOneItem final : public SdrFractionItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrResizeYOneItem) SdrResizeYOneItem() - : SdrFractionItem(SDRATTR_RESIZEYONE,Fraction(1,1), SfxItemType::SdrResizeYOneItemType) {} + : SdrFractionItem(SDRATTR_RESIZEYONE,Fraction(1,1)) {} SdrResizeYOneItem* Clone(SfxItemPool*) const override { return new SdrResizeYOneItem(*this); diff --git a/svx/inc/sxroaitm.hxx b/svx/inc/sxroaitm.hxx index 02138710ba7c..c151e4597245 100644 --- a/svx/inc/sxroaitm.hxx +++ b/svx/inc/sxroaitm.hxx @@ -25,8 +25,9 @@ class SdrRotateAllItem final : public SdrAngleItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrRotateAllItem) SdrRotateAllItem() - : SdrAngleItem(SDRATTR_ROTATEALL, 0_deg100, SfxItemType::SdrRotateAllItemType) + : SdrAngleItem(SDRATTR_ROTATEALL, 0_deg100) { } virtual SdrRotateAllItem* Clone(SfxItemPool*) const override diff --git a/svx/inc/sxrooitm.hxx b/svx/inc/sxrooitm.hxx index a4ad37b2aaf3..6b6287d84a07 100644 --- a/svx/inc/sxrooitm.hxx +++ b/svx/inc/sxrooitm.hxx @@ -24,7 +24,8 @@ class SdrRotateOneItem final : public SdrAngleItem { public: - SdrRotateOneItem(): SdrAngleItem(SDRATTR_ROTATEONE, 0_deg100, SfxItemType::SdrRotateOneItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrRotateOneItem) + SdrRotateOneItem(): SdrAngleItem(SDRATTR_ROTATEONE, 0_deg100) {} SdrRotateOneItem* Clone(SfxItemPool*) const override { return new SdrRotateOneItem(*this); diff --git a/svx/inc/sxsaitm.hxx b/svx/inc/sxsaitm.hxx index f02397ed2ef9..2bbe51ff6f6d 100644 --- a/svx/inc/sxsaitm.hxx +++ b/svx/inc/sxsaitm.hxx @@ -25,8 +25,9 @@ class SdrShearAngleItem final : public SdrAngleItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrShearAngleItem) SdrShearAngleItem(Degree100 nAngle = 0_deg100) - : SdrAngleItem(SDRATTR_SHEARANGLE, nAngle, SfxItemType::SdrShearAngleItemType) + : SdrAngleItem(SDRATTR_SHEARANGLE, nAngle) { } virtual SdrShearAngleItem* Clone(SfxItemPool*) const override diff --git a/svx/inc/sxsalitm.hxx b/svx/inc/sxsalitm.hxx index 0bf84bd08271..427381b4c773 100644 --- a/svx/inc/sxsalitm.hxx +++ b/svx/inc/sxsalitm.hxx @@ -24,7 +24,8 @@ class SdrHorzShearAllItem final : public SdrAngleItem { public: - SdrHorzShearAllItem(): SdrAngleItem(SDRATTR_HORZSHEARALL, 0_deg100, SfxItemType::SdrHorzShearAllItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrHorzShearAllItem) + SdrHorzShearAllItem(): SdrAngleItem(SDRATTR_HORZSHEARALL, 0_deg100) {} virtual SdrHorzShearAllItem* Clone(SfxItemPool*) const override { return new SdrHorzShearAllItem(*this); @@ -33,7 +34,8 @@ public: class SdrVertShearAllItem final : public SdrAngleItem { public: - SdrVertShearAllItem(): SdrAngleItem(SDRATTR_VERTSHEARALL, 0_deg100, SfxItemType::SdrVertShearAllItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrVertShearAllItem) + SdrVertShearAllItem(): SdrAngleItem(SDRATTR_VERTSHEARALL, 0_deg100) {} virtual SdrVertShearAllItem* Clone(SfxItemPool*) const override { return new SdrVertShearAllItem(*this); diff --git a/svx/inc/sxsiitm.hxx b/svx/inc/sxsiitm.hxx index a55e2ab1fde2..8a356fdc94b5 100644 --- a/svx/inc/sxsiitm.hxx +++ b/svx/inc/sxsiitm.hxx @@ -22,9 +22,9 @@ class SdrScaleItem: public SdrFractionItem { public: - SdrScaleItem(sal_uInt16 nId, const Fraction& rVal, - SfxItemType eItemType = SfxItemType::SdrScaleItemType) - : SdrFractionItem(nId,rVal, eItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrScaleItem) + 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 SdrScaleItem* Clone(SfxItemPool *pPool=nullptr) const override; }; diff --git a/svx/inc/sxsoitm.hxx b/svx/inc/sxsoitm.hxx index a6baf378161b..6134711dd7e8 100644 --- a/svx/inc/sxsoitm.hxx +++ b/svx/inc/sxsoitm.hxx @@ -24,7 +24,8 @@ class SdrHorzShearOneItem final : public SdrAngleItem { public: - SdrHorzShearOneItem(): SdrAngleItem(SDRATTR_HORZSHEARONE, 0_deg100, SfxItemType::SdrHorzShearOneItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrHorzShearOneItem) + SdrHorzShearOneItem(): SdrAngleItem(SDRATTR_HORZSHEARONE, 0_deg100) {} SdrHorzShearOneItem* Clone(SfxItemPool*) const override { return new SdrHorzShearOneItem(*this); @@ -33,7 +34,8 @@ public: class SdrVertShearOneItem final : public SdrAngleItem { public: - SdrVertShearOneItem(): SdrAngleItem(SDRATTR_VERTSHEARONE, 0_deg100, SfxItemType::SdrVertShearOneItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrVertShearOneItem) + SdrVertShearOneItem(): SdrAngleItem(SDRATTR_VERTSHEARONE, 0_deg100) {} SdrVertShearOneItem* Clone(SfxItemPool*) const override { return new SdrVertShearOneItem(*this); diff --git a/svx/inc/sxtraitm.hxx b/svx/inc/sxtraitm.hxx index fadfd67dca4b..1c83e8ae6173 100644 --- a/svx/inc/sxtraitm.hxx +++ b/svx/inc/sxtraitm.hxx @@ -24,7 +24,8 @@ class SdrTransformRef1XItem final : public SdrMetricItem { public: - SdrTransformRef1XItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF1X, nHgt, SfxItemType::SdrTransformRef1XItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrTransformRef1XItem) + SdrTransformRef1XItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF1X, nHgt) {} virtual SdrTransformRef1XItem* Clone(SfxItemPool*) const override { return new SdrTransformRef1XItem(*this); @@ -33,7 +34,8 @@ public: class SdrTransformRef1YItem final : public SdrMetricItem { public: - SdrTransformRef1YItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF1Y,nHgt, SfxItemType::SdrTransformRef1YItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrTransformRef1YItem) + SdrTransformRef1YItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF1Y,nHgt) {} virtual SdrTransformRef1YItem* Clone(SfxItemPool*) const override { return new SdrTransformRef1YItem(*this); @@ -42,7 +44,8 @@ public: class SdrTransformRef2XItem final : public SdrMetricItem { public: - SdrTransformRef2XItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF2X, nHgt, SfxItemType::SdrTransformRef2XItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrTransformRef2XItem) + SdrTransformRef2XItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF2X, nHgt) {} virtual SdrTransformRef2XItem* Clone(SfxItemPool*) const override { return new SdrTransformRef2XItem(*this); @@ -51,7 +54,8 @@ public: class SdrTransformRef2YItem final : public SdrMetricItem { public: - SdrTransformRef2YItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF2Y, nHgt, SfxItemType::SdrTransformRef2YItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrTransformRef2YItem) + SdrTransformRef2YItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF2Y, nHgt) {} virtual SdrTransformRef2YItem* Clone(SfxItemPool*) const override { return new SdrTransformRef2YItem(*this); diff --git a/svx/inc/xftshtit.hxx b/svx/inc/xftshtit.hxx index aaefab95143f..065ab56aa50b 100644 --- a/svx/inc/xftshtit.hxx +++ b/svx/inc/xftshtit.hxx @@ -30,6 +30,7 @@ class XFormTextShadowTranspItem final : public SfxUInt16Item { public: + DECLARE_ITEM_TYPE_FUNCTION(XFormTextShadowTranspItem) XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence = 0); virtual XFormTextShadowTranspItem* Clone(SfxItemPool* pPool = nullptr) const override; }; diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 736f300e7c4b..6a4e09e16021 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -135,13 +135,13 @@ SvxLongLRSpaceItem* SvxLongLRSpaceItem::Clone(SfxItemPool *) const } SvxLongLRSpaceItem::SvxLongLRSpaceItem(tools::Long lLeft, tools::Long lRight, TypedWhichId<SvxLongLRSpaceItem> nId) : - SfxPoolItem (nId, SfxItemType::SvxLongLRSpaceItemType), + SfxPoolItem (nId), mlLeft (lLeft), mlRight (lRight) {} SvxLongLRSpaceItem::SvxLongLRSpaceItem() : - SfxPoolItem (0, SfxItemType::SvxLongLRSpaceItemType), + SfxPoolItem (0), mlLeft (0), mlRight (0) {} @@ -254,13 +254,13 @@ SvxLongULSpaceItem* SvxLongULSpaceItem::Clone(SfxItemPool *) const } SvxLongULSpaceItem::SvxLongULSpaceItem(tools::Long lLeft, tools::Long lRight, TypedWhichId<SvxLongULSpaceItem> nId) : - SfxPoolItem (nId, SfxItemType::SvxLongULSpaceItemType), + SfxPoolItem (nId), mlLeft (lLeft), mlRight (lRight) {} SvxLongULSpaceItem::SvxLongULSpaceItem() : - SfxPoolItem (0, SfxItemType::SvxLongULSpaceItemType), + SfxPoolItem (0), mlLeft (0), mlRight (0) {} @@ -369,14 +369,14 @@ SvxPagePosSizeItem* SvxPagePosSizeItem::Clone(SfxItemPool *) const } SvxPagePosSizeItem::SvxPagePosSizeItem(const Point &rP, tools::Long lW, tools::Long lH) : - SfxPoolItem (SID_RULER_PAGE_POS, SfxItemType::SvxPagePosSizeItemType), + SfxPoolItem (SID_RULER_PAGE_POS), aPos (rP), lWidth (lW), lHeight (lH) {} SvxPagePosSizeItem::SvxPagePosSizeItem() : - SfxPoolItem (0, SfxItemType::SvxPagePosSizeItemType), + SfxPoolItem (0), aPos (0, 0), lWidth (0), lHeight (0) @@ -404,7 +404,7 @@ bool SvxColumnItem::operator==(const SfxPoolItem& rCmp) const } SvxColumnItem::SvxColumnItem( sal_uInt16 nAct ) : - SfxPoolItem (SID_RULER_BORDERS, SfxItemType::SvxColumnItemType ), + SfxPoolItem (SID_RULER_BORDERS ), nLeft (0), nRight (0), nActColumn (nAct), @@ -414,7 +414,7 @@ SvxColumnItem::SvxColumnItem( sal_uInt16 nAct ) : {} SvxColumnItem::SvxColumnItem( sal_uInt16 nActCol, sal_uInt16 left, sal_uInt16 right ) : - SfxPoolItem (SID_RULER_BORDERS, SfxItemType::SvxColumnItemType), + SfxPoolItem (SID_RULER_BORDERS), nLeft (left), nRight (right), nActColumn (nActCol), @@ -648,7 +648,7 @@ SvxObjectItem* SvxObjectItem::Clone(SfxItemPool *) const SvxObjectItem::SvxObjectItem( tools::Long nSX, tools::Long nEX, tools::Long nSY, tools::Long nEY ) : - SfxPoolItem (SID_RULER_OBJECT, SfxItemType::SvxObjectItemType), + SfxPoolItem (SID_RULER_OBJECT), nStartX (nSX), nEndX (nEX), nStartY (nSY), diff --git a/svx/source/dialog/svxgraphicitem.cxx b/svx/source/dialog/svxgraphicitem.cxx index eb5458c3284e..940941b6055a 100644 --- a/svx/source/dialog/svxgraphicitem.cxx +++ b/svx/source/dialog/svxgraphicitem.cxx @@ -22,7 +22,7 @@ #include <utility> SvxGraphicItem::SvxGraphicItem( Graphic _aGraphic ) - : SfxPoolItem( SID_GRAPHIC, SfxItemType::SvxGraphicItemType ), aGraphic(std::move( _aGraphic )) + : SfxPoolItem( SID_GRAPHIC ), aGraphic(std::move( _aGraphic )) { } diff --git a/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx index ea58e06de592..1bfa4f559111 100644 --- a/svx/source/engine3d/svx3ditems.cxx +++ b/svx/source/engine3d/svx3ditems.cxx @@ -31,8 +31,7 @@ using namespace ::com::sun::star; // Added extra Item (Bool) for chart2 to be able to show reduced line geometry Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(bool bVal) - : SfxBoolItem(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY, bVal, - SfxItemType::Svx3DReducedLineGeometryItemType) + : SfxBoolItem(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY, bVal) { } @@ -42,45 +41,42 @@ Svx3DReducedLineGeometryItem* Svx3DReducedLineGeometryItem::Clone(SfxItemPool*) } Svx3DNormalsKindItem::Svx3DNormalsKindItem(sal_uInt16 nVal) - : SfxUInt16Item(SDRATTR_3DOBJ_NORMALS_KIND, nVal, SfxItemType::Svx3DNormalsKindItemType) + : SfxUInt16Item(SDRATTR_3DOBJ_NORMALS_KIND, nVal) { } Svx3DTextureProjectionXItem::Svx3DTextureProjectionXItem(sal_uInt16 nVal) - : SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_PROJ_X, nVal, - SfxItemType::Svx3DTextureProjectionXItemType) + : SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_PROJ_X, nVal) { } Svx3DTextureProjectionYItem::Svx3DTextureProjectionYItem(sal_uInt16 nVal) - : SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_PROJ_Y, nVal, - SfxItemType::Svx3DTextureProjectionYItemType) + : SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_PROJ_Y, nVal) { } Svx3DTextureKindItem::Svx3DTextureKindItem(sal_uInt16 nVal) - : SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_KIND, nVal, SfxItemType::Svx3DTextureKindItemType) + : SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_KIND, nVal) { } Svx3DTextureModeItem::Svx3DTextureModeItem(sal_uInt16 nVal) - : SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_MODE, nVal, SfxItemType::Svx3DTextureModeItemType) + : SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_MODE, nVal) { } Svx3DPerspectiveItem::Svx3DPerspectiveItem(ProjectionType nVal) - : SfxUInt16Item(SDRATTR_3DSCENE_PERSPECTIVE, static_cast<sal_uInt16>(nVal), - SfxItemType::Svx3DPerspectiveItemType) + : SfxUInt16Item(SDRATTR_3DSCENE_PERSPECTIVE, static_cast<sal_uInt16>(nVal)) { } Svx3DShadeModeItem::Svx3DShadeModeItem(sal_uInt16 nVal) - : SfxUInt16Item(SDRATTR_3DSCENE_SHADE_MODE, nVal, SfxItemType::Svx3DShadeModeItemType) + : SfxUInt16Item(SDRATTR_3DSCENE_SHADE_MODE, nVal) { } Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(bool bVal) - : SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_NORMALS, bVal, SfxItemType::Svx3DSmoothNormalsItemType) + : SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_NORMALS, bVal) { } @@ -90,7 +86,7 @@ Svx3DSmoothNormalsItem* Svx3DSmoothNormalsItem::Clone(SfxItemPool*) const } Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(bool bVal) - : SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_LIDS, bVal, SfxItemType::Svx3DSmoothLidsItemType) + : SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_LIDS, bVal) { } @@ -100,7 +96,7 @@ Svx3DSmoothLidsItem* Svx3DSmoothLidsItem::Clone(SfxItemPool*) const } Svx3DCharacterModeItem::Svx3DCharacterModeItem(bool bVal) - : SfxBoolItem(SDRATTR_3DOBJ_CHARACTER_MODE, bVal, SfxItemType::Svx3DCharacterModeItemType) + : SfxBoolItem(SDRATTR_3DOBJ_CHARACTER_MODE, bVal) { } @@ -110,7 +106,7 @@ Svx3DCharacterModeItem* Svx3DCharacterModeItem::Clone(SfxItemPool*) const } Svx3DCloseFrontItem::Svx3DCloseFrontItem(bool bVal) - : SfxBoolItem(SDRATTR_3DOBJ_CLOSE_FRONT, bVal, SfxItemType::Svx3DCloseFrontItemType) + : SfxBoolItem(SDRATTR_3DOBJ_CLOSE_FRONT, bVal) { } @@ -120,7 +116,7 @@ Svx3DCloseFrontItem* Svx3DCloseFrontItem::Clone(SfxItemPool*) const } Svx3DCloseBackItem::Svx3DCloseBackItem(bool bVal) - : SfxBoolItem(SDRATTR_3DOBJ_CLOSE_BACK, bVal, SfxItemType::Svx3DCloseBackItemType) + : SfxBoolItem(SDRATTR_3DOBJ_CLOSE_BACK, bVal) { } diff --git a/svx/source/items/RectangleAlignmentItem.cxx b/svx/source/items/RectangleAlignmentItem.cxx index 6f09bf83b4e5..3b0b7b0f1081 100644 --- a/svx/source/items/RectangleAlignmentItem.cxx +++ b/svx/source/items/RectangleAlignmentItem.cxx @@ -12,7 +12,7 @@ SvxRectangleAlignmentItem::SvxRectangleAlignmentItem(sal_uInt16 nWhich, model::RectangleAlignment nValue) - : SfxEnumItem<model::RectangleAlignment>(nWhich, SfxItemType::RectangleAlignmentType, nValue) + : SfxEnumItem<model::RectangleAlignment>(nWhich, nValue) { } diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index 695b4dc87349..6cb9a1ced72b 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -39,7 +39,7 @@ SvxSmartTagItem::SvxSmartTagItem( const TypedWhichId<SvxSmartTagItem> nId, css::lang::Locale aLocale, OUString aApplicationName, OUString aRangeText ) : - SfxPoolItem( nId, SfxItemType::SvxSmartTagItemType ), + SfxPoolItem( nId ), maActionComponentsSequence( rActionComponentsSequence ), maActionIndicesSequence( rActionIndicesSequence ), maStringKeyMaps( rStringKeyMaps ), diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index afcfc2c724f8..e7a784b90b3c 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -39,12 +39,12 @@ SfxPoolItem* SvxMarginItem::CreateDefault() { return new SvxMarginItem(TypedWhi SvxOrientationItem::SvxOrientationItem( const SvxCellOrientation eOrientation, const TypedWhichId<SvxOrientationItem> nId): - SfxEnumItem( nId, SfxItemType::SvxOrientationItemType, eOrientation ) + SfxEnumItem( nId, eOrientation ) { } SvxOrientationItem::SvxOrientationItem( Degree100 nRotation, bool bStacked, const TypedWhichId<SvxOrientationItem> nId ) : - SfxEnumItem( nId, SfxItemType::SvxOrientationItemType, SvxCellOrientation::Standard ) + SfxEnumItem( nId, SvxCellOrientation::Standard ) { if( bStacked ) { @@ -144,7 +144,7 @@ Degree100 SvxOrientationItem::GetRotation( Degree100 nStdAngle ) const SvxMarginItem::SvxMarginItem( const TypedWhichId<SvxMarginItem> nId ) : - SfxPoolItem( nId, SfxItemType::SvxMarginItemType ), + SfxPoolItem( nId ), nLeftMargin ( 20 ), nTopMargin ( 20 ), @@ -159,7 +159,7 @@ SvxMarginItem::SvxMarginItem( sal_Int16 nLeft, sal_Int16 nRight, sal_Int16 nBottom, const TypedWhichId<SvxMarginItem> nId ) : - SfxPoolItem( nId, SfxItemType::SvxMarginItemType ), + SfxPoolItem( nId ), nLeftMargin ( nLeft ), nTopMargin ( nTop ), diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 11a299cfab01..44a7631910dd 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -31,7 +31,7 @@ SfxPoolItem* SvxDoubleItem::CreateDefault() { return new SvxDoubleItem(0.0, Typ SvxChartTextOrderItem::SvxChartTextOrderItem(SvxChartTextOrder eOrder, TypedWhichId<SvxChartTextOrderItem> nId) : - SfxEnumItem(nId, SfxItemType::SvxChartTextOrderItemType, eOrder) + SfxEnumItem(nId, eOrder) { } @@ -99,7 +99,7 @@ bool SvxChartTextOrderItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMe } SvxDoubleItem::SvxDoubleItem(double fValue, TypedWhichId<SvxDoubleItem> nId) : - SfxPoolItem(nId, SfxItemType::SvxDoubleItemType), + SfxPoolItem(nId), fVal(fValue) { } @@ -145,7 +145,7 @@ bool SvxDoubleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) SvxChartKindErrorItem::SvxChartKindErrorItem(SvxChartKindError eOrient, TypedWhichId<SvxChartKindErrorItem> nId) : - SfxEnumItem(nId, SfxItemType::SvxChartKindErrorItemType, eOrient) + SfxEnumItem(nId, eOrient) { } @@ -156,7 +156,7 @@ SvxChartKindErrorItem* SvxChartKindErrorItem::Clone(SfxItemPool* /*pPool*/) cons SvxChartIndicateItem::SvxChartIndicateItem(SvxChartIndicate eOrient, TypedWhichId<SvxChartIndicateItem> nId) : - SfxEnumItem(nId, SfxItemType::SvxChartIndicateItemType, eOrient) + SfxEnumItem(nId, eOrient) { } @@ -167,7 +167,7 @@ SvxChartIndicateItem* SvxChartIndicateItem::Clone(SfxItemPool* /*pPool*/) const SvxChartRegressItem::SvxChartRegressItem(SvxChartRegress eOrient, TypedWhichId<SvxChartRegressItem> nId) : - SfxEnumItem(nId, SfxItemType::SvxChartRegressItemType, eOrient) + SfxEnumItem(nId, eOrient) { } diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index 2fa7e3d89ff2..caae609f6204 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -35,7 +35,7 @@ struct SvxClipboardFormatItem_Impl SfxPoolItem* SvxClipboardFormatItem::CreateDefault() { return new SvxClipboardFormatItem(TypedWhichId<SvxClipboardFormatItem>(0)); }; SvxClipboardFormatItem::SvxClipboardFormatItem( TypedWhichId<SvxClipboardFormatItem> nId ) - : SfxPoolItem( nId, SfxItemType::SvxClipboardFormatItemType ), pImpl( new SvxClipboardFormatItem_Impl ) + : SfxPoolItem( nId ), pImpl( new SvxClipboardFormatItem_Impl ) { } diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index 9663fdf84d36..24944bf0b88b 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -29,11 +29,11 @@ using namespace com::sun::star; SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem() -: SfxPoolItem( SDRATTR_CUSTOMSHAPE_GEOMETRY, SfxItemType::SdrCustomShapeGeometryItemType ) +: SfxPoolItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) {} SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem( const uno::Sequence< beans::PropertyValue >& rVal ) -: SfxPoolItem( SDRATTR_CUSTOMSHAPE_GEOMETRY, SfxItemType::SdrCustomShapeGeometryItemType ) +: SfxPoolItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) { SetPropSeq( rVal ); } diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index dbc1428a3a4f..cb9086ab215d 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -33,13 +33,13 @@ SfxPoolItem* SvxDashListItem::CreateDefault() { return new SvxDashListItem ;} SfxPoolItem* SvxLineEndListItem::CreateDefault() { return new SvxLineEndListItem ;} SvxColorListItem::SvxColorListItem() - : SfxPoolItem( 0, SfxItemType::SvxColorListItemType) + : SfxPoolItem( 0 ) { } SvxColorListItem::SvxColorListItem( XColorListRef pTable, TypedWhichId<SvxColorListItem> nW ) : - SfxPoolItem( nW, SfxItemType::SvxColorListItemType ), + SfxPoolItem( nW ), pColorList(std::move( pTable )) { } @@ -95,12 +95,12 @@ bool svtype::PutValue( const css::uno::Any& rVal, sal_uInt8 ) \ QUERY_PUT_IMPL( SvxColorListItem, ColorList ) SvxGradientListItem::SvxGradientListItem() - : SfxPoolItem( 0, SfxItemType::SvxGradientListItemType) + : SfxPoolItem( 0 ) { } SvxGradientListItem::SvxGradientListItem( XGradientListRef pList, TypedWhichId<SvxGradientListItem> nW ) : - SfxPoolItem( nW, SfxItemType::SvxGradientListItemType ), + SfxPoolItem( nW ), pGradientList(std::move( pList )) { } @@ -140,13 +140,13 @@ SvxGradientListItem* SvxGradientListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxGradientListItem, GradientList ) SvxHatchListItem::SvxHatchListItem() - : SfxPoolItem( 0, SfxItemType::SvxHatchListItemType) + : SfxPoolItem( 0 ) { } SvxHatchListItem::SvxHatchListItem( XHatchListRef pList, TypedWhichId<SvxHatchListItem> nW ) : - SfxPoolItem( nW, SfxItemType::SvxHatchListItemType ), + SfxPoolItem( nW ), pHatchList(std::move( pList )) { } @@ -186,12 +186,12 @@ SvxHatchListItem* SvxHatchListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxHatchListItem, HatchList ) SvxBitmapListItem::SvxBitmapListItem() - : SfxPoolItem( 0, SfxItemType::SvxBitmapListItemType ) + : SfxPoolItem( 0 ) { } SvxBitmapListItem::SvxBitmapListItem( XBitmapListRef pList, TypedWhichId<SvxBitmapListItem> nW ) : - SfxPoolItem( nW, SfxItemType::SvxBitmapListItemType ), + SfxPoolItem( nW ), pBitmapList(std::move( pList )) { } @@ -228,12 +228,12 @@ SvxBitmapListItem* SvxBitmapListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxBitmapListItem, BitmapList ) SvxPatternListItem::SvxPatternListItem() - : SfxPoolItem( 0, SfxItemType::SvxPatternListItemType ) + : SfxPoolItem( 0 ) { } SvxPatternListItem::SvxPatternListItem( XPatternListRef pList, TypedWhichId<SvxPatternListItem> nW ) : - SfxPoolItem( nW, SfxItemType::SvxPatternListItemType ), + SfxPoolItem( nW ), pPatternList(std::move( pList )) { } @@ -270,12 +270,12 @@ SvxPatternListItem* SvxPatternListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxPatternListItem, PatternList ) SvxDashListItem::SvxDashListItem() - : SfxPoolItem( 0, SfxItemType::SvxDashListItemType ) + : SfxPoolItem( 0 ) { } SvxDashListItem::SvxDashListItem( XDashListRef pList, TypedWhichId<SvxDashListItem> nW ) : - SfxPoolItem( nW, SfxItemType::SvxDashListItemType ), + SfxPoolItem( nW ), pDashList(std::move( pList )) { } @@ -312,12 +312,12 @@ SvxDashListItem* SvxDashListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxDashListItem, DashList ) SvxLineEndListItem::SvxLineEndListItem() - : SfxPoolItem( 0, SfxItemType::SvxLineEndListItemType ) + : SfxPoolItem( 0 ) { } SvxLineEndListItem::SvxLineEndListItem( XLineEndListRef pList, TypedWhichId<SvxLineEndListItem> nW ) : - SfxPoolItem( nW, SfxItemType::SvxLineEndListItemType ), + SfxPoolItem( nW ), pLineEndList(std::move( pList )) { } diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx index 736b3ab76e7a..6eb41ee0babd 100644 --- a/svx/source/items/e3ditem.cxx +++ b/svx/source/items/e3ditem.cxx @@ -31,7 +31,7 @@ SvxB3DVectorItem::~SvxB3DVectorItem() SvxB3DVectorItem::SvxB3DVectorItem( TypedWhichId<SvxB3DVectorItem> _nWhich, const basegfx::B3DVector& rVal ) : - SfxPoolItem( _nWhich, SfxItemType::SvxB3DVectorItemType ), + SfxPoolItem( _nWhich ), m_aVal( rVal ) { } diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx index b69062f75386..fa950c3a7232 100644 --- a/svx/source/items/galleryitem.cxx +++ b/svx/source/items/galleryitem.cxx @@ -32,7 +32,7 @@ SfxPoolItem* SvxGalleryItem::CreateDefault() { return new SvxGalleryItem; } SvxGalleryItem::SvxGalleryItem() - : SfxPoolItem( 0, SfxItemType::SvxGalleryItemType ) + : SfxPoolItem( 0 ) , m_nType( css::gallery::GalleryItemType::EMPTY ) { } diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index d65682d28da1..7081867164b4 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -26,15 +26,14 @@ using namespace ::com::sun::star; -SvxGrfCrop::SvxGrfCrop( TypedWhichId<SvxGrfCrop> nItemId, SfxItemType eType ) - : SfxPoolItem( nItemId, eType ), +SvxGrfCrop::SvxGrfCrop( TypedWhichId<SvxGrfCrop> nItemId ) + : SfxPoolItem( nItemId ), m_nLeft( 0 ), m_nRight( 0 ), m_nTop( 0 ), m_nBottom( 0 ) {} SvxGrfCrop::SvxGrfCrop( sal_Int32 nL, sal_Int32 nR, - sal_Int32 nT, sal_Int32 nB, TypedWhichId<SvxGrfCrop> nItemId, - SfxItemType eItemType ) - : SfxPoolItem( nItemId, eItemType ), + sal_Int32 nT, sal_Int32 nB, TypedWhichId<SvxGrfCrop> nItemId) + : SfxPoolItem( nItemId ), m_nLeft( nL ), m_nRight( nR ), m_nTop( nT ), m_nBottom( nB ) {} diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 7d893decd37a..b56c9bc5c955 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -44,7 +44,7 @@ SvxHyperlinkItem::SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem ): SvxHyperlinkItem::SvxHyperlinkItem( TypedWhichId<SvxHyperlinkItem> _nWhich, OUString aName, OUString aURL, OUString aTarget, OUString aIntName, SvxLinkInsertMode eTyp, HyperDialogEvent nEvents, SvxMacroTableDtor const *pMacroTbl, OUString aReplacementText): - SfxPoolItem (_nWhich, SfxItemType::SvxHyperlinkItemType ), + SfxPoolItem (_nWhich ), sName (std::move(aName)), sURL (std::move(aURL)), sTarget (std::move(aTarget)), diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index 3006cc9efd3d..5d720260e03c 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -23,7 +23,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const TypedWhichId<SvxNumberInfoItem> nId ) : - SfxPoolItem ( nId, SfxItemType::SvxNumberInfoItemType ), + SfxPoolItem ( nId ), pFormatter ( pNumFormatter ), eValueType ( SvxNumberValueType::Undefined ), aStringVal ( u""_ustr ), @@ -34,7 +34,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, OUString aVal, const TypedWhichId<SvxNumberInfoItem> nId ) : - SfxPoolItem ( nId, SfxItemType::SvxNumberInfoItemType ), + SfxPoolItem ( nId ), pFormatter ( pNumFormatter ), eValueType ( SvxNumberValueType::String ), aStringVal (std::move( aVal )), @@ -45,7 +45,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, const TypedWhichId<SvxNumberInfoItem> nId ) : - SfxPoolItem ( nId, SfxItemType::SvxNumberInfoItemType ), + SfxPoolItem ( nId ), pFormatter ( pNumFormatter ), eValueType ( SvxNumberValueType::Number ), aStringVal ( u""_ustr ), @@ -57,7 +57,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, OUString aValueStr, const TypedWhichId<SvxNumberInfoItem> nId ) : - SfxPoolItem ( nId, SfxItemType::SvxNumberInfoItemType ), + SfxPoolItem ( nId ), pFormatter ( pNumFormatter ), eValueType ( SvxNumberValueType::Number ), aStringVal (std::move( aValueStr )), diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx index c65a86a643a7..0d2380f8d7f3 100644 --- a/svx/source/items/ofaitem.cxx +++ b/svx/source/items/ofaitem.cxx @@ -23,7 +23,7 @@ #include <utility> OfaPtrItem::OfaPtrItem( sal_uInt16 _nWhich, void *_pPtr ) - : SfxPoolItem( _nWhich, SfxItemType::OfaPtrItemType ) + : SfxPoolItem( _nWhich ) , pPtr( _pPtr ) { @@ -41,7 +41,7 @@ OfaPtrItem* OfaPtrItem::Clone( SfxItemPool * ) const } OfaXColorListItem::OfaXColorListItem( sal_uInt16 _nWhich, rtl::Reference<XColorList> xRef ) - : SfxPoolItem( _nWhich, SfxItemType::OfaXColorListItemType ) + : SfxPoolItem( _nWhich ) , mxRef(std::move( xRef )) {} diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 15d650bbddb5..f3b322e248d4 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star; SfxPoolItem* SvxPageItem::CreateDefault() { return new SvxPageItem(TypedWhichId<SvxPageItem>(0));} SvxPageItem::SvxPageItem( const TypedWhichId<SvxPageItem> nId ) - : SfxPoolItem( nId, SfxItemType::SvxPageItemType ), + : SfxPoolItem( nId ), eNumType ( SVX_NUM_ARABIC ), bLandscape ( false ), diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index 09c3f606c03b..267c2cd9ad18 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -66,13 +66,13 @@ SvxPostItAuthorItem* SvxPostItAuthorItem::Clone( SfxItemPool * ) const } SvxPostItDateItem::SvxPostItDateItem( TypedWhichId<SvxPostItDateItem> _nWhich ) - : SfxStringItem(_nWhich, SfxItemType::SvxPostItDateItemType) + : SfxStringItem(_nWhich) { } SvxPostItDateItem::SvxPostItDateItem( const OUString& rDate, TypedWhichId<SvxPostItDateItem> _nWhich ) : - SfxStringItem( _nWhich, rDate, SfxItemType::SvxPostItDateItemType ) + SfxStringItem( _nWhich, rDate ) { } diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index cb9adf051148..eb559fdaeb62 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -33,7 +33,7 @@ SfxPoolItem* SvxRotateModeItem::CreateDefault() { return new SvxRotateModeItem( SvxRotateModeItem::SvxRotateModeItem( SvxRotateMode eMode, TypedWhichId<SvxRotateModeItem> _nWhich ) - : SfxEnumItem( _nWhich, SfxItemType::SvxRotateModeItemType, eMode ) + : SfxEnumItem( _nWhich, eMode ) { } diff --git a/svx/source/items/statusitem.cxx b/svx/source/items/statusitem.cxx index 5d8a74dbe19d..e2e1c74307dc 100644 --- a/svx/source/items/statusitem.cxx +++ b/svx/source/items/statusitem.cxx @@ -19,7 +19,7 @@ constexpr int STATUS_PARAMS = 2; SvxStatusItem::SvxStatusItem(TypedWhichId<SvxStatusItem> nWhich, const OUString& rString, StatusCategory eCategory) - : SfxStringItem(nWhich, rString, SfxItemType::SvxStatusItemType) + : SfxStringItem(nWhich, rString) , m_eCategory(eCategory) { } diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index 2761dced30d7..78a03efb5edd 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -40,7 +40,7 @@ SvxViewLayoutItem::SvxViewLayoutItem bool bBookMode, TypedWhichId<SvxViewLayoutItem> _nWhich ) -: SfxUInt16Item( _nWhich, nColumns, SfxItemType::SvxViewLayoutItemType ), +: SfxUInt16Item( _nWhich, nColumns ), mbBookMode( bBookMode ) { } diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index ba54a68e7739..deb2bf059786 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -36,7 +36,7 @@ constexpr OUString ZOOMSLIDER_PARAM_MAXZOOM = u"MaxValue"_ustr; SvxZoomSliderItem::SvxZoomSliderItem( sal_uInt16 nCurrentZoom, sal_uInt16 nMinZoom, sal_uInt16 nMaxZoom, TypedWhichId<SvxZoomSliderItem> _nWhich ) -: SfxUInt16Item( _nWhich, nCurrentZoom, SfxItemType::SvxZoomSliderItemType ), mnMinZoom( nMinZoom ), mnMaxZoom( nMaxZoom ) +: SfxUInt16Item( _nWhich, nCurrentZoom ), mnMinZoom( nMinZoom ), mnMaxZoom( nMaxZoom ) { } diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index ab052e912031..27990fd7a031 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -1485,7 +1485,7 @@ bool SdrTextAniAmountItem::GetPresentation( SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( bool bUseFixedCellHeight ) - : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, bUseFixedCellHeight, SfxItemType::SdrTextFixedCellHeightItemType ) + : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, bUseFixedCellHeight ) { } bool SdrTextFixedCellHeightItem::GetPresentation( SfxItemPresentation ePres, diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index c930f2fb2b74..a4fc0f9dd4cc 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -44,9 +44,10 @@ namespace class SampleItem : public NameOrIndex { public: - SampleItem(sal_uInt16 nWhich, const OUString& rName) : NameOrIndex(TypedWhichId<NameOrIndex>(nWhich), rName, SfxItemType::NameOrIndexType) {} + DECLARE_ITEM_TYPE_FUNCTION(SampleItem) + SampleItem(sal_uInt16 nWhich, const OUString& rName) : NameOrIndex(TypedWhichId<NameOrIndex>(nWhich), rName) {} - bool operator==(const SfxPoolItem& rCmp) const + bool operator==(const SfxPoolItem& rCmp) const override { assert(dynamic_cast<const NameOrIndex*>(&rCmp) && "comparing different pool item subclasses"); auto const & rOther = static_cast<const NameOrIndex&>(rCmp); diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 631eea814f9b..b0fbc7bf7043 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -97,15 +97,15 @@ using namespace ::com::sun::star; typedef std::map<OUString, OUString> StringMap; -NameOrIndex::NameOrIndex(TypedWhichId<NameOrIndex> _nWhich, sal_Int32 nIndex, SfxItemType eItemType) : - SfxStringItem(_nWhich, OUString(), eItemType), +NameOrIndex::NameOrIndex(TypedWhichId<NameOrIndex> _nWhich, sal_Int32 nIndex) : + SfxStringItem(_nWhich, OUString()), m_nPalIndex(nIndex) { setNameOrIndex(); } -NameOrIndex::NameOrIndex(TypedWhichId<NameOrIndex> _nWhich, const OUString& rName, SfxItemType eItemType) : - SfxStringItem(_nWhich, rName, eItemType), +NameOrIndex::NameOrIndex(TypedWhichId<NameOrIndex> _nWhich, const OUString& rName) : + SfxStringItem(_nWhich, rName), m_nPalIndex(-1) { setNameOrIndex(); @@ -272,22 +272,22 @@ void NameOrIndex::dumpAsXml(xmlTextWriterPtr pWriter) const (void)xmlTextWriterEndElement(pWriter); } -SfxPoolItem* XColorItem::CreateDefault() { return new XColorItem(SfxItemType::XColorItemType); } +SfxPoolItem* XColorItem::CreateDefault() { return new XColorItem(); } -XColorItem::XColorItem(TypedWhichId<XColorItem> _nWhich, sal_Int32 nIndex, const Color& rTheColor, SfxItemType eItemType) : - NameOrIndex(_nWhich, nIndex, eItemType), +XColorItem::XColorItem(TypedWhichId<XColorItem> _nWhich, sal_Int32 nIndex, const Color& rTheColor) : + NameOrIndex(_nWhich, nIndex), m_aColor(rTheColor) { } -XColorItem::XColorItem(TypedWhichId<XColorItem> _nWhich, const OUString& rName, const Color& rTheColor, SfxItemType eItemType) : - NameOrIndex(_nWhich, rName, eItemType), +XColorItem::XColorItem(TypedWhichId<XColorItem> _nWhich, const OUString& rName, const Color& rTheColor) : + NameOrIndex(_nWhich, rName), m_aColor(rTheColor) { } -XColorItem::XColorItem(TypedWhichId<XColorItem> _nWhich, const Color& rTheColor, SfxItemType eItemType) - : NameOrIndex(_nWhich, OUString(), eItemType) +XColorItem::XColorItem(TypedWhichId<XColorItem> _nWhich, const Color& rTheColor) + : NameOrIndex(_nWhich, OUString()) , m_aColor(rTheColor) { } @@ -427,7 +427,7 @@ void XColorItem::dumpAsXml(xmlTextWriterPtr pWriter) const SfxPoolItem* XLineStyleItem::CreateDefault() { return new XLineStyleItem; } XLineStyleItem::XLineStyleItem(css::drawing::LineStyle eTheLineStyle) : - SfxEnumItem(XATTR_LINESTYLE, SfxItemType::XLineStyleItemType, eTheLineStyle) + SfxEnumItem(XATTR_LINESTYLE, eTheLineStyle) { } @@ -664,7 +664,7 @@ double XDash::CreateDotDashArray(::std::vector< double >& rDotDashArray, double SfxPoolItem* XLineDashItem::CreateDefault() {return new XLineDashItem;} XLineDashItem::XLineDashItem(const OUString& rName, const XDash& rTheDash) : - NameOrIndex(XATTR_LINEDASH, rName, SfxItemType::XLineDashItemType), + NameOrIndex(XATTR_LINEDASH, rName), aDash(rTheDash) { } @@ -676,7 +676,7 @@ XLineDashItem::XLineDashItem(const XLineDashItem& rItem) : } XLineDashItem::XLineDashItem(const XDash& rTheDash) -: NameOrIndex( XATTR_LINEDASH, -1, SfxItemType::XLineDashItemType ), +: NameOrIndex( XATTR_LINEDASH, -1 ), aDash(rTheDash) { } @@ -980,7 +980,7 @@ std::unique_ptr<XLineDashItem> XLineDashItem::checkForUniqueItem( SdrModel& rMod SfxPoolItem* XLineWidthItem::CreateDefault() {return new XLineWidthItem;} XLineWidthItem::XLineWidthItem(tools::Long nWidth) : - SfxMetricItem(XATTR_LINEWIDTH, nWidth, SfxItemType::XLineWidthItemType) + SfxMetricItem(XATTR_LINEWIDTH, nWidth) { } @@ -1027,12 +1027,12 @@ bool XLineWidthItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) SfxPoolItem* XLineColorItem::CreateDefault() { return new XLineColorItem; } XLineColorItem::XLineColorItem(sal_Int32 nIndex, const Color& rTheColor) : - XColorItem(XATTR_LINECOLOR, nIndex, rTheColor, SfxItemType::XLineColorItemType) + XColorItem(XATTR_LINECOLOR, nIndex, rTheColor) { } XLineColorItem::XLineColorItem(const OUString& rName, const Color& rTheColor) : - XColorItem(XATTR_LINECOLOR, rName, rTheColor, SfxItemType::XLineColorItemType) + XColorItem(XATTR_LINECOLOR, rName, rTheColor) { } @@ -1122,12 +1122,12 @@ bool XLineColorItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId) SfxPoolItem* XLineStartItem::CreateDefault() {return new XLineStartItem;} XLineStartItem::XLineStartItem(sal_Int32 nIndex) -: NameOrIndex(XATTR_LINESTART, nIndex, SfxItemType::XLineStartItemType) +: NameOrIndex(XATTR_LINESTART, nIndex) { } XLineStartItem::XLineStartItem(const OUString& rName, basegfx::B2DPolyPolygon aPolyPolygon) -: NameOrIndex(XATTR_LINESTART, rName, SfxItemType::XLineStartItemType), +: NameOrIndex(XATTR_LINESTART, rName), maPolyPolygon(std::move(aPolyPolygon)) { } @@ -1139,7 +1139,7 @@ XLineStartItem::XLineStartItem(const XLineStartItem& rItem) } XLineStartItem::XLineStartItem(basegfx::B2DPolyPolygon aPolyPolygon) -: NameOrIndex( XATTR_LINESTART, -1, SfxItemType::XLineStartItemType ), +: NameOrIndex( XATTR_LINESTART, -1 ), maPolyPolygon(std::move(aPolyPolygon)) { } @@ -1425,12 +1425,12 @@ std::unique_ptr<XLineStartItem> XLineStartItem::checkForUniqueItem( SdrModel& rM SfxPoolItem* XLineEndItem::CreateDefault() {return new XLineEndItem;} XLineEndItem::XLineEndItem(sal_Int32 nIndex) -: NameOrIndex(XATTR_LINEEND, nIndex, SfxItemType::XLineEndItemType) +: NameOrIndex(XATTR_LINEEND, nIndex) { } XLineEndItem::XLineEndItem(const OUString& rName, basegfx::B2DPolyPolygon aPolyPolygon) -: NameOrIndex(XATTR_LINEEND, rName, SfxItemType::XLineEndItemType), +: NameOrIndex(XATTR_LINEEND, rName), maPolyPolygon(std::move(aPolyPolygon)) { } @@ -1442,7 +1442,7 @@ XLineEndItem::XLineEndItem(const XLineEndItem& rItem) } XLineEndItem::XLineEndItem(basegfx::B2DPolyPolygon aPolyPolygon) -: NameOrIndex( XATTR_LINEEND, -1, SfxItemType::XLineEndItemType ), +: NameOrIndex( XATTR_LINEEND, -1 ), maPolyPolygon(std::move(aPolyPolygon)) { } @@ -1726,7 +1726,7 @@ bool XLineEndItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) } XLineStartWidthItem::XLineStartWidthItem(tools::Long nWidth) : - SfxMetricItem(XATTR_LINESTARTWIDTH, nWidth, SfxItemType::XLineStartWidthItemType) + SfxMetricItem(XATTR_LINESTARTWIDTH, nWidth) { } @@ -1764,7 +1764,7 @@ bool XLineStartWidthItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemb } XLineEndWidthItem::XLineEndWidthItem(tools::Long nWidth) : - SfxMetricItem(XATTR_LINEENDWIDTH, nWidth, SfxItemType::XLineEndWidthItemType) + SfxMetricItem(XATTR_LINEENDWIDTH, nWidth) { } @@ -1802,7 +1802,7 @@ bool XLineEndWidthItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMember } XLineStartCenterItem::XLineStartCenterItem(bool bStartCenter) : - SfxBoolItem(XATTR_LINESTARTCENTER, bStartCenter, SfxItemType::XLineStartCenterItem) + SfxBoolItem(XATTR_LINESTARTCENTER, bStartCenter) { } @@ -1841,7 +1841,7 @@ bool XLineStartCenterItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMem } XLineEndCenterItem::XLineEndCenterItem(bool bEndCenter) : - SfxBoolItem(XATTR_LINEENDCENTER, bEndCenter, SfxItemType::XLineEndCenterItemType) + SfxBoolItem(XATTR_LINEENDCENTER, bEndCenter) { } @@ -1885,7 +1885,7 @@ bool XLineEndCenterItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMembe SfxPoolItem* XFillStyleItem::CreateDefault() { return new XFillStyleItem; } XFillStyleItem::XFillStyleItem(drawing::FillStyle eFillStyle) : - SfxEnumItem(XATTR_FILLSTYLE, SfxItemType::XFillStyleItemType, eFillStyle) + SfxEnumItem(XATTR_FILLSTYLE, eFillStyle) { } @@ -2014,12 +2014,12 @@ boost::property_tree::ptree XFillStyleItem::dumpAsJSON() const SfxPoolItem* XFillColorItem::CreateDefault() { return new XFillColorItem; } XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor) : - XColorItem(XATTR_FILLCOLOR, nIndex, rTheColor, SfxItemType::XFillColorItemType) + XColorItem(XATTR_FILLCOLOR, nIndex, rTheColor) { } XFillColorItem::XFillColorItem(const OUString& rName, const Color& rTheColor) : - XColorItem(XATTR_FILLCOLOR, rName, rTheColor, SfxItemType::XFillColorItemType) + XColorItem(XATTR_FILLCOLOR, rName, rTheColor) { } @@ -2184,7 +2184,7 @@ boost::property_tree::ptree XFillColorItem::dumpAsJSON() const } XSecondaryFillColorItem::XSecondaryFillColorItem(const OUString& rName, const Color& rTheColor) : - XColorItem(XATTR_SECONDARYFILLCOLOR, rName, rTheColor, SfxItemType::XSecondaryFillColorItemType) + XColorItem(XATTR_SECONDARYFILLCOLOR, rName, rTheColor) { } @@ -2209,18 +2209,16 @@ SfxPoolItem* XFillGradientItem::CreateDefault() { return new XFillGradientItem; XFillGradientItem::XFillGradientItem(sal_Int32 nIndex, const basegfx::BGradient& rTheGradient, - TypedWhichId<XFillGradientItem> nWhich, - SfxItemType eItemType) : - NameOrIndex(nWhich, nIndex, eItemType), + TypedWhichId<XFillGradientItem> nWhich) : + NameOrIndex(nWhich, nIndex), m_aGradient(rTheGradient) { } XFillGradientItem::XFillGradientItem(const OUString& rName, const basegfx::BGradient& rTheGradient, - TypedWhichId<XFillGradientItem> nWhich, - SfxItemType eItemType) - : NameOrIndex(nWhich, rName, eItemType) + TypedWhichId<XFillGradientItem> nWhich) + : NameOrIndex(nWhich, rName) , m_aGradient(rTheGradient) { } @@ -2232,9 +2230,8 @@ XFillGradientItem::XFillGradientItem(const XFillGradientItem& rItem) : } XFillGradientItem::XFillGradientItem( const basegfx::BGradient& rTheGradient, - TypedWhichId<XFillGradientItem> nWhich, - SfxItemType eItemType ) -: NameOrIndex( nWhich, -1, eItemType ), + TypedWhichId<XFillGradientItem> nWhich) +: NameOrIndex( nWhich, -1 ), m_aGradient(rTheGradient) { } @@ -2508,13 +2505,13 @@ boost::property_tree::ptree XFillGradientItem::dumpAsJSON() const SfxPoolItem* XFillFloatTransparenceItem::CreateDefault() { return new XFillFloatTransparenceItem; } XFillFloatTransparenceItem::XFillFloatTransparenceItem() : - XFillGradientItem(XATTR_FILLFLOATTRANSPARENCE, SfxItemType::XFillFloatTransparenceItemType), + XFillGradientItem(XATTR_FILLFLOATTRANSPARENCE), bEnabled( false ) { } XFillFloatTransparenceItem::XFillFloatTransparenceItem(const OUString& rName, const basegfx::BGradient& rGradient, bool bEnable ) : - XFillGradientItem ( rName, rGradient, XATTR_FILLFLOATTRANSPARENCE, SfxItemType::XFillFloatTransparenceItemType ), + XFillGradientItem ( rName, rGradient, XATTR_FILLFLOATTRANSPARENCE ), bEnabled ( bEnable ) { } @@ -2526,7 +2523,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( const XFillFloatTranspar } XFillFloatTransparenceItem::XFillFloatTransparenceItem(const basegfx::BGradient& rTheGradient, bool bEnable ) -: XFillGradientItem ( -1, rTheGradient, XATTR_FILLFLOATTRANSPARENCE, SfxItemType::XFillFloatTransparenceItemType ), +: XFillGradientItem ( -1, rTheGradient, XATTR_FILLFLOATTRANSPARENCE ), bEnabled ( bEnable ) { } @@ -2663,7 +2660,7 @@ SfxPoolItem* XFillHatchItem::CreateDefault() { return new XFillHatchItem; } XFillHatchItem::XFillHatchItem(const OUString& rName, const XHatch& rTheHatch) : - NameOrIndex(XATTR_FILLHATCH, rName, SfxItemType::XFillHatchItemType), + NameOrIndex(XATTR_FILLHATCH, rName), m_aHatch(rTheHatch) { } @@ -2675,7 +2672,7 @@ XFillHatchItem::XFillHatchItem(const XFillHatchItem& rItem) : } XFillHatchItem::XFillHatchItem(const XHatch& rTheHatch) -: NameOrIndex( XATTR_FILLHATCH, -1, SfxItemType::XFillHatchItemType ), +: NameOrIndex( XATTR_FILLHATCH, -1 ), m_aHatch(rTheHatch) { } @@ -2888,7 +2885,7 @@ std::unique_ptr<XFillHatchItem> XFillHatchItem::checkForUniqueItem( SdrModel& rM SfxPoolItem* XFormTextStyleItem::CreateDefault() { return new XFormTextStyleItem; } XFormTextStyleItem::XFormTextStyleItem(XFormTextStyle eTheStyle) : - SfxEnumItem(XATTR_FORMTXTSTYLE, SfxItemType::XFormTextStyleItemType, eTheStyle) + SfxEnumItem(XATTR_FORMTXTSTYLE, eTheStyle) { } @@ -2921,7 +2918,7 @@ bool XFormTextStyleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ SfxPoolItem* XFormTextAdjustItem::CreateDefault() { return new XFormTextAdjustItem; } XFormTextAdjustItem::XFormTextAdjustItem(XFormTextAdjust eTheAdjust) : - SfxEnumItem(XATTR_FORMTXTADJUST, SfxItemType::XFormTextAdjustItemType, eTheAdjust) + SfxEnumItem(XATTR_FORMTXTADJUST, eTheAdjust) { } @@ -2954,7 +2951,7 @@ bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId* SfxPoolItem* XFormTextDistanceItem::CreateDefault() { return new XFormTextDistanceItem; } XFormTextDistanceItem::XFormTextDistanceItem(tools::Long nDist) : - SfxMetricItem(XATTR_FORMTXTDISTANCE, nDist, SfxItemType::XFormTextDistanceItemType) + SfxMetricItem(XATTR_FORMTXTDISTANCE, nDist) { } @@ -2966,7 +2963,7 @@ XFormTextDistanceItem* XFormTextDistanceItem::Clone(SfxItemPool* /*pPool*/) cons SfxPoolItem* XFormTextStartItem::CreateDefault() { return new XFormTextStartItem; } XFormTextStartItem::XFormTextStartItem(tools::Long nStart) : - SfxMetricItem(XATTR_FORMTXTSTART, nStart, SfxItemType::XFormTextStartItemType) + SfxMetricItem(XATTR_FORMTXTSTART, nStart) { } @@ -2978,7 +2975,7 @@ XFormTextStartItem* XFormTextStartItem::Clone(SfxItemPool* /*pPool*/) const SfxPoolItem* XFormTextMirrorItem::CreateDefault() { return new XFormTextMirrorItem; } XFormTextMirrorItem::XFormTextMirrorItem(bool bMirror) : - SfxBoolItem(XATTR_FORMTXTMIRROR, bMirror, SfxItemType::XFormTextMirrorItemType) + SfxBoolItem(XATTR_FORMTXTMIRROR, bMirror) { } @@ -2990,7 +2987,7 @@ XFormTextMirrorItem* XFormTextMirrorItem::Clone(SfxItemPool* /*pPool*/) const SfxPoolItem* XFormTextOutlineItem::CreateDefault() { return new XFormTextOutlineItem; } XFormTextOutlineItem::XFormTextOutlineItem(bool bOutline) : - SfxBoolItem(XATTR_FORMTXTOUTLINE, bOutline, SfxItemType::XFormTextOutlineItemType) + SfxBoolItem(XATTR_FORMTXTOUTLINE, bOutline) { } @@ -3002,7 +2999,7 @@ XFormTextOutlineItem* XFormTextOutlineItem::Clone(SfxItemPool* /*pPool*/) const SfxPoolItem* XFormTextShadowItem::CreateDefault() { return new XFormTextShadowItem; } XFormTextShadowItem::XFormTextShadowItem(XFormTextShadow eFormTextShadow) : - SfxEnumItem(XATTR_FORMTXTSHADOW, SfxItemType::XFormTextShadowItemType, eFormTextShadow) + SfxEnumItem(XATTR_FORMTXTSHADOW, eFormTextShadow) { } @@ -3036,7 +3033,7 @@ SfxPoolItem* XFormTextShadowColorItem::CreateDefault() { return new XFormTextSha XFormTextShadowColorItem::XFormTextShadowColorItem(const OUString& rName, const Color& rTheColor) : - XColorItem(XATTR_FORMTXTSHDWCOLOR, rName, rTheColor, SfxItemType::XFormTextShadowColorItemType) + XColorItem(XATTR_FORMTXTSHDWCOLOR, rName, rTheColor) { } @@ -3048,7 +3045,7 @@ XFormTextShadowColorItem* XFormTextShadowColorItem::Clone(SfxItemPool* /*pPool*/ SfxPoolItem* XFormTextShadowXValItem::CreateDefault() { return new XFormTextShadowXValItem; } XFormTextShadowXValItem::XFormTextShadowXValItem(tools::Long nVal) : - SfxMetricItem(XATTR_FORMTXTSHDWXVAL, nVal, SfxItemType::XFormTextShadowXValItemType) + SfxMetricItem(XATTR_FORMTXTSHDWXVAL, nVal) { } @@ -3060,7 +3057,7 @@ XFormTextShadowXValItem* XFormTextShadowXValItem::Clone(SfxItemPool* /*pPool*/) SfxPoolItem* XFormTextShadowYValItem::CreateDefault() { return new XFormTextShadowYValItem; } XFormTextShadowYValItem::XFormTextShadowYValItem(tools::Long nVal) : - SfxMetricItem(XATTR_FORMTXTSHDWYVAL, nVal, SfxItemType::XFormTextShadowYValItemType) + SfxMetricItem(XATTR_FORMTXTSHDWYVAL, nVal) { } @@ -3072,7 +3069,7 @@ XFormTextShadowYValItem* XFormTextShadowYValItem::Clone(SfxItemPool* /*pPool*/) SfxPoolItem* XFormTextHideFormItem::CreateDefault() { return new XFormTextHideFormItem; } XFormTextHideFormItem::XFormTextHideFormItem(bool bHide) : - SfxBoolItem(XATTR_FORMTXTHIDEFORM, bHide, SfxItemType::XFormTextHideFormItemType) + SfxBoolItem(XATTR_FORMTXTHIDEFORM, bHide) { } @@ -3086,14 +3083,13 @@ XFormTextHideFormItem* XFormTextHideFormItem::Clone(SfxItemPool* /*pPool*/) cons /// a line attribute set item XLineAttrSetItem::XLineAttrSetItem( SfxItemSet&& pItemSet ) : - SfxSetItem( XATTRSET_LINE, std::move(pItemSet), SfxItemType::XLineAttrSetItemType) + SfxSetItem( XATTRSET_LINE, std::move(pItemSet)) { } XLineAttrSetItem::XLineAttrSetItem( SfxItemPool* pItemPool ) : SfxSetItem( XATTRSET_LINE, - SfxItemSetFixed<XATTR_LINE_FIRST, XATTR_LINE_LAST>( *pItemPool ), - SfxItemType::XLineAttrSetItemType) + SfxItemSetFixed<XATTR_LINE_FIRST, XATTR_LINE_LAST>( *pItemPool )) { } @@ -3115,14 +3111,13 @@ XLineAttrSetItem* XLineAttrSetItem::Clone( SfxItemPool* pPool ) const /// fill attribute set item XFillAttrSetItem::XFillAttrSetItem( SfxItemSet&& pItemSet ) : - SfxSetItem( XATTRSET_FILL, std::move(pItemSet), SfxItemType::XFillAttrSetItemType) + SfxSetItem( XATTRSET_FILL, std::move(pItemSet)) { } XFillAttrSetItem::XFillAttrSetItem( SfxItemPool* pItemPool ) : SfxSetItem( XATTRSET_FILL, - SfxItemSetFixed<XATTR_FILL_FIRST, XATTR_FILL_LAST>( *pItemPool ), - SfxItemType::XFillAttrSetItemType) + SfxItemSetFixed<XATTR_FILL_FIRST, XATTR_FILL_LAST>( *pItemPool )) { } diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index 10c00d8a78cd..e9ba8d59bb37 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -51,7 +51,7 @@ #include <libxml/xmlwriter.h> XLineTransparenceItem::XLineTransparenceItem(sal_uInt16 nLineTransparence) : - SfxUInt16Item(XATTR_LINETRANSPARENCE, nLineTransparence, SfxItemType::XLineTransparenceItemType) + SfxUInt16Item(XATTR_LINETRANSPARENCE, nLineTransparence) { } @@ -88,7 +88,7 @@ bool XLineTransparenceItem::GetPresentation SfxPoolItem* XLineJointItem::CreateDefault() { return new XLineJointItem; } XLineJointItem::XLineJointItem( css::drawing::LineJoint eLineJoint ) : - SfxEnumItem(XATTR_LINEJOINT, SfxItemType::XLineJointItemType, eLineJoint) + SfxEnumItem(XATTR_LINEJOINT, eLineJoint) { } @@ -170,7 +170,7 @@ sal_uInt16 XLineJointItem::GetValueCount() const AffineMatrixItem::AffineMatrixItem(const css::geometry::AffineMatrix2D* pMatrix) -: SfxPoolItem(SID_ATTR_TRANSFORM_MATRIX, SfxItemType::AffineMatrixItemType) +: SfxPoolItem(SID_ATTR_TRANSFORM_MATRIX) { if(pMatrix) { @@ -245,7 +245,7 @@ bool AffineMatrixItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberI SfxPoolItem* XLineCapItem::CreateDefault() { return new XLineCapItem; } XLineCapItem::XLineCapItem(css::drawing::LineCap eLineCap) -: SfxEnumItem(XATTR_LINECAP, SfxItemType::XLineCapItemType, eLineCap) +: SfxEnumItem(XATTR_LINECAP, eLineCap) { } @@ -329,7 +329,7 @@ css::drawing::LineCap XLineCapItem::GetValue() const } XFillTransparenceItem::XFillTransparenceItem(sal_uInt16 nFillTransparence) : - SfxUInt16Item(XATTR_FILLTRANSPARENCE, nFillTransparence, SfxItemType::XFillTransparenceItemType) + SfxUInt16Item(XATTR_FILLTRANSPARENCE, nFillTransparence) { } @@ -372,7 +372,7 @@ void XFillTransparenceItem::dumpAsXml(xmlTextWriterPtr pWriter) const XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence) : - SfxUInt16Item(XATTR_FORMTXTSHDWTRANSP, nShdwTransparence, SfxItemType::XFormTextShadowTranspItemType) + SfxUInt16Item(XATTR_FORMTXTSHDWTRANSP, nShdwTransparence) { } @@ -383,7 +383,7 @@ XFormTextShadowTranspItem* XFormTextShadowTranspItem::Clone(SfxItemPool* /*pPool XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 nStepCount ) : - SfxUInt16Item( XATTR_GRADIENTSTEPCOUNT, nStepCount, SfxItemType::XGradientStepCountItemType ) + SfxUInt16Item( XATTR_GRADIENTSTEPCOUNT, nStepCount ) { } @@ -408,7 +408,7 @@ bool XGradientStepCountItem::GetPresentation XFillBmpTileItem::XFillBmpTileItem( bool bTile ) : - SfxBoolItem( XATTR_FILLBMP_TILE, bTile, SfxItemType::XFillBmpTileItemType ) + SfxBoolItem( XATTR_FILLBMP_TILE, bTile ) { } @@ -440,7 +440,7 @@ void XFillBmpTileItem::dumpAsXml(xmlTextWriterPtr pWriter) const XFillBmpPosItem::XFillBmpPosItem( RectPoint eRP ) : - SfxEnumItem( XATTR_FILLBMP_POS, SfxItemType::XFillBmpPosItemType, eRP ) + SfxEnumItem( XATTR_FILLBMP_POS, eRP ) { } @@ -476,7 +476,7 @@ void XFillBmpPosItem::dumpAsXml(xmlTextWriterPtr pWriter) const XFillBmpSizeXItem::XFillBmpSizeXItem( tools::Long nSizeX ) : - SfxMetricItem( XATTR_FILLBMP_SIZEX, nSizeX, SfxItemType::XFillBmpSizeXItemType ) + SfxMetricItem( XATTR_FILLBMP_SIZEX, nSizeX ) { } @@ -505,7 +505,7 @@ bool XFillBmpSizeXItem::HasMetrics() const XFillBmpSizeYItem::XFillBmpSizeYItem( tools::Long nSizeY ) : - SfxMetricItem( XATTR_FILLBMP_SIZEY, nSizeY, SfxItemType::XFillBmpSizeYItemType ) + SfxMetricItem( XATTR_FILLBMP_SIZEY, nSizeY ) { } @@ -533,7 +533,7 @@ bool XFillBmpSizeYItem::HasMetrics() const XFillBmpSizeLogItem::XFillBmpSizeLogItem( bool bLog ) : - SfxBoolItem( XATTR_FILLBMP_SIZELOG, bLog, SfxItemType::XFillBmpSizeLogItemType ) + SfxBoolItem( XATTR_FILLBMP_SIZELOG, bLog ) { } @@ -557,7 +557,7 @@ bool XFillBmpSizeLogItem::GetPresentation XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( sal_uInt16 nOffX ) : - SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETX, nOffX, SfxItemType::XFillBmpTileOffsetXItemType ) + SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETX, nOffX ) { } @@ -580,7 +580,7 @@ bool XFillBmpTileOffsetXItem::GetPresentation XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( sal_uInt16 nOffY ) : - SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETY, nOffY, SfxItemType::XFillBmpTileOffsetYItemType ) + SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETY, nOffY ) { } @@ -602,7 +602,7 @@ bool XFillBmpTileOffsetYItem::GetPresentation } XFillBmpStretchItem::XFillBmpStretchItem( bool bStretch ) : - SfxBoolItem( XATTR_FILLBMP_STRETCH, bStretch, SfxItemType::XFillBmpStretchItemType ) + SfxBoolItem( XATTR_FILLBMP_STRETCH, bStretch ) { } @@ -632,7 +632,7 @@ void XFillBmpStretchItem::dumpAsXml(xmlTextWriterPtr pWriter) const } XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem(sal_Int32 nOffPosX) - : SfxInt32Item(XATTR_FILLBMP_POSOFFSETX, nOffPosX, SfxItemType::XFillBmpPosOffsetXItemType ) + : SfxInt32Item(XATTR_FILLBMP_POSOFFSETX, nOffPosX ) { } @@ -654,7 +654,7 @@ bool XFillBmpPosOffsetXItem::GetPresentation } XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem(sal_Int32 nOffPosY) - : SfxInt32Item(XATTR_FILLBMP_POSOFFSETY, nOffPosY, SfxItemType::XFillBmpPosOffsetYItemType) + : SfxInt32Item(XATTR_FILLBMP_POSOFFSETY, nOffPosY) { } @@ -676,7 +676,7 @@ bool XFillBmpPosOffsetYItem::GetPresentation } XFillBackgroundItem::XFillBackgroundItem( bool bFill ) : - SfxBoolItem( XATTR_FILLBACKGROUND, bFill, SfxItemType::XFillBackgroundItemType ) + SfxBoolItem( XATTR_FILLBACKGROUND, bFill ) { } @@ -701,7 +701,7 @@ void XFillBackgroundItem::dumpAsXml(xmlTextWriterPtr pWriter) const } XFillUseSlideBackgroundItem::XFillUseSlideBackgroundItem( bool bFill ) : - SfxBoolItem( XATTR_FILLUSESLIDEBACKGROUND, bFill, SfxItemType::XFillUseSlideBackgroundItemType ) + SfxBoolItem( XATTR_FILLUSESLIDEBACKGROUND, bFill ) { } diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 60e7f6925f6f..f81841b66ac8 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -130,7 +130,7 @@ void XOBitmap::Array2Bitmap() SfxPoolItem* XFillBitmapItem::CreateDefault() { return new XFillBitmapItem; } XFillBitmapItem::XFillBitmapItem(const OUString& rName, const GraphicObject& rGraphicObject) -: NameOrIndex(XATTR_FILLBITMAP, rName, SfxItemType::XFillBitmapItemType), +: NameOrIndex(XATTR_FILLBITMAP, rName), maGraphicObject(rGraphicObject) { } @@ -142,7 +142,7 @@ XFillBitmapItem::XFillBitmapItem(const XFillBitmapItem& rItem) } XFillBitmapItem::XFillBitmapItem(const GraphicObject& rGraphicObject) - : NameOrIndex(XATTR_FILLBITMAP, -1, SfxItemType::XFillBitmapItemType) + : NameOrIndex(XATTR_FILLBITMAP, -1) , maGraphicObject(rGraphicObject) { } |