diff options
Diffstat (limited to 'svx')
29 files changed, 132 insertions, 106 deletions
diff --git a/svx/inc/sxcikitm.hxx b/svx/inc/sxcikitm.hxx index 738e59366524..7ae07ad71181 100644 --- a/svx/inc/sxcikitm.hxx +++ b/svx/inc/sxcikitm.hxx @@ -25,7 +25,8 @@ class SdrCircKindItem final : public SfxEnumItem<SdrCircKind> { public: - SdrCircKindItem(SdrCircKind eKind=SdrCircKind::Full): SfxEnumItem(SDRATTR_CIRCKIND, eKind) {} + SdrCircKindItem(SdrCircKind eKind=SdrCircKind::Full) + : SfxEnumItem(SDRATTR_CIRCKIND, SfxItemType::SdrCircKindItemType, 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 b629acfebaf7..20ef28db9add 100644 --- a/svx/inc/sxfiitm.hxx +++ b/svx/inc/sxfiitm.hxx @@ -28,7 +28,8 @@ class SdrFractionItem: public SfxPoolItem { Fraction nValue; public: - SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {} + SdrFractionItem(sal_uInt16 nId, const Fraction& rVal, SfxItemType eItemType = SfxItemType::SdrFractionItemType) + : SfxPoolItem(nId, eItemType), 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 be444bec33dd..5c8c42d21c50 100644 --- a/svx/inc/sxlayitm.hxx +++ b/svx/inc/sxlayitm.hxx @@ -26,14 +26,16 @@ class SdrLayerIdItem final : public SfxInt16Item { public: - SdrLayerIdItem(SdrLayerID nId): SfxInt16Item(SDRATTR_LAYERID,nId.get()) {} + SdrLayerIdItem(SdrLayerID nId): + SfxInt16Item(SDRATTR_LAYERID,nId.get(), SfxItemType::SdrLayerIdItemType) {} SdrLayerID GetValue() const { return SdrLayerID(SfxInt16Item::GetValue()); } virtual SdrLayerIdItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SdrLayerNameItem final : public SfxStringItem { public: - SdrLayerNameItem() : SfxStringItem() { SetWhich(SDRATTR_LAYERNAME); } + SdrLayerNameItem() + : SfxStringItem(SDRATTR_LAYERNAME, SfxItemType::SdrLayerNameItemType) {} SdrLayerNameItem(const OUString& rStr) : SfxStringItem(SDRATTR_LAYERNAME,rStr) {} virtual SdrLayerNameItem* Clone(SfxItemPool* pPool=nullptr) const override; }; diff --git a/svx/inc/sxmfsitm.hxx b/svx/inc/sxmfsitm.hxx index c3c070952326..f3d6f0facf9d 100644 --- a/svx/inc/sxmfsitm.hxx +++ b/svx/inc/sxmfsitm.hxx @@ -25,7 +25,8 @@ // overwrites SdrMeasureUnitItem and SdrMeasureShowUnitItem class SdrMeasureFormatStringItem final : public SfxStringItem { public: - SdrMeasureFormatStringItem() : SfxStringItem() { SetWhich(SDRATTR_MEASUREFORMATSTRING); } + SdrMeasureFormatStringItem() + : SfxStringItem(SDRATTR_MEASUREFORMATSTRING, SfxItemType::SdrMeasureFormatStringItemType) {} virtual SdrMeasureFormatStringItem* Clone(SfxItemPool*) const override { return new SdrMeasureFormatStringItem(*this); diff --git a/svx/inc/sxmkitm.hxx b/svx/inc/sxmkitm.hxx index 12769a08577f..278a7a900f62 100644 --- a/svx/inc/sxmkitm.hxx +++ b/svx/inc/sxmkitm.hxx @@ -28,7 +28,8 @@ enum SdrMeasureKind {SDRMEASURE_STD,SDRMEASURE_RADIUS}; // n.i. class SdrMeasureKindItem final : public SfxEnumItem<SdrMeasureKind> { public: - SdrMeasureKindItem() : SfxEnumItem(SDRATTR_MEASUREKIND, SDRMEASURE_STD) {} + SdrMeasureKindItem() + : SfxEnumItem(SDRATTR_MEASUREKIND, SfxItemType::SdrMeasureKindItemType, SDRMEASURE_STD) {} virtual SdrMeasureKindItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 2; } diff --git a/svx/inc/sxmsitm.hxx b/svx/inc/sxmsitm.hxx index f821c73fe047..c8af17cf4ba5 100644 --- a/svx/inc/sxmsitm.hxx +++ b/svx/inc/sxmsitm.hxx @@ -28,8 +28,8 @@ class SdrMeasureScaleItem final : public SdrScaleItem { public: - SdrMeasureScaleItem() - : SdrScaleItem(SDRATTR_MEASURESCALE, Fraction(1, 1)) + SdrMeasureScaleItem(SfxItemType eItemType = SfxItemType::SdrMeasureScaleItemType) + : SdrScaleItem(SDRATTR_MEASURESCALE, Fraction(1, 1), eItemType) { } virtual SdrMeasureScaleItem* Clone(SfxItemPool*) const override diff --git a/svx/inc/sxmtaitm.hxx b/svx/inc/sxmtaitm.hxx index cb94874bdf62..94935cf2ec0c 100644 --- a/svx/inc/sxmtaitm.hxx +++ b/svx/inc/sxmtaitm.hxx @@ -27,7 +27,8 @@ // TextUpsideDown stays active and turns the text again if sal_True. class SdrMeasureTextAutoAngleItem final : public SdrYesNoItem { public: - SdrMeasureTextAutoAngleItem(bool bOn=true): SdrYesNoItem(SDRATTR_MEASURETEXTAUTOANGLE,bOn) {} + SdrMeasureTextAutoAngleItem(bool bOn=true): + SdrYesNoItem(SDRATTR_MEASURETEXTAUTOANGLE,bOn, SfxItemType::SdrMeasureTextAutoAngleItemType) {} virtual SdrMeasureTextAutoAngleItem* Clone(SfxItemPool*) const override { return new SdrMeasureTextAutoAngleItem(*this); @@ -38,7 +39,8 @@ public: // Angle in 1/100deg from viewpoint of the user. class SdrMeasureTextAutoAngleViewItem final : public SdrAngleItem { public: - SdrMeasureTextAutoAngleViewItem(Degree100 nVal=31500_deg100): SdrAngleItem(SDRATTR_MEASURETEXTAUTOANGLEVIEW,nVal) {} + SdrMeasureTextAutoAngleViewItem(Degree100 nVal=31500_deg100) + : SdrAngleItem(SDRATTR_MEASURETEXTAUTOANGLEVIEW,nVal, SfxItemType::SdrMeasureTextAutoAngleViewItemType) {} virtual SdrMeasureTextAutoAngleViewItem* Clone(SfxItemPool*) const override { return new SdrMeasureTextAutoAngleViewItem(*this); diff --git a/svx/inc/sxreaitm.hxx b/svx/inc/sxreaitm.hxx index 2887e8ba0aab..bc61a10086ed 100644 --- a/svx/inc/sxreaitm.hxx +++ b/svx/inc/sxreaitm.hxx @@ -25,7 +25,8 @@ class SdrResizeXAllItem final : public SdrFractionItem { public: - SdrResizeXAllItem(): SdrFractionItem(SDRATTR_RESIZEXALL,Fraction(1,1)) {} + SdrResizeXAllItem() + : SdrFractionItem(SDRATTR_RESIZEXALL,Fraction(1,1), SfxItemType::SdrResizeXAllItemType) {} virtual SdrResizeXAllItem* Clone(SfxItemPool*) const override { return new SdrResizeXAllItem(*this); @@ -34,7 +35,8 @@ public: class SdrResizeYAllItem final : public SdrFractionItem { public: - SdrResizeYAllItem(): SdrFractionItem(SDRATTR_RESIZEYALL,Fraction(1,1)) {} + SdrResizeYAllItem() + : SdrFractionItem(SDRATTR_RESIZEYALL,Fraction(1,1), SfxItemType::SdrResizeYAllItemType) {} virtual SdrResizeYAllItem* Clone(SfxItemPool*) const override { return new SdrResizeYAllItem(*this); diff --git a/svx/inc/sxreoitm.hxx b/svx/inc/sxreoitm.hxx index 19d1cb6b8c54..c99ff4adc66d 100644 --- a/svx/inc/sxreoitm.hxx +++ b/svx/inc/sxreoitm.hxx @@ -25,7 +25,8 @@ class SdrResizeXOneItem final : public SdrFractionItem { public: - SdrResizeXOneItem(): SdrFractionItem(SDRATTR_RESIZEXONE,Fraction(1,1)) {} + SdrResizeXOneItem() + : SdrFractionItem(SDRATTR_RESIZEXONE,Fraction(1,1), SfxItemType::SdrResizeXOneItemType) {} SdrResizeXOneItem* Clone(SfxItemPool*) const override { return new SdrResizeXOneItem(*this); @@ -34,7 +35,8 @@ public: class SdrResizeYOneItem final : public SdrFractionItem { public: - SdrResizeYOneItem(): SdrFractionItem(SDRATTR_RESIZEYONE,Fraction(1,1)) {} + SdrResizeYOneItem() + : SdrFractionItem(SDRATTR_RESIZEYONE,Fraction(1,1), SfxItemType::SdrResizeYOneItemType) {} SdrResizeYOneItem* Clone(SfxItemPool*) const override { return new SdrResizeYOneItem(*this); diff --git a/svx/inc/sxsiitm.hxx b/svx/inc/sxsiitm.hxx index 2a5d6586393f..a55e2ab1fde2 100644 --- a/svx/inc/sxsiitm.hxx +++ b/svx/inc/sxsiitm.hxx @@ -22,7 +22,9 @@ class SdrScaleItem: public SdrFractionItem { public: - SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {} + SdrScaleItem(sal_uInt16 nId, const Fraction& rVal, + SfxItemType eItemType = SfxItemType::SdrScaleItemType) + : SdrFractionItem(nId,rVal, eItemType) {} 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/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 8e61bf381c3d..736f300e7c4b 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), + SfxPoolItem (nId, SfxItemType::SvxLongLRSpaceItemType), mlLeft (lLeft), mlRight (lRight) {} SvxLongLRSpaceItem::SvxLongLRSpaceItem() : - SfxPoolItem (0), + SfxPoolItem (0, SfxItemType::SvxLongLRSpaceItemType), 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), + SfxPoolItem (nId, SfxItemType::SvxLongULSpaceItemType), mlLeft (lLeft), mlRight (lRight) {} SvxLongULSpaceItem::SvxLongULSpaceItem() : - SfxPoolItem (0), + SfxPoolItem (0, SfxItemType::SvxLongULSpaceItemType), 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), + SfxPoolItem (SID_RULER_PAGE_POS, SfxItemType::SvxPagePosSizeItemType), aPos (rP), lWidth (lW), lHeight (lH) {} SvxPagePosSizeItem::SvxPagePosSizeItem() : - SfxPoolItem (0), + SfxPoolItem (0, SfxItemType::SvxPagePosSizeItemType), 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), + SfxPoolItem (SID_RULER_BORDERS, SfxItemType::SvxColumnItemType ), 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), + SfxPoolItem (SID_RULER_BORDERS, SfxItemType::SvxColumnItemType), 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), + SfxPoolItem (SID_RULER_OBJECT, SfxItemType::SvxObjectItemType), nStartX (nSX), nEndX (nEX), nStartY (nSY), diff --git a/svx/source/dialog/svxgraphicitem.cxx b/svx/source/dialog/svxgraphicitem.cxx index 940941b6055a..eb5458c3284e 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 ), aGraphic(std::move( _aGraphic )) + : SfxPoolItem( SID_GRAPHIC, SfxItemType::SvxGraphicItemType ), aGraphic(std::move( _aGraphic )) { } diff --git a/svx/source/items/RectangleAlignmentItem.cxx b/svx/source/items/RectangleAlignmentItem.cxx index 3b0b7b0f1081..6f09bf83b4e5 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, nValue) + : SfxEnumItem<model::RectangleAlignment>(nWhich, SfxItemType::RectangleAlignmentType, nValue) { } diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index 6cb9a1ced72b..695b4dc87349 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 ), + SfxPoolItem( nId, SfxItemType::SvxSmartTagItemType ), maActionComponentsSequence( rActionComponentsSequence ), maActionIndicesSequence( rActionIndicesSequence ), maStringKeyMaps( rStringKeyMaps ), diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 1a102f76d1fb..3a29c103df67 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -38,12 +38,12 @@ SfxPoolItem* SvxMarginItem::CreateDefault() { return new SvxMarginItem(TypedWhi SvxOrientationItem::SvxOrientationItem( const SvxCellOrientation eOrientation, const TypedWhichId<SvxOrientationItem> nId): - SfxEnumItem( nId, eOrientation ) + SfxEnumItem( nId, SfxItemType::SvxOrientationItemType, eOrientation ) { } SvxOrientationItem::SvxOrientationItem( Degree100 nRotation, bool bStacked, const TypedWhichId<SvxOrientationItem> nId ) : - SfxEnumItem( nId, SvxCellOrientation::Standard ) + SfxEnumItem( nId, SfxItemType::SvxOrientationItemType, SvxCellOrientation::Standard ) { if( bStacked ) { @@ -143,7 +143,7 @@ Degree100 SvxOrientationItem::GetRotation( Degree100 nStdAngle ) const SvxMarginItem::SvxMarginItem( const TypedWhichId<SvxMarginItem> nId ) : - SfxPoolItem( nId ), + SfxPoolItem( nId, SfxItemType::SvxMarginItemType ), nLeftMargin ( 20 ), nTopMargin ( 20 ), @@ -158,7 +158,7 @@ SvxMarginItem::SvxMarginItem( sal_Int16 nLeft, sal_Int16 nRight, sal_Int16 nBottom, const TypedWhichId<SvxMarginItem> nId ) : - SfxPoolItem( nId ), + SfxPoolItem( nId, SfxItemType::SvxMarginItemType ), nLeftMargin ( nLeft ), nTopMargin ( nTop ), diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 6fb6e85236fc..7001c37c30a9 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, eOrder) + SfxEnumItem(nId, SfxItemType::SvxChartTextOrderItemType, 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), + SfxPoolItem(nId, SfxItemType::SvxDoubleItemType), fVal(fValue) { } @@ -144,7 +144,7 @@ bool SvxDoubleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) SvxChartKindErrorItem::SvxChartKindErrorItem(SvxChartKindError eOrient, TypedWhichId<SvxChartKindErrorItem> nId) : - SfxEnumItem(nId, eOrient) + SfxEnumItem(nId, SfxItemType::SvxChartKindErrorItemType, eOrient) { } @@ -155,7 +155,7 @@ SvxChartKindErrorItem* SvxChartKindErrorItem::Clone(SfxItemPool* /*pPool*/) cons SvxChartIndicateItem::SvxChartIndicateItem(SvxChartIndicate eOrient, TypedWhichId<SvxChartIndicateItem> nId) : - SfxEnumItem(nId, eOrient) + SfxEnumItem(nId, SfxItemType::SvxChartIndicateItemType, eOrient) { } @@ -166,7 +166,7 @@ SvxChartIndicateItem* SvxChartIndicateItem::Clone(SfxItemPool* /*pPool*/) const SvxChartRegressItem::SvxChartRegressItem(SvxChartRegress eOrient, TypedWhichId<SvxChartRegressItem> nId) : - SfxEnumItem(nId, eOrient) + SfxEnumItem(nId, SfxItemType::SvxChartRegressItemType, eOrient) { } diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index caae609f6204..2fa7e3d89ff2 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 ), pImpl( new SvxClipboardFormatItem_Impl ) + : SfxPoolItem( nId, SfxItemType::SvxClipboardFormatItemType ), pImpl( new SvxClipboardFormatItem_Impl ) { } diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index 84e9af4de2b8..d563eb62d89f 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -30,11 +30,11 @@ using namespace com::sun::star; SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem() -: SfxPoolItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) +: SfxPoolItem( SDRATTR_CUSTOMSHAPE_GEOMETRY, SfxItemType::SdrCustomShapeGeometryItemType ) {} SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem( const uno::Sequence< beans::PropertyValue >& rVal ) -: SfxPoolItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) +: SfxPoolItem( SDRATTR_CUSTOMSHAPE_GEOMETRY, SfxItemType::SdrCustomShapeGeometryItemType ) { SetPropSeq( rVal ); } diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index 8274c2d23ab7..dbc1428a3a4f 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -33,12 +33,13 @@ SfxPoolItem* SvxDashListItem::CreateDefault() { return new SvxDashListItem ;} SfxPoolItem* SvxLineEndListItem::CreateDefault() { return new SvxLineEndListItem ;} SvxColorListItem::SvxColorListItem() + : SfxPoolItem( 0, SfxItemType::SvxColorListItemType) { } SvxColorListItem::SvxColorListItem( XColorListRef pTable, TypedWhichId<SvxColorListItem> nW ) : - SfxPoolItem( nW ), + SfxPoolItem( nW, SfxItemType::SvxColorListItemType ), pColorList(std::move( pTable )) { } @@ -94,11 +95,12 @@ bool svtype::PutValue( const css::uno::Any& rVal, sal_uInt8 ) \ QUERY_PUT_IMPL( SvxColorListItem, ColorList ) SvxGradientListItem::SvxGradientListItem() + : SfxPoolItem( 0, SfxItemType::SvxGradientListItemType) { } SvxGradientListItem::SvxGradientListItem( XGradientListRef pList, TypedWhichId<SvxGradientListItem> nW ) : - SfxPoolItem( nW ), + SfxPoolItem( nW, SfxItemType::SvxGradientListItemType ), pGradientList(std::move( pList )) { } @@ -138,12 +140,13 @@ SvxGradientListItem* SvxGradientListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxGradientListItem, GradientList ) SvxHatchListItem::SvxHatchListItem() + : SfxPoolItem( 0, SfxItemType::SvxHatchListItemType) { } SvxHatchListItem::SvxHatchListItem( XHatchListRef pList, TypedWhichId<SvxHatchListItem> nW ) : - SfxPoolItem( nW ), + SfxPoolItem( nW, SfxItemType::SvxHatchListItemType ), pHatchList(std::move( pList )) { } @@ -183,11 +186,12 @@ SvxHatchListItem* SvxHatchListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxHatchListItem, HatchList ) SvxBitmapListItem::SvxBitmapListItem() + : SfxPoolItem( 0, SfxItemType::SvxBitmapListItemType ) { } SvxBitmapListItem::SvxBitmapListItem( XBitmapListRef pList, TypedWhichId<SvxBitmapListItem> nW ) : - SfxPoolItem( nW ), + SfxPoolItem( nW, SfxItemType::SvxBitmapListItemType ), pBitmapList(std::move( pList )) { } @@ -224,11 +228,12 @@ SvxBitmapListItem* SvxBitmapListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxBitmapListItem, BitmapList ) SvxPatternListItem::SvxPatternListItem() + : SfxPoolItem( 0, SfxItemType::SvxPatternListItemType ) { } SvxPatternListItem::SvxPatternListItem( XPatternListRef pList, TypedWhichId<SvxPatternListItem> nW ) : - SfxPoolItem( nW ), + SfxPoolItem( nW, SfxItemType::SvxPatternListItemType ), pPatternList(std::move( pList )) { } @@ -265,11 +270,12 @@ SvxPatternListItem* SvxPatternListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxPatternListItem, PatternList ) SvxDashListItem::SvxDashListItem() + : SfxPoolItem( 0, SfxItemType::SvxDashListItemType ) { } SvxDashListItem::SvxDashListItem( XDashListRef pList, TypedWhichId<SvxDashListItem> nW ) : - SfxPoolItem( nW ), + SfxPoolItem( nW, SfxItemType::SvxDashListItemType ), pDashList(std::move( pList )) { } @@ -306,11 +312,12 @@ SvxDashListItem* SvxDashListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxDashListItem, DashList ) SvxLineEndListItem::SvxLineEndListItem() + : SfxPoolItem( 0, SfxItemType::SvxLineEndListItemType ) { } SvxLineEndListItem::SvxLineEndListItem( XLineEndListRef pList, TypedWhichId<SvxLineEndListItem> nW ) : - SfxPoolItem( nW ), + SfxPoolItem( nW, SfxItemType::SvxLineEndListItemType ), pLineEndList(std::move( pList )) { } diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx index 135c7efaf370..d2cd113b16bf 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 ), + SfxPoolItem( _nWhich, SfxItemType::SvxB3DVectorItemType ), aVal( rVal ) { } diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx index 5e50c5efbe3c..0085d2137cd7 100644 --- a/svx/source/items/galleryitem.cxx +++ b/svx/source/items/galleryitem.cxx @@ -32,7 +32,8 @@ SfxPoolItem* SvxGalleryItem::CreateDefault() { return new SvxGalleryItem; } SvxGalleryItem::SvxGalleryItem() - : m_nType( css::gallery::GalleryItemType::EMPTY ) + : SfxPoolItem( 0, SfxItemType::SvxGalleryItemType ) + , m_nType( css::gallery::GalleryItemType::EMPTY ) { } diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index 30c0977a034d..fcc06e2b39be 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -25,14 +25,15 @@ using namespace ::com::sun::star; -SvxGrfCrop::SvxGrfCrop( TypedWhichId<SvxGrfCrop> nItemId ) - : SfxPoolItem( nItemId ), +SvxGrfCrop::SvxGrfCrop( TypedWhichId<SvxGrfCrop> nItemId, SfxItemType eType ) + : SfxPoolItem( nItemId, eType ), nLeft( 0 ), nRight( 0 ), nTop( 0 ), nBottom( 0 ) {} SvxGrfCrop::SvxGrfCrop( sal_Int32 nL, sal_Int32 nR, - sal_Int32 nT, sal_Int32 nB, TypedWhichId<SvxGrfCrop> nItemId ) - : SfxPoolItem( nItemId ), + sal_Int32 nT, sal_Int32 nB, TypedWhichId<SvxGrfCrop> nItemId, + SfxItemType eItemType ) + : SfxPoolItem( nItemId, eItemType ), nLeft( nL ), nRight( nR ), nTop( nT ), nBottom( nB ) {} diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 93ef9f6d6da5..7d893decd37a 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), + SfxPoolItem (_nWhich, SfxItemType::SvxHyperlinkItemType ), 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 a7b834c78658..432a5dcb9db8 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -22,7 +22,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( const TypedWhichId<SvxNumberInfoItem> nId ) : - SfxPoolItem ( nId ), + SfxPoolItem ( nId, SfxItemType::SvxNumberInfoItemType ), pFormatter ( nullptr ), eValueType ( SvxNumberValueType::Undefined ), aStringVal ( "" ), @@ -33,7 +33,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( const TypedWhichId<SvxNumberInfoItem> nId SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const TypedWhichId<SvxNumberInfoItem> nId ) : - SfxPoolItem ( nId ), + SfxPoolItem ( nId, SfxItemType::SvxNumberInfoItemType ), pFormatter ( pNumFormatter ), eValueType ( SvxNumberValueType::Undefined ), aStringVal ( "" ), @@ -44,7 +44,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, OUString aVal, const TypedWhichId<SvxNumberInfoItem> nId ) : - SfxPoolItem ( nId ), + SfxPoolItem ( nId, SfxItemType::SvxNumberInfoItemType ), pFormatter ( pNumFormatter ), eValueType ( SvxNumberValueType::String ), aStringVal (std::move( aVal )), @@ -55,7 +55,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, const TypedWhichId<SvxNumberInfoItem> nId ) : - SfxPoolItem ( nId ), + SfxPoolItem ( nId, SfxItemType::SvxNumberInfoItemType ), pFormatter ( pNumFormatter ), eValueType ( SvxNumberValueType::Number ), aStringVal ( "" ), @@ -67,7 +67,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, OUString aValueStr, const TypedWhichId<SvxNumberInfoItem> nId ) : - SfxPoolItem ( nId ), + SfxPoolItem ( nId, SfxItemType::SvxNumberInfoItemType ), pFormatter ( pNumFormatter ), eValueType ( SvxNumberValueType::Number ), aStringVal (std::move( aValueStr )), diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx index 1d5ef696b740..c65a86a643a7 100644 --- a/svx/source/items/ofaitem.cxx +++ b/svx/source/items/ofaitem.cxx @@ -23,7 +23,8 @@ #include <utility> OfaPtrItem::OfaPtrItem( sal_uInt16 _nWhich, void *_pPtr ) - : SfxPoolItem( _nWhich ), pPtr( _pPtr ) + : SfxPoolItem( _nWhich, SfxItemType::OfaPtrItemType ) + , pPtr( _pPtr ) { } @@ -40,7 +41,8 @@ OfaPtrItem* OfaPtrItem::Clone( SfxItemPool * ) const } OfaXColorListItem::OfaXColorListItem( sal_uInt16 _nWhich, rtl::Reference<XColorList> xRef ) - : SfxPoolItem( _nWhich ), mxRef(std::move( xRef )) + : SfxPoolItem( _nWhich, SfxItemType::OfaXColorListItemType ) + , mxRef(std::move( xRef )) {} bool OfaXColorListItem::operator==( const SfxPoolItem& rItem ) const diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 65e016f741a6..e273f26d6876 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -40,7 +40,8 @@ using namespace ::com::sun::star; SfxPoolItem* SvxPageItem::CreateDefault() { return new SvxPageItem(TypedWhichId<SvxPageItem>(0));} -SvxPageItem::SvxPageItem( const TypedWhichId<SvxPageItem> nId ) : SfxPoolItem( nId ), +SvxPageItem::SvxPageItem( const TypedWhichId<SvxPageItem> nId ) + : SfxPoolItem( nId, SfxItemType::SvxPageItemType ), eNumType ( SVX_NUM_ARABIC ), bLandscape ( false ), diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index eb559fdaeb62..cb9adf051148 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, eMode ) + : SfxEnumItem( _nWhich, SfxItemType::SvxRotateModeItemType, eMode ) { } diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 5f5c51655f3e..b300a241e0a8 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -98,13 +98,13 @@ using namespace ::com::sun::star; typedef std::map<OUString, OUString> StringMap; NameOrIndex::NameOrIndex(TypedWhichId<NameOrIndex> _nWhich, sal_Int32 nIndex) : - SfxStringItem(_nWhich, OUString()), + SfxStringItem(_nWhich, OUString(), SfxItemType::NameOrIndexType), m_nPalIndex(nIndex) { } NameOrIndex::NameOrIndex(TypedWhichId<NameOrIndex> _nWhich, const OUString& rName) : - SfxStringItem(_nWhich, rName), + SfxStringItem(_nWhich, rName, SfxItemType::NameOrIndexType), m_nPalIndex(-1) { } @@ -416,7 +416,7 @@ void XColorItem::dumpAsXml(xmlTextWriterPtr pWriter) const SfxPoolItem* XLineStyleItem::CreateDefault() { return new XLineStyleItem; } XLineStyleItem::XLineStyleItem(css::drawing::LineStyle eTheLineStyle) : - SfxEnumItem(XATTR_LINESTYLE, eTheLineStyle) + SfxEnumItem(XATTR_LINESTYLE, SfxItemType::XLineStyleItemType, eTheLineStyle) { } @@ -972,7 +972,7 @@ std::unique_ptr<XLineDashItem> XLineDashItem::checkForUniqueItem( SdrModel* pMod SfxPoolItem* XLineWidthItem::CreateDefault() {return new XLineWidthItem;} XLineWidthItem::XLineWidthItem(tools::Long nWidth) : - SfxMetricItem(XATTR_LINEWIDTH, nWidth) + SfxMetricItem(XATTR_LINEWIDTH, nWidth, SfxItemType::XLineWidthItemType) { } @@ -1706,7 +1706,7 @@ bool XLineEndItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) } XLineStartWidthItem::XLineStartWidthItem(tools::Long nWidth) : - SfxMetricItem(XATTR_LINESTARTWIDTH, nWidth) + SfxMetricItem(XATTR_LINESTARTWIDTH, nWidth, SfxItemType::XLineStartWidthItemType) { } @@ -1744,7 +1744,7 @@ bool XLineStartWidthItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemb } XLineEndWidthItem::XLineEndWidthItem(tools::Long nWidth) : - SfxMetricItem(XATTR_LINEENDWIDTH, nWidth) + SfxMetricItem(XATTR_LINEENDWIDTH, nWidth, SfxItemType::XLineEndWidthItemType) { } @@ -1782,7 +1782,7 @@ bool XLineEndWidthItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMember } XLineStartCenterItem::XLineStartCenterItem(bool bStartCenter) : - SfxBoolItem(XATTR_LINESTARTCENTER, bStartCenter) + SfxBoolItem(XATTR_LINESTARTCENTER, bStartCenter, SfxItemType::XLineStartCenterItem) { } @@ -1821,7 +1821,7 @@ bool XLineStartCenterItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMem } XLineEndCenterItem::XLineEndCenterItem(bool bEndCenter) : - SfxBoolItem(XATTR_LINEENDCENTER, bEndCenter) + SfxBoolItem(XATTR_LINEENDCENTER, bEndCenter, SfxItemType::XLineEndCenterItemType) { } @@ -1865,7 +1865,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, eFillStyle) + SfxEnumItem(XATTR_FILLSTYLE, SfxItemType::XFillStyleItemType, eFillStyle) { } @@ -2875,7 +2875,7 @@ std::unique_ptr<XFillHatchItem> XFillHatchItem::checkForUniqueItem( SdrModel* pM SfxPoolItem* XFormTextStyleItem::CreateDefault() { return new XFormTextStyleItem; } XFormTextStyleItem::XFormTextStyleItem(XFormTextStyle eTheStyle) : - SfxEnumItem(XATTR_FORMTXTSTYLE, eTheStyle) + SfxEnumItem(XATTR_FORMTXTSTYLE, SfxItemType::XFormTextStyleItemType, eTheStyle) { } @@ -2908,7 +2908,7 @@ bool XFormTextStyleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ SfxPoolItem* XFormTextAdjustItem::CreateDefault() { return new XFormTextAdjustItem; } XFormTextAdjustItem::XFormTextAdjustItem(XFormTextAdjust eTheAdjust) : - SfxEnumItem(XATTR_FORMTXTADJUST, eTheAdjust) + SfxEnumItem(XATTR_FORMTXTADJUST, SfxItemType::XFormTextAdjustItemType, eTheAdjust) { } @@ -2941,7 +2941,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) + SfxMetricItem(XATTR_FORMTXTDISTANCE, nDist, SfxItemType::XFormTextDistanceItemType) { } @@ -2953,7 +2953,7 @@ XFormTextDistanceItem* XFormTextDistanceItem::Clone(SfxItemPool* /*pPool*/) cons SfxPoolItem* XFormTextStartItem::CreateDefault() { return new XFormTextStartItem; } XFormTextStartItem::XFormTextStartItem(tools::Long nStart) : - SfxMetricItem(XATTR_FORMTXTSTART, nStart) + SfxMetricItem(XATTR_FORMTXTSTART, nStart, SfxItemType::XFormTextStartItemType) { } @@ -2965,7 +2965,7 @@ XFormTextStartItem* XFormTextStartItem::Clone(SfxItemPool* /*pPool*/) const SfxPoolItem* XFormTextMirrorItem::CreateDefault() { return new XFormTextMirrorItem; } XFormTextMirrorItem::XFormTextMirrorItem(bool bMirror) : - SfxBoolItem(XATTR_FORMTXTMIRROR, bMirror) + SfxBoolItem(XATTR_FORMTXTMIRROR, bMirror, SfxItemType::XFormTextMirrorItem) { } @@ -2977,7 +2977,7 @@ XFormTextMirrorItem* XFormTextMirrorItem::Clone(SfxItemPool* /*pPool*/) const SfxPoolItem* XFormTextOutlineItem::CreateDefault() { return new XFormTextOutlineItem; } XFormTextOutlineItem::XFormTextOutlineItem(bool bOutline) : - SfxBoolItem(XATTR_FORMTXTOUTLINE, bOutline) + SfxBoolItem(XATTR_FORMTXTOUTLINE, bOutline, SfxItemType::XFormTextOutlineItemType) { } @@ -2989,7 +2989,7 @@ XFormTextOutlineItem* XFormTextOutlineItem::Clone(SfxItemPool* /*pPool*/) const SfxPoolItem* XFormTextShadowItem::CreateDefault() { return new XFormTextShadowItem; } XFormTextShadowItem::XFormTextShadowItem(XFormTextShadow eFormTextShadow) : - SfxEnumItem(XATTR_FORMTXTSHADOW, eFormTextShadow) + SfxEnumItem(XATTR_FORMTXTSHADOW, SfxItemType::XFormTextShadowItemType, eFormTextShadow) { } @@ -3035,7 +3035,7 @@ XFormTextShadowColorItem* XFormTextShadowColorItem::Clone(SfxItemPool* /*pPool*/ SfxPoolItem* XFormTextShadowXValItem::CreateDefault() { return new XFormTextShadowXValItem; } XFormTextShadowXValItem::XFormTextShadowXValItem(tools::Long nVal) : - SfxMetricItem(XATTR_FORMTXTSHDWXVAL, nVal) + SfxMetricItem(XATTR_FORMTXTSHDWXVAL, nVal, SfxItemType::XFormTextShadowXValItemType) { } @@ -3047,7 +3047,7 @@ XFormTextShadowXValItem* XFormTextShadowXValItem::Clone(SfxItemPool* /*pPool*/) SfxPoolItem* XFormTextShadowYValItem::CreateDefault() { return new XFormTextShadowYValItem; } XFormTextShadowYValItem::XFormTextShadowYValItem(tools::Long nVal) : - SfxMetricItem(XATTR_FORMTXTSHDWYVAL, nVal) + SfxMetricItem(XATTR_FORMTXTSHDWYVAL, nVal, SfxItemType::XFormTextShadowYValItemType) { } @@ -3059,7 +3059,7 @@ XFormTextShadowYValItem* XFormTextShadowYValItem::Clone(SfxItemPool* /*pPool*/) SfxPoolItem* XFormTextHideFormItem::CreateDefault() { return new XFormTextHideFormItem; } XFormTextHideFormItem::XFormTextHideFormItem(bool bHide) : - SfxBoolItem(XATTR_FORMTXTHIDEFORM, bHide) + SfxBoolItem(XATTR_FORMTXTHIDEFORM, bHide, SfxItemType::XFormTextHideFormItemType) { } @@ -3073,13 +3073,14 @@ XFormTextHideFormItem* XFormTextHideFormItem::Clone(SfxItemPool* /*pPool*/) cons /// a line attribute set item XLineAttrSetItem::XLineAttrSetItem( SfxItemSet&& pItemSet ) : - SfxSetItem( XATTRSET_LINE, std::move(pItemSet)) + SfxSetItem( XATTRSET_LINE, std::move(pItemSet), SfxItemType::XLineAttrSetItemType) { } XLineAttrSetItem::XLineAttrSetItem( SfxItemPool* pItemPool ) : SfxSetItem( XATTRSET_LINE, - SfxItemSetFixed<XATTR_LINE_FIRST, XATTR_LINE_LAST>( *pItemPool )) + SfxItemSetFixed<XATTR_LINE_FIRST, XATTR_LINE_LAST>( *pItemPool ), + SfxItemType::XLineAttrSetItemType) { } @@ -3101,13 +3102,14 @@ XLineAttrSetItem* XLineAttrSetItem::Clone( SfxItemPool* pPool ) const /// fill attribute set item XFillAttrSetItem::XFillAttrSetItem( SfxItemSet&& pItemSet ) : - SfxSetItem( XATTRSET_FILL, std::move(pItemSet)) + SfxSetItem( XATTRSET_FILL, std::move(pItemSet), SfxItemType::XFillAttrSetItemType) { } XFillAttrSetItem::XFillAttrSetItem( SfxItemPool* pItemPool ) : SfxSetItem( XATTRSET_FILL, - SfxItemSetFixed<XATTR_FILL_FIRST, XATTR_FILL_LAST>( *pItemPool )) + SfxItemSetFixed<XATTR_FILL_FIRST, XATTR_FILL_LAST>( *pItemPool ), + SfxItemType::XFillAttrSetItemType) { } diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index ad1b3b2959e5..0f8553575159 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) + SfxUInt16Item(XATTR_LINETRANSPARENCE, nLineTransparence, SfxItemType::XLineTransparenceItemType) { } @@ -88,7 +88,7 @@ bool XLineTransparenceItem::GetPresentation SfxPoolItem* XLineJointItem::CreateDefault() { return new XLineJointItem; } XLineJointItem::XLineJointItem( css::drawing::LineJoint eLineJoint ) : - SfxEnumItem(XATTR_LINEJOINT, eLineJoint) + SfxEnumItem(XATTR_LINEJOINT, SfxItemType::XLineJointItemType, eLineJoint) { } @@ -170,7 +170,7 @@ sal_uInt16 XLineJointItem::GetValueCount() const AffineMatrixItem::AffineMatrixItem(const css::geometry::AffineMatrix2D* pMatrix) -: SfxPoolItem(SID_ATTR_TRANSFORM_MATRIX) +: SfxPoolItem(SID_ATTR_TRANSFORM_MATRIX, SfxItemType::AffineMatrixItemType) { 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, eLineCap) +: SfxEnumItem(XATTR_LINECAP, SfxItemType::XLineCapItemType, eLineCap) { } @@ -329,7 +329,7 @@ css::drawing::LineCap XLineCapItem::GetValue() const } XFillTransparenceItem::XFillTransparenceItem(sal_uInt16 nFillTransparence) : - SfxUInt16Item(XATTR_FILLTRANSPARENCE, nFillTransparence) + SfxUInt16Item(XATTR_FILLTRANSPARENCE, nFillTransparence, SfxItemType::XFillTransparenceItemType) { } @@ -372,7 +372,7 @@ void XFillTransparenceItem::dumpAsXml(xmlTextWriterPtr pWriter) const XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence) : - SfxUInt16Item(XATTR_FORMTXTSHDWTRANSP, nShdwTransparence) + SfxUInt16Item(XATTR_FORMTXTSHDWTRANSP, nShdwTransparence, SfxItemType::XFormTextShadowTranspItemType) { } @@ -383,7 +383,7 @@ XFormTextShadowTranspItem* XFormTextShadowTranspItem::Clone(SfxItemPool* /*pPool XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 nStepCount ) : - SfxUInt16Item( XATTR_GRADIENTSTEPCOUNT, nStepCount ) + SfxUInt16Item( XATTR_GRADIENTSTEPCOUNT, nStepCount, SfxItemType::XGradientStepCountItemType ) { } @@ -408,7 +408,7 @@ bool XGradientStepCountItem::GetPresentation XFillBmpTileItem::XFillBmpTileItem( bool bTile ) : - SfxBoolItem( XATTR_FILLBMP_TILE, bTile ) + SfxBoolItem( XATTR_FILLBMP_TILE, bTile, SfxItemType::XFillBmpTileItemType ) { } @@ -440,7 +440,7 @@ void XFillBmpTileItem::dumpAsXml(xmlTextWriterPtr pWriter) const XFillBmpPosItem::XFillBmpPosItem( RectPoint eRP ) : - SfxEnumItem( XATTR_FILLBMP_POS, eRP ) + SfxEnumItem( XATTR_FILLBMP_POS, SfxItemType::XFillBmpPosItemType, eRP ) { } @@ -476,7 +476,7 @@ void XFillBmpPosItem::dumpAsXml(xmlTextWriterPtr pWriter) const XFillBmpSizeXItem::XFillBmpSizeXItem( tools::Long nSizeX ) : - SfxMetricItem( XATTR_FILLBMP_SIZEX, nSizeX ) + SfxMetricItem( XATTR_FILLBMP_SIZEX, nSizeX, SfxItemType::XFillBmpSizeXItemType ) { } @@ -505,7 +505,7 @@ bool XFillBmpSizeXItem::HasMetrics() const XFillBmpSizeYItem::XFillBmpSizeYItem( tools::Long nSizeY ) : - SfxMetricItem( XATTR_FILLBMP_SIZEY, nSizeY ) + SfxMetricItem( XATTR_FILLBMP_SIZEY, nSizeY, SfxItemType::XFillBmpSizeYItemType ) { } @@ -533,7 +533,7 @@ bool XFillBmpSizeYItem::HasMetrics() const XFillBmpSizeLogItem::XFillBmpSizeLogItem( bool bLog ) : - SfxBoolItem( XATTR_FILLBMP_SIZELOG, bLog ) + SfxBoolItem( XATTR_FILLBMP_SIZELOG, bLog, SfxItemType::XFillBmpSizeLogItemType ) { } @@ -557,7 +557,7 @@ bool XFillBmpSizeLogItem::GetPresentation XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( sal_uInt16 nOffX ) : - SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETX, nOffX ) + SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETX, nOffX, SfxItemType::XFillBmpTileOffsetXItemType ) { } @@ -580,7 +580,7 @@ bool XFillBmpTileOffsetXItem::GetPresentation XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( sal_uInt16 nOffY ) : - SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETY, nOffY ) + SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETY, nOffY, SfxItemType::XFillBmpTileOffsetYItemType ) { } @@ -602,7 +602,7 @@ bool XFillBmpTileOffsetYItem::GetPresentation } XFillBmpStretchItem::XFillBmpStretchItem( bool bStretch ) : - SfxBoolItem( XATTR_FILLBMP_STRETCH, bStretch ) + SfxBoolItem( XATTR_FILLBMP_STRETCH, bStretch, SfxItemType::XFillBmpStretchItemType ) { } @@ -631,9 +631,8 @@ void XFillBmpStretchItem::dumpAsXml(xmlTextWriterPtr pWriter) const (void)xmlTextWriterEndElement(pWriter); } - XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX ) : - SfxUInt16Item( XATTR_FILLBMP_POSOFFSETX, nOffPosX ) + SfxUInt16Item( XATTR_FILLBMP_POSOFFSETX, nOffPosX, SfxItemType::XFillBmpPosOffsetXItemType ) { } @@ -654,9 +653,8 @@ bool XFillBmpPosOffsetXItem::GetPresentation return true; } - XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY ) : - SfxUInt16Item( XATTR_FILLBMP_POSOFFSETY, nOffPosY ) + SfxUInt16Item( XATTR_FILLBMP_POSOFFSETY, nOffPosY, SfxItemType::XFillBmpPosOffsetYItemType ) { } @@ -678,7 +676,7 @@ bool XFillBmpPosOffsetYItem::GetPresentation } XFillBackgroundItem::XFillBackgroundItem( bool bFill ) : - SfxBoolItem( XATTR_FILLBACKGROUND, bFill ) + SfxBoolItem( XATTR_FILLBACKGROUND, bFill, SfxItemType::XFillBackgroundItemType ) { } @@ -703,7 +701,7 @@ void XFillBackgroundItem::dumpAsXml(xmlTextWriterPtr pWriter) const } XFillUseSlideBackgroundItem::XFillUseSlideBackgroundItem( bool bFill ) : - SfxBoolItem( XATTR_FILLUSESLIDEBACKGROUND, bFill ) + SfxBoolItem( XATTR_FILLUSESLIDEBACKGROUND, bFill, SfxItemType::XFillUseSlideBackgroundItemType ) { } |