diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx index c2ecaa29d9bf..fbabb684383e 100644 --- a/avmedia/source/framework/mediaitem.cxx +++ b/avmedia/source/framework/mediaitem.cxx @@ -84,7 +84,7 @@ struct MediaItem::Impl MediaItem::MediaItem( sal_uInt16 i_nWhich, AVMediaSetMask nMaskSet ) - : SfxPoolItem( i_nWhich, SfxItemType::MediaItemType ) + : SfxPoolItem( i_nWhich ) , m_pImpl( new Impl(nMaskSet) ) { } diff --git a/basctl/source/basicide/sbxitem.cxx b/basctl/source/basicide/sbxitem.cxx index 8d098c5ab68e..a2aa90f27399 100644 --- a/basctl/source/basicide/sbxitem.cxx +++ b/basctl/source/basicide/sbxitem.cxx @@ -31,7 +31,7 @@ SbxItem::SbxItem ( OUString aName, SbxItemType eSbxType ) : - SfxPoolItem(nWhichItem, SfxItemType::SbxItemType), + SfxPoolItem(nWhichItem), m_aDocument(std::move(aDocument)), m_aLibName(std::move(aLibName)), m_aName(std::move(aName)), @@ -46,7 +46,7 @@ SbxItem::SbxItem ( OUString aMethodName, SbxItemType eSbxType ) : - SfxPoolItem(nWhichItem, SfxItemType::SbxItemType), + SfxPoolItem(nWhichItem), m_aDocument(std::move(aDocument)), m_aLibName(std::move(aLibName)), m_aName(std::move(aName)), diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 1ac75f6db361..8d1bd5e4130e 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -215,7 +215,7 @@ void SvxChartOptions::SetDefaultColors( const SvxChartColorTable& rDefColors ) SvxChartColorTableItem::SvxChartColorTableItem( sal_uInt16 nWhich_, SvxChartColorTable aTable ) : - SfxPoolItem( nWhich_, SfxItemType::SvxChartColorTableItemType ), + SfxPoolItem( nWhich_ ), m_aColorTable(std::move( aTable )) { } diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index ce39b0a1734a..32e8fc5bee5e 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -65,6 +65,7 @@ namespace SvxChartOptions class SvxChartColorTableItem : public SfxPoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxChartColorTableItem) SvxChartColorTableItem( sal_uInt16 nWhich, SvxChartColorTable ); virtual SvxChartColorTableItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index 144be599bb10..a0c100d2f9a1 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -46,7 +46,7 @@ namespace offapp DriverPoolingSettingsItem::DriverPoolingSettingsItem( sal_uInt16 _nId, DriverPoolingSettings _aSettings ) - :SfxPoolItem(_nId, SfxItemType::DriverPoolingSettingsItemType) + :SfxPoolItem(_nId ) ,m_aSettings(std::move(_aSettings)) { } diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index 1e2404b88583..0ebd1322c38f 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -71,7 +71,7 @@ namespace offapp DriverPoolingSettings m_aSettings; public: - + DECLARE_ITEM_TYPE_FUNCTION(DriverPoolingSettingsItem) DriverPoolingSettingsItem( sal_uInt16 _nId, DriverPoolingSettings _aSettings ); virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx index 6441de2b6b00..c544e1111fe3 100644 --- a/cui/source/options/dbregistersettings.cxx +++ b/cui/source/options/dbregistersettings.cxx @@ -26,7 +26,7 @@ namespace svx { DatabaseMapItem::DatabaseMapItem( sal_uInt16 _nId, DatabaseRegistrations&& _rRegistrations ) - :SfxPoolItem( _nId, SfxItemType::DatabaseMapItemType ) + :SfxPoolItem( _nId ) ,m_aRegistrations( std::move(_rRegistrations) ) { } diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx index b1db16542f02..15f4a64e182d 100644 --- a/cui/source/options/dbregistersettings.hxx +++ b/cui/source/options/dbregistersettings.hxx @@ -64,7 +64,7 @@ namespace svx DatabaseRegistrations m_aRegistrations; public: - + DECLARE_ITEM_TYPE_FUNCTION(DatabaseMapItem) DatabaseMapItem( sal_uInt16 _nId, DatabaseRegistrations&& _rRegistrations ); virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index bb2286ffef3e..428f5b0a06df 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -1079,7 +1079,7 @@ void ODbDataSourceAdministrationHelper::setDataSourceOrName( const Any& _rDataSo // DbuTypeCollectionItem DbuTypeCollectionItem::DbuTypeCollectionItem(sal_Int16 _nWhich, ::dbaccess::ODsnTypeCollection* _pCollection) - :SfxPoolItem(_nWhich, SfxItemType::DbuTypeCollectionItemType) + :SfxPoolItem(_nWhich ) ,m_pCollection(_pCollection) { } diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx index 4ae414881e57..8f73921af359 100644 --- a/dbaccess/source/ui/dlg/dsnItem.hxx +++ b/dbaccess/source/ui/dlg/dsnItem.hxx @@ -35,6 +35,7 @@ namespace dbaui ::dbaccess::ODsnTypeCollection* m_pCollection; public: + DECLARE_ITEM_TYPE_FUNCTION(DbuTypeCollectionItem) DbuTypeCollectionItem(sal_Int16 nWhich, ::dbaccess::ODsnTypeCollection* _pCollection); DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource); diff --git a/dbaccess/source/ui/dlg/optionalboolitem.cxx b/dbaccess/source/ui/dlg/optionalboolitem.cxx index 1caf1c884393..30d176391ba4 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.cxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.cxx @@ -24,7 +24,7 @@ namespace dbaui // OptionalBoolItem OptionalBoolItem::OptionalBoolItem( sal_uInt16 _nWhich ) - :SfxPoolItem( _nWhich, SfxItemType::OptionalBoolItemType ) + :SfxPoolItem( _nWhich ) { } diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx index 1c1d039e2650..c319c5737d84 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.hxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx @@ -32,6 +32,7 @@ namespace dbaui ::std::optional< bool > m_aValue; public: + DECLARE_ITEM_TYPE_FUNCTION(OptionalBoolItem) explicit OptionalBoolItem( sal_uInt16 nWhich ); virtual bool operator==( const SfxPoolItem& _rItem ) const override; diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index 3d16f6770c30..18156cc2385e 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -34,6 +34,7 @@ class OStringListItem : public SfxPoolItem css::uno::Sequence m_aList; public: + DECLARE_ITEM_TYPE_FUNCTION(OStringListItem) OStringListItem(sal_Int16 nWhich, const css::uno::Sequence& _rList); OStringListItem(const OStringListItem& _rSource); diff --git a/dbaccess/source/ui/misc/stringlistitem.cxx b/dbaccess/source/ui/misc/stringlistitem.cxx index ea50c99e04c2..97e75fe6d4b6 100644 --- a/dbaccess/source/ui/misc/stringlistitem.cxx +++ b/dbaccess/source/ui/misc/stringlistitem.cxx @@ -25,7 +25,7 @@ using namespace ::com::sun::star::uno; // OStringListItem OStringListItem::OStringListItem(sal_Int16 _nWhich, const Sequence& _rList) - : SfxPoolItem(_nWhich, SfxItemType::OStringListItemType) + : SfxPoolItem(_nWhich) , m_aList(_rList) { } diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index b4d46f9b1d3b..769179748b40 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -22,7 +22,7 @@ #include SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich ) - : SfxPoolItem(_nWhich, SfxItemType::SvxBulletItemType) + : SfxPoolItem(_nWhich) , aFont(OutputDevice::GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_SYSTEM, GetDefaultFontFlags::NONE )) , nStart(1) , nStyle(SvxBulletStyle::N123) diff --git a/editeng/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx index 77487bb7b50d..ec2a0af3c703 100644 --- a/editeng/source/items/charhiddenitem.cxx +++ b/editeng/source/items/charhiddenitem.cxx @@ -24,7 +24,7 @@ SvxCharHiddenItem::SvxCharHiddenItem( const bool bHidden, const sal_uInt16 nId ) : - SfxBoolItem( nId, bHidden, SfxItemType::SvxCharHiddenItemType ) + SfxBoolItem( nId, bHidden ) { } diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index c3f729a0e231..ca0b9f43546a 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -277,13 +277,13 @@ MetaAction* SvxFieldData::createEndComment() SvxFieldItem::SvxFieldItem( std::unique_ptr pField, const sal_uInt16 nId ) : - SfxPoolItem( nId, SfxItemType::SvxFieldItemType ) + SfxPoolItem( nId ) , mpField( std::move(pField) ) { } SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ) : - SfxPoolItem( nId, SfxItemType::SvxFieldItemType ) + SfxPoolItem( nId ) , mpField( rField.Clone() ) { } diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 924ce4b50ece..397a47eb710e 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -140,9 +140,9 @@ bool SvxPaperBinItem::GetPresentation } -SvxSizeItem::SvxSizeItem( const sal_uInt16 nId, const Size& rSize, SfxItemType eItemType ) : +SvxSizeItem::SvxSizeItem( const sal_uInt16 nId, const Size& rSize ) : - SfxPoolItem( nId, eItemType ), + SfxPoolItem( nId ), m_aSize( rSize ) { @@ -225,7 +225,7 @@ bool SvxSizeItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) SvxSizeItem::SvxSizeItem( const sal_uInt16 nId ) : - SfxPoolItem( nId, SfxItemType::SvxSizeItemType ) + SfxPoolItem( nId ) { } @@ -405,7 +405,7 @@ bool lcl_FillRelativeMeasureAny(const SvxIndentValue& rIndent, uno::Any& rVal) } SvxLRSpaceItem::SvxLRSpaceItem(const sal_uInt16 nId) - : SfxPoolItem(nId, SfxItemType::SvxLRSpaceItemType) + : SfxPoolItem(nId) , m_nGutterMargin(0) , m_nRightGutterMargin(0), nPropFirstLineOffset( 100 ), @@ -419,7 +419,7 @@ SvxLRSpaceItem::SvxLRSpaceItem(const sal_uInt16 nId) SvxLRSpaceItem::SvxLRSpaceItem(SvxIndentValue stLeft, SvxIndentValue stRight, SvxIndentValue stOffset, const sal_uInt16 nId) - : SfxPoolItem(nId, SfxItemType::SvxLRSpaceItemType) + : SfxPoolItem(nId) , m_nGutterMargin(0) , m_nRightGutterMargin(0) , nPropFirstLineOffset(100) @@ -880,12 +880,12 @@ sal_Int32 SvxLRSpaceItem::ResolveTextLeft(const SvxFontUnitMetrics& rMetrics) co } SvxLeftMarginItem::SvxLeftMarginItem(const sal_uInt16 nId) - : SfxPoolItem(nId, SfxItemType::SvxLeftMarginItemType) + : SfxPoolItem(nId) { } SvxLeftMarginItem::SvxLeftMarginItem(const tools::Long nLeft, const sal_uInt16 nId) - : SfxPoolItem(nId, SfxItemType::SvxLeftMarginItemType) + : SfxPoolItem(nId) , m_nLeftMargin(nLeft) { } @@ -1048,12 +1048,12 @@ boost::property_tree::ptree SvxLeftMarginItem::dumpAsJSON() const } SvxTextLeftMarginItem::SvxTextLeftMarginItem(const sal_uInt16 nId) - : SfxPoolItem(nId, SfxItemType::SvxTextLeftMarginItemType) + : SfxPoolItem(nId) { } SvxTextLeftMarginItem::SvxTextLeftMarginItem(SvxIndentValue stLeft, const sal_uInt16 nId) - : SfxPoolItem(nId, SfxItemType::SvxTextLeftMarginItemType) + : SfxPoolItem(nId) { SetTextLeft(stLeft); } @@ -1265,7 +1265,7 @@ boost::property_tree::ptree SvxTextLeftMarginItem::dumpAsJSON() const } SvxFirstLineIndentItem::SvxFirstLineIndentItem(const sal_uInt16 nId) - : SfxPoolItem(nId, SfxItemType::SvxFirstLineIndentItemType) + : SfxPoolItem(nId) { } @@ -1527,12 +1527,12 @@ boost::property_tree::ptree SvxFirstLineIndentItem::dumpAsJSON() const } SvxRightMarginItem::SvxRightMarginItem(const sal_uInt16 nId) - : SfxPoolItem(nId, SfxItemType::SvxRightMarginItemType) + : SfxPoolItem(nId) { } SvxRightMarginItem::SvxRightMarginItem(SvxIndentValue stRight, const sal_uInt16 nId) - : SfxPoolItem(nId, SfxItemType::SvxRightMarginItemType) + : SfxPoolItem(nId) { SetRight(stRight); } @@ -1741,7 +1741,7 @@ boost::property_tree::ptree SvxRightMarginItem::dumpAsJSON() const } SvxGutterLeftMarginItem::SvxGutterLeftMarginItem(const sal_uInt16 nId) - : SfxPoolItem(nId, SfxItemType::SvxGutterLeftMarginItemType) + : SfxPoolItem(nId) { } @@ -1850,7 +1850,7 @@ boost::property_tree::ptree SvxGutterLeftMarginItem::dumpAsJSON() const } SvxGutterRightMarginItem::SvxGutterRightMarginItem(const sal_uInt16 nId) - : SfxPoolItem(nId, SfxItemType::SvxGutterRightMarginItemType) + : SfxPoolItem(nId) { } @@ -2179,7 +2179,7 @@ boost::property_tree::ptree SvxLRSpaceItem::dumpAsJSON() const SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nId ) - : SfxPoolItem(nId, SfxItemType::SvxULSpaceItemType) + : SfxPoolItem(nId) , nUpper(0) , nLower(0) , bContext(false) @@ -2191,7 +2191,7 @@ SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nId ) SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow, const sal_uInt16 nId ) - : SfxPoolItem(nId, SfxItemType::SvxULSpaceItemType) + : SfxPoolItem(nId) , nUpper(nUp) , nLower(nLow) , bContext(false) @@ -2565,7 +2565,7 @@ void SvxProtectItem::dumpAsXml(xmlTextWriterPtr pWriter) const SvxShadowItem::SvxShadowItem( const sal_uInt16 nId, const Color *pColor, const sal_uInt16 nW, const SvxShadowLocation eLoc ) : - SfxEnumItemInterface( nId, SfxItemType::SvxShadowItemType ), + SfxEnumItemInterface( nId ), aShadowColor(COL_GRAY), nWidth ( nW ), eLocation ( eLoc ) @@ -2849,7 +2849,7 @@ SvxBoxItem::SvxBoxItem(const SvxBoxItem& rCopy) SvxBoxItem::SvxBoxItem(const sal_uInt16 nId) - : SfxPoolItem(nId, SfxItemType::SvxBoxItemType) + : SfxPoolItem(nId) { } @@ -3811,7 +3811,7 @@ bool SvxBoxItem::HasBorder( bool bTreatPaddingAsBorder ) const // class SvxBoxInfoItem -------------------------------------------------- SvxBoxInfoItem::SvxBoxInfoItem(const sal_uInt16 nId) - : SfxPoolItem(nId, SfxItemType::SvxBoxInfoItemType) + : SfxPoolItem(nId) , mbDistance(false) , mbMinimumDistance(false) { @@ -4401,7 +4401,7 @@ void SvxFormatKeepItem::dumpAsXml(xmlTextWriterPtr pWriter) const } SvxLineItem::SvxLineItem( const sal_uInt16 nId ) : - SfxPoolItem ( nId, SfxItemType::SvxLineItemType ) + SfxPoolItem ( nId ) { } @@ -4539,7 +4539,7 @@ ItemInstanceManager* SvxBrushItem::getItemInstanceManager() const } SvxBrushItem::SvxBrushItem(sal_uInt16 _nWhich) - : SfxPoolItem(_nWhich, SfxItemType::SvxBrushItemType) + : SfxPoolItem(_nWhich ) , aColor(COL_TRANSPARENT) , aFilterColor(COL_TRANSPARENT) , nShadingValue(ShadingPattern::CLEAR) @@ -4550,7 +4550,7 @@ SvxBrushItem::SvxBrushItem(sal_uInt16 _nWhich) } SvxBrushItem::SvxBrushItem(const Color& rColor, sal_uInt16 _nWhich) - : SfxPoolItem(_nWhich, SfxItemType::SvxBrushItemType) + : SfxPoolItem(_nWhich ) , aColor(rColor) , aFilterColor(COL_TRANSPARENT) , nShadingValue(ShadingPattern::CLEAR) @@ -4561,7 +4561,7 @@ SvxBrushItem::SvxBrushItem(const Color& rColor, sal_uInt16 _nWhich) } SvxBrushItem::SvxBrushItem(Color const& rColor, model::ComplexColor const& rComplexColor, sal_uInt16 nWhich) - : SfxPoolItem(nWhich, SfxItemType::SvxBrushItemType) + : SfxPoolItem(nWhich) , aColor(rColor) , maComplexColor(rComplexColor) , aFilterColor(COL_TRANSPARENT) @@ -4573,7 +4573,7 @@ SvxBrushItem::SvxBrushItem(Color const& rColor, model::ComplexColor const& rComp } SvxBrushItem::SvxBrushItem(const Graphic& rGraphic, SvxGraphicPosition ePos, sal_uInt16 _nWhich) - : SfxPoolItem(_nWhich, SfxItemType::SvxBrushItemType) + : SfxPoolItem(_nWhich) , aColor(COL_TRANSPARENT) , aFilterColor(COL_TRANSPARENT) , nShadingValue(ShadingPattern::CLEAR) @@ -4586,7 +4586,7 @@ SvxBrushItem::SvxBrushItem(const Graphic& rGraphic, SvxGraphicPosition ePos, sal } SvxBrushItem::SvxBrushItem(const GraphicObject& rGraphicObj, SvxGraphicPosition ePos, sal_uInt16 _nWhich) - : SfxPoolItem(_nWhich, SfxItemType::SvxBrushItemType) + : SfxPoolItem(_nWhich) , aColor(COL_TRANSPARENT) , aFilterColor(COL_TRANSPARENT) , nShadingValue(ShadingPattern::CLEAR) @@ -4600,7 +4600,7 @@ SvxBrushItem::SvxBrushItem(const GraphicObject& rGraphicObj, SvxGraphicPosition SvxBrushItem::SvxBrushItem(OUString aLink, OUString aFilter, SvxGraphicPosition ePos, sal_uInt16 _nWhich) - : SfxPoolItem(_nWhich, SfxItemType::SvxBrushItemType) + : SfxPoolItem(_nWhich) , aColor(COL_TRANSPARENT) , aFilterColor(COL_TRANSPARENT) , nShadingValue(ShadingPattern::CLEAR) @@ -5178,7 +5178,7 @@ ItemInstanceManager* SvxFrameDirectionItem::getItemInstanceManager() const SvxFrameDirectionItem::SvxFrameDirectionItem( SvxFrameDirection nValue , sal_uInt16 _nWhich ) - : SfxEnumItem( _nWhich, SfxItemType::SvxFrameDirectionItemType, nValue ) + : SfxEnumItem( _nWhich, nValue ) { } diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx index 5b496e233a87..7fe699cb2c36 100644 --- a/editeng/source/items/justifyitem.cxx +++ b/editeng/source/items/justifyitem.cxx @@ -36,13 +36,13 @@ using namespace ::com::sun::star; SvxHorJustifyItem::SvxHorJustifyItem( const sal_uInt16 nId ) : - SfxEnumItem( nId, SfxItemType::SvxHorJustifyItemType, SvxCellHorJustify::Standard ) + SfxEnumItem( nId, SvxCellHorJustify::Standard ) { } SvxHorJustifyItem::SvxHorJustifyItem( const SvxCellHorJustify eJustify, const sal_uInt16 nId ) : - SfxEnumItem( nId, SfxItemType::SvxHorJustifyItemType, eJustify ) + SfxEnumItem( nId, eJustify ) { } @@ -173,13 +173,13 @@ sal_uInt16 SvxHorJustifyItem::GetValueCount() const SvxVerJustifyItem::SvxVerJustifyItem( const sal_uInt16 nId ) : - SfxEnumItem( nId, SfxItemType::SvxVerJustifyItemType, SvxCellVerJustify::Standard ) + SfxEnumItem( nId, SvxCellVerJustify::Standard ) { } SvxVerJustifyItem::SvxVerJustifyItem( const SvxCellVerJustify eJustify, const sal_uInt16 nId ) : - SfxEnumItem( nId, SfxItemType::SvxVerJustifyItemType, eJustify ) + SfxEnumItem( nId, eJustify ) { } @@ -298,7 +298,7 @@ sal_uInt16 SvxVerJustifyItem::GetValueCount() const SvxJustifyMethodItem::SvxJustifyMethodItem( const SvxCellJustifyMethod eJustify, const sal_uInt16 nId ) : - SfxEnumItem( nId, SfxItemType::SvxJustifyMethodItemType, eJustify ) + SfxEnumItem( nId, eJustify ) { } diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 791b417f5cad..60d9b43a1047 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -1083,25 +1083,25 @@ void SvxNumRule::UnLinkGraphics() } SvxNumBulletItem::SvxNumBulletItem(SvxNumRule const & rRule) : - SfxPoolItem(SID_ATTR_NUMBERING_RULE, SfxItemType::SvxNumBulletItemType), + SfxPoolItem(SID_ATTR_NUMBERING_RULE), maNumRule(rRule) { } SvxNumBulletItem::SvxNumBulletItem(SvxNumRule && rRule) : - SfxPoolItem(SID_ATTR_NUMBERING_RULE, SfxItemType::SvxNumBulletItemType), + SfxPoolItem(SID_ATTR_NUMBERING_RULE), maNumRule(std::move(rRule)) { } SvxNumBulletItem::SvxNumBulletItem(SvxNumRule const & rRule, sal_uInt16 _nWhich ) : - SfxPoolItem(_nWhich, SfxItemType::SvxNumBulletItemType), + SfxPoolItem(_nWhich), maNumRule(rRule) { } SvxNumBulletItem::SvxNumBulletItem(SvxNumRule && rRule, sal_uInt16 _nWhich ) : - SfxPoolItem(_nWhich, SfxItemType::SvxNumBulletItemType), + SfxPoolItem(_nWhich), maNumRule(std::move(rRule)) { } diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx index 40d521d48a1e..254da79d91c1 100644 --- a/editeng/source/items/optitems.cxx +++ b/editeng/source/items/optitems.cxx @@ -26,7 +26,7 @@ SfxHyphenRegionItem::SfxHyphenRegionItem( const sal_uInt16 nId ) : - SfxPoolItem( nId, SfxItemType::SfxRegionItemType ) + SfxPoolItem( nId ) { nMinLead = nMinTrail = 0; } diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 3bdec7afbf1d..d06255ea3e89 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -79,7 +79,7 @@ enum class SvxSpecialLineSpace } SvxLineSpacingItem::SvxLineSpacingItem( sal_uInt16 nHeight, const sal_uInt16 nId ) - : SfxEnumItemInterface( nId, SfxItemType::SvxLineSpacingItemType ) + : SfxEnumItemInterface( nId ) { nPropLineSpace = 100; nInterLineSpace = 0; @@ -360,7 +360,7 @@ ItemInstanceManager* SvxAdjustItem::getItemInstanceManager() const } SvxAdjustItem::SvxAdjustItem(const SvxAdjust eAdjst, const sal_uInt16 nId ) - : SfxEnumItemInterface( nId, SfxItemType::SvxAdjustItemType ), + : SfxEnumItemInterface( nId ), bOneBlock( false ), bLastCenter( false ), bLastBlock( false ) { SetAdjust( eAdjst ); @@ -495,7 +495,7 @@ void SvxAdjustItem::SetEnumValue( sal_uInt16 nVal ) // class SvxWidowsItem --------------------------------------------------- SvxWidowsItem::SvxWidowsItem(const sal_uInt8 nL, const sal_uInt16 nId ) : - SfxByteItem( nId, nL, SfxItemType::SvxWidowsItemType ) + SfxByteItem( nId, nL ) { } @@ -539,7 +539,7 @@ bool SvxWidowsItem::GetPresentation // class SvxOrphansItem -------------------------------------------------- SvxOrphansItem::SvxOrphansItem(const sal_uInt8 nL, const sal_uInt16 nId ) : - SfxByteItem( nId, nL, SfxItemType::SvxOrphansItemType ) + SfxByteItem( nId, nL ) { } @@ -583,7 +583,7 @@ bool SvxOrphansItem::GetPresentation // class SvxHyphenZoneItem ----------------------------------------------- SvxHyphenZoneItem::SvxHyphenZoneItem( const bool bHyph, const sal_uInt16 nId ) : - SfxPoolItem( nId, SfxItemType::SvxHyphenZoneItemType ), + SfxPoolItem( nId ), bHyphen(bHyph), bKeep(false), bNoCapsHyphenation(false), @@ -859,7 +859,7 @@ void SvxTabStop::dumpAsXml(xmlTextWriterPtr pWriter) const // class SvxTabStopItem -------------------------------------------------- SvxTabStopItem::SvxTabStopItem( sal_uInt16 _nWhich ) : - SfxPoolItem( _nWhich, SfxItemType::SvxTabStopItemType ) + SfxPoolItem( _nWhich ) { const sal_uInt16 nTabs = SVX_TAB_DEFCOUNT, nDist = SVX_TAB_DEFDIST; const SvxTabAdjust eAdjst= SvxTabAdjust::Default; @@ -876,7 +876,7 @@ SvxTabStopItem::SvxTabStopItem( const sal_uInt16 nTabs, const sal_uInt16 nDist, const SvxTabAdjust eAdjst, sal_uInt16 _nWhich ) : - SfxPoolItem( _nWhich, SfxItemType::SvxTabStopItemType ) + SfxPoolItem( _nWhich ) { for ( sal_uInt16 i = 0; i < nTabs; ++i ) { @@ -1266,7 +1266,7 @@ bool SvxPageModelItem::GetPresentation SvxScriptSpaceItem::SvxScriptSpaceItem( bool bOn, const sal_uInt16 nId ) - : SfxBoolItem( nId, bOn, SfxItemType::SvxScriptSpaceItemType ) + : SfxBoolItem( nId, bOn ) { } @@ -1289,7 +1289,7 @@ bool SvxScriptSpaceItem::GetPresentation( SvxHangingPunctuationItem::SvxHangingPunctuationItem( bool bOn, const sal_uInt16 nId ) - : SfxBoolItem( nId, bOn, SfxItemType::SvxHangingPunctuationItemType ) + : SfxBoolItem( nId, bOn ) { } @@ -1312,7 +1312,7 @@ bool SvxHangingPunctuationItem::GetPresentation( SvxForbiddenRuleItem::SvxForbiddenRuleItem( bool bOn, const sal_uInt16 nId ) - : SfxBoolItem( nId, bOn, SfxItemType::SvxForbiddenRuleItemType ) + : SfxBoolItem( nId, bOn ) { } @@ -1338,7 +1338,7 @@ bool SvxForbiddenRuleItem::GetPresentation( SvxParaVertAlignItem::SvxParaVertAlignItem( Align nValue, TypedWhichId nW ) - : SfxUInt16Item( nW, static_cast(nValue), SfxItemType::SvxParaVertAlignItemType ) + : SfxUInt16Item( nW, static_cast(nValue) ) { } @@ -1386,7 +1386,7 @@ bool SvxParaVertAlignItem::PutValue( const css::uno::Any& rVal, } SvxParaGridItem::SvxParaGridItem( bool bOn, const sal_uInt16 nId ) - : SfxBoolItem( nId, bOn, SfxItemType::SvxParaGridItemType ) + : SfxBoolItem( nId, bOn ) { } diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 3931dd8176be..22647b09669f 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -112,7 +112,7 @@ SfxPoolItem* SvxCharReliefItem::CreateDefault() {return new SvxCharReliefItem(Fo SvxFontListItem::SvxFontListItem( const FontList* pFontLst, const sal_uInt16 nId ) : - SfxPoolItem( nId, SfxItemType::SvxFontListItemType ), + SfxPoolItem( nId ), pFontList( pFontLst ) { if ( pFontList ) @@ -179,7 +179,7 @@ size_t SvxFontItem::hashCode() const SvxFontItem::SvxFontItem( const sal_uInt16 nId) -: SfxPoolItem( nId, SfxItemType::SvxFontItemType ) +: SfxPoolItem( nId ) , aFamilyName() , aStyleName() , eFamily(FAMILY_SWISS) @@ -195,7 +195,7 @@ SvxFontItem::SvxFontItem( const FontPitch eFontPitch, const rtl_TextEncoding eFontTextEncoding, const sal_uInt16 nId) -: SfxPoolItem( nId, SfxItemType::SvxFontItemType ) +: SfxPoolItem( nId ) , aFamilyName(std::move(aName)) , aStyleName(std::move(aStName)) , eFamily(eFam) @@ -408,7 +408,7 @@ ItemInstanceManager* SvxPostureItem::getItemInstanceManager() const } SvxPostureItem::SvxPostureItem( const FontItalic ePosture, const sal_uInt16 nId ) : - SfxEnumItem( nId, SfxItemType::SvxPostureItemType, ePosture ) + SfxEnumItem( nId, ePosture ) { } @@ -530,7 +530,7 @@ ItemInstanceManager* SvxWeightItem::getItemInstanceManager() const } SvxWeightItem::SvxWeightItem( const FontWeight eWght, const sal_uInt16 nId ) : - SfxEnumItem( nId, SfxItemType::SvxWeightItemType, eWght ) + SfxEnumItem( nId, eWght ) { } @@ -672,7 +672,7 @@ size_t SvxFontHeightItem::hashCode() const SvxFontHeightItem::SvxFontHeightItem( const sal_uInt32 nSz, const sal_uInt16 nPrp, const sal_uInt16 nId ) : - SfxPoolItem( nId, SfxItemType::SvxFontHeightItemType ) + SfxPoolItem( nId ) { SetHeight( nSz,nPrp ); // calculate in percentage } @@ -1007,8 +1007,8 @@ void SvxFontHeightItem::dumpAsXml(xmlTextWriterPtr pWriter) const // class SvxTextLineItem ------------------------------------------------ -SvxTextLineItem::SvxTextLineItem( const FontLineStyle eSt, const sal_uInt16 nId, SfxItemType eItemType ) - : SfxEnumItem(nId, eItemType, eSt) +SvxTextLineItem::SvxTextLineItem( const FontLineStyle eSt, const sal_uInt16 nId ) + : SfxEnumItem(nId, eSt) , maColor(COL_TRANSPARENT) { } @@ -1166,7 +1166,7 @@ ItemInstanceManager* SvxUnderlineItem::getItemInstanceManager() const } SvxUnderlineItem::SvxUnderlineItem( const FontLineStyle eSt, const sal_uInt16 nId ) - : SvxTextLineItem( eSt, nId, SfxItemType::SvxUnderlineItemType ) + : SvxTextLineItem( eSt, nId ) { } @@ -1213,7 +1213,7 @@ ItemInstanceManager* SvxOverlineItem::getItemInstanceManager() const } SvxOverlineItem::SvxOverlineItem( const FontLineStyle eSt, const sal_uInt16 nId ) - : SvxTextLineItem( eSt, nId, SfxItemType::SvxOverlineItemType ) + : SvxTextLineItem( eSt, nId ) { } @@ -1260,7 +1260,7 @@ ItemInstanceManager* SvxCrossedOutItem::getItemInstanceManager() const } SvxCrossedOutItem::SvxCrossedOutItem( const FontStrikeout eSt, const sal_uInt16 nId ) - : SfxEnumItem( nId, SfxItemType::SvxCrossedOutItemType, eSt ) + : SfxEnumItem( nId, eSt ) { } @@ -1361,7 +1361,7 @@ bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) // class SvxShadowedItem ------------------------------------------------- SvxShadowedItem::SvxShadowedItem( const bool bShadowed, const sal_uInt16 nId ) : - SfxBoolItem( nId, bShadowed, SfxItemType::SvxShadowedItemType ) + SfxBoolItem( nId, bShadowed ) { } @@ -1389,7 +1389,7 @@ bool SvxShadowedItem::GetPresentation // class SvxAutoKernItem ------------------------------------------------- SvxAutoKernItem::SvxAutoKernItem( const bool bAutoKern, const sal_uInt16 nId ) : - SfxBoolItem( nId, bAutoKern, SfxItemType::SvxAutoKernItemType ) + SfxBoolItem( nId, bAutoKern ) { } @@ -1418,7 +1418,7 @@ bool SvxAutoKernItem::GetPresentation SvxWordLineModeItem::SvxWordLineModeItem( const bool bWordLineMode, const sal_uInt16 nId ) : - SfxBoolItem( nId, bWordLineMode, SfxItemType::SvxWordLineItemType ) + SfxBoolItem( nId, bWordLineMode ) { } @@ -1446,7 +1446,7 @@ bool SvxWordLineModeItem::GetPresentation // class SvxContourItem -------------------------------------------------- SvxContourItem::SvxContourItem( const bool bContoured, const sal_uInt16 nId ) : - SfxBoolItem( nId, bContoured, SfxItemType::SvxContourItemType ) + SfxBoolItem( nId, bContoured ) { } @@ -1473,19 +1473,19 @@ bool SvxContourItem::GetPresentation // class SvxColorItem ---------------------------------------------------- SvxColorItem::SvxColorItem( const sal_uInt16 nId ) : - SfxPoolItem(nId, SfxItemType::SvxColorItemType), + SfxPoolItem(nId), mColor( COL_BLACK ) { } SvxColorItem::SvxColorItem( const Color& rCol, const sal_uInt16 nId ) : - SfxPoolItem( nId, SfxItemType::SvxColorItemType ), + SfxPoolItem( nId ), mColor( rCol ) { } SvxColorItem::SvxColorItem(Color const& rColor, model::ComplexColor const& rComplexColor, const sal_uInt16 nId) - : SfxPoolItem(nId, SfxItemType::SvxColorItemType) + : SfxPoolItem(nId) , mColor(rColor) , maComplexColor(rComplexColor) { @@ -1744,7 +1744,7 @@ void SvxColorItem::dumpAsXml(xmlTextWriterPtr pWriter) const // class SvxKerningItem -------------------------------------------------- SvxKerningItem::SvxKerningItem( const short nKern, const sal_uInt16 nId ) : - SfxInt16Item( nId, nKern, SfxItemType::SvxKerningItemType ) + SfxInt16Item( nId, nKern ) { } @@ -1823,7 +1823,7 @@ bool SvxKerningItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId) // class SvxCaseMapItem -------------------------------------------------- SvxCaseMapItem::SvxCaseMapItem( const SvxCaseMap eMap, const sal_uInt16 nId ) : - SfxEnumItem( nId, SfxItemType::SvxCaseMapItemType, eMap ) + SfxEnumItem( nId, eMap ) { } @@ -1903,7 +1903,7 @@ bool SvxCaseMapItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) // class SvxEscapementItem ----------------------------------------------- SvxEscapementItem::SvxEscapementItem( const sal_uInt16 nId ) : - SfxEnumItemInterface( nId, SfxItemType::SvxEscapementItemType ), + SfxEnumItemInterface( nId ), nEsc ( 0 ), nProp ( 100 ) @@ -1913,7 +1913,7 @@ SvxEscapementItem::SvxEscapementItem( const sal_uInt16 nId ) : SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape, const sal_uInt16 nId ) : - SfxEnumItemInterface( nId, SfxItemType::SvxEscapementItemType ), + SfxEnumItemInterface( nId ), nProp( 100 ) { SetEscapement( eEscape ); @@ -1925,7 +1925,7 @@ SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape, SvxEscapementItem::SvxEscapementItem( const short _nEsc, const sal_uInt8 _nProp, const sal_uInt16 nId ) : - SfxEnumItemInterface( nId, SfxItemType::SvxEscapementItemType ), + SfxEnumItemInterface( nId ), nEsc ( _nEsc ), nProp ( _nProp ) { @@ -2071,7 +2071,7 @@ ItemInstanceManager* SvxLanguageItem::getItemInstanceManager() const } SvxLanguageItem::SvxLanguageItem( const LanguageType eLang, const sal_uInt16 nId ) - : SvxLanguageItem_Base( nId , SfxItemType::SvxLanguageItemType, eLang ) + : SvxLanguageItem_Base( nId , eLang ) { } @@ -2150,7 +2150,7 @@ bool SvxLanguageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) // class SvxNoHyphenItem ------------------------------------------------- SvxNoHyphenItem::SvxNoHyphenItem( const bool bNoHyphen, const sal_uInt16 nId ) : - SfxBoolItem( nId, bNoHyphen, SfxItemType::SvxNoHyphenItemType ) + SfxBoolItem( nId, bNoHyphen ) { } @@ -2185,7 +2185,7 @@ bool SvxNoHyphenItem::GetPresentation SvxBlinkItem::SvxBlinkItem( const bool bBlink, const sal_uInt16 nId ) : - SfxBoolItem( nId, bBlink, SfxItemType::SvxBlinkItemType ) + SfxBoolItem( nId, bBlink ) { } @@ -2220,7 +2220,7 @@ ItemInstanceManager* SvxEmphasisMarkItem::getItemInstanceManager() const SvxEmphasisMarkItem::SvxEmphasisMarkItem( const FontEmphasisMark nValue, TypedWhichId nId ) - : SfxUInt16Item( nId, static_cast(nValue), SfxItemType::SvxEmphasisMarkItemType ) + : SfxUInt16Item( nId, static_cast(nValue) ) { } @@ -2324,7 +2324,7 @@ bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) SvxTwoLinesItem::SvxTwoLinesItem( bool bFlag, sal_Unicode nStartBracket, sal_Unicode nEndBracket, sal_uInt16 nW ) - : SfxPoolItem( nW, SfxItemType::SvxTwoLinesItemType ), + : SfxPoolItem( nW ), cStartBracket( nStartBracket ), cEndBracket( nEndBracket ), bOn( bFlag ) { } @@ -2431,8 +2431,8 @@ bool SvxTwoLinesItem::GetPresentation( SfxItemPresentation /*ePres*/, |* class SvxTextRotateItem *************************************************************************/ -SvxTextRotateItem::SvxTextRotateItem(Degree10 nValue, TypedWhichId nW, SfxItemType eItemType) - : SfxUInt16Item(nW, nValue.get(), eItemType) +SvxTextRotateItem::SvxTextRotateItem(Degree10 nValue, TypedWhichId nW) + : SfxUInt16Item(nW, nValue.get()) { } @@ -2511,7 +2511,7 @@ void SvxTextRotateItem::dumpAsXml(xmlTextWriterPtr pWriter) const SvxCharRotateItem::SvxCharRotateItem( Degree10 nValue, bool bFitIntoLine, TypedWhichId nW ) - : SvxTextRotateItem(nValue, nW, SfxItemType::SvxCharRotateItemType), + : SvxTextRotateItem(nValue, nW), bFitToLine( bFitIntoLine ) { } @@ -2601,7 +2601,7 @@ void SvxCharRotateItem::dumpAsXml(xmlTextWriterPtr pWriter) const SvxCharScaleWidthItem::SvxCharScaleWidthItem( sal_uInt16 nValue, TypedWhichId nW ) - : SfxUInt16Item( nW, nValue, SfxItemType::SvxCharScaleWidthItemType ) + : SfxUInt16Item( nW, nValue ) { } @@ -2661,7 +2661,7 @@ ItemInstanceManager* SvxCharReliefItem::getItemInstanceManager() const SvxCharReliefItem::SvxCharReliefItem( FontRelief eValue, const sal_uInt16 nId ) - : SfxEnumItem( nId, SfxItemType::SvxCharReliefItemType, eValue ) + : SfxEnumItem( nId, eValue ) { } @@ -2750,8 +2750,7 @@ bool SvxCharReliefItem::QueryValue( css::uno::Any& rVal, SvxScriptSetItem::SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool ) : SfxSetItem( nSlotId, SfxItemSet( rPool, - svl::Items ), - SfxItemType::SvxScriptSetItemType ) + svl::Items ) ) { sal_uInt16 nLatin, nAsian, nComplex; GetWhichIds( nLatin, nAsian, nComplex ); diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index d1d8cb6e065a..35dbddabab2d 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -26,7 +26,7 @@ using namespace ::com::sun::star::text; SvxWritingModeItem::SvxWritingModeItem( WritingMode eValue, TypedWhichId _nWhich ) - : SfxUInt16Item( _nWhich, static_cast(eValue), SfxItemType::SvxWritingModeItemType ) + : SfxUInt16Item( _nWhich, static_cast(eValue) ) { } diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index 976fd5aa8150..71f75a910246 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star::xml; SvXMLAttrContainerItem::SvXMLAttrContainerItem( sal_uInt16 _nWhich ) : - SfxPoolItem( _nWhich, SfxItemType::SvXMLAttrContainerItemType ) + SfxPoolItem( _nWhich ) { } diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index 9836346c2159..024c427b3f7b 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -72,6 +72,7 @@ class AVMEDIA_DLLPUBLIC MediaItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(MediaItem) explicit MediaItem( sal_uInt16 i_nWhich = 0, AVMediaSetMask nMaskSet = AVMediaSetMask::NONE ); MediaItem( const MediaItem& rMediaItem ); diff --git a/include/basctl/sbxitem.hxx b/include/basctl/sbxitem.hxx index 23244fe2e42f..09cdb1a4d032 100644 --- a/include/basctl/sbxitem.hxx +++ b/include/basctl/sbxitem.hxx @@ -45,6 +45,7 @@ class BASCTL_DLLPUBLIC SbxItem : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SbxItem) SbxItem(sal_uInt16 nWhich, ScriptDocument aDocument, OUString aLibName, OUString aName, SbxItemType); SbxItem(sal_uInt16 nWhich, ScriptDocument aDocument, OUString aLibName, OUString aName, OUString aMethodName, SbxItemType eSbxType); diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx index b12d91806bc7..4e85d090d9c4 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -50,6 +50,7 @@ protected: public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxAdjustItem) SvxAdjustItem( const SvxAdjust eAdjst /*= SvxAdjust::Left*/, const sal_uInt16 nId ); diff --git a/include/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx index 798aab04bd97..376096912b76 100644 --- a/include/editeng/autokernitem.hxx +++ b/include/editeng/autokernitem.hxx @@ -33,7 +33,7 @@ class EDITENG_DLLPUBLIC SvxAutoKernItem final : public SfxBoolItem { public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxAutoKernItem) SvxAutoKernItem( const bool bAutoKern /*= false*/, const sal_uInt16 nId ); diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx index 4a4af0e6217f..369f050e3e90 100644 --- a/include/editeng/blinkitem.hxx +++ b/include/editeng/blinkitem.hxx @@ -33,6 +33,7 @@ class EDITENG_DLLPUBLIC SvxBlinkItem final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxBlinkItem) SvxBlinkItem( const bool bBlink /*= false*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index 60a6d09c5b92..7b7946cef19a 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -76,6 +76,7 @@ class EDITENG_DLLPUBLIC SvxBoxItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxBoxItem) explicit SvxBoxItem( const sal_uInt16 nId ); SvxBoxItem( const SvxBoxItem &rCpy ); virtual ~SvxBoxItem() override; @@ -227,6 +228,7 @@ class EDITENG_DLLPUBLIC SvxBoxInfoItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxBoxInfoItem) explicit SvxBoxInfoItem( const sal_uInt16 nId ); SvxBoxInfoItem( const SvxBoxInfoItem &rCpy ); virtual ~SvxBoxInfoItem() override; diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index cc71f6135d80..30469c8d71dc 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -60,6 +60,7 @@ protected: public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxBrushItem) explicit SvxBrushItem( sal_uInt16 nWhich ); SvxBrushItem(Color const& rColor, sal_uInt16 nWhich); SvxBrushItem(Color const& rColor, model::ComplexColor const& rComplexColor, sal_uInt16 nWhich); diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx index 4e736b776323..2cef39743d34 100644 --- a/include/editeng/bulletitem.hxx +++ b/include/editeng/bulletitem.hxx @@ -57,6 +57,7 @@ class EDITENG_DLLPUBLIC SvxBulletItem final : public SfxPoolItem sal_Unicode cSymbol; public: + DECLARE_ITEM_TYPE_FUNCTION(SvxBulletItem) explicit SvxBulletItem( sal_uInt16 nWhich ); SvxBulletItem( const SvxBulletItem& ); virtual ~SvxBulletItem() override; diff --git a/include/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx index ed72e08dcec0..db6d14d33727 100644 --- a/include/editeng/charhiddenitem.hxx +++ b/include/editeng/charhiddenitem.hxx @@ -32,6 +32,7 @@ class EDITENG_DLLPUBLIC SvxCharHiddenItem final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxCharHiddenItem) SvxCharHiddenItem( const bool bHidden /*= false*/, const sal_uInt16 nId ); virtual SvxCharHiddenItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx index 910adcf11e24..b4e0ec16e61a 100644 --- a/include/editeng/charreliefitem.hxx +++ b/include/editeng/charreliefitem.hxx @@ -39,6 +39,7 @@ protected: public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxCharReliefItem) SvxCharReliefItem( FontRelief eValue /*= FontRelief::NONE*/, const sal_uInt16 nId ); diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx index 42e4d5f16467..a5fed5af8b39 100644 --- a/include/editeng/charrotateitem.hxx +++ b/include/editeng/charrotateitem.hxx @@ -35,7 +35,8 @@ class EDITENG_DLLPUBLIC SvxTextRotateItem : public SfxUInt16Item { public: - SvxTextRotateItem(Degree10 nValue, TypedWhichId nId, SfxItemType eItemType = SfxItemType::SvxTextRotateItemType); + DECLARE_ITEM_TYPE_FUNCTION(SvxTextRotateItem) + SvxTextRotateItem(Degree10 nValue, TypedWhichId nId); virtual SvxTextRotateItem* Clone(SfxItemPool *pPool = nullptr) const override; @@ -78,7 +79,7 @@ class EDITENG_DLLPUBLIC SvxCharRotateItem final : public SvxTextRotateItem bool bFitToLine; public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxCharRotateItem) SvxCharRotateItem( Degree10 nValue /*= 0*/, bool bFitIntoLine /*= false*/, TypedWhichId nId ); diff --git a/include/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx index 7e5025fb37f7..5e7d8255d51d 100644 --- a/include/editeng/charscaleitem.hxx +++ b/include/editeng/charscaleitem.hxx @@ -36,7 +36,7 @@ class EDITENG_DLLPUBLIC SvxCharScaleWidthItem final : public SfxUInt16Item { public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxCharScaleWidthItem) SvxCharScaleWidthItem( sal_uInt16 nValue /*= 100*/, TypedWhichId nId ); diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx index d0b4bff258bf..f109558c6608 100644 --- a/include/editeng/cmapitem.hxx +++ b/include/editeng/cmapitem.hxx @@ -35,6 +35,7 @@ class EDITENG_DLLPUBLIC SvxCaseMapItem final : public SfxEnumItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxCaseMapItem) SvxCaseMapItem( const SvxCaseMap eMap /*= SvxCaseMap::NotMapped*/, const sal_uInt16 nId ); diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index 1acb863f6a86..57188716ce99 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -37,6 +37,7 @@ private: public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxColorItem) explicit SvxColorItem(const sal_uInt16 nId); SvxColorItem(const Color& aColor, const sal_uInt16 nId); SvxColorItem(const Color& aColor, model::ComplexColor const& rComplexColor, const sal_uInt16 nId); diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx index 9c67384fc8d2..7dcb49a65656 100644 --- a/include/editeng/contouritem.hxx +++ b/include/editeng/contouritem.hxx @@ -32,7 +32,7 @@ class EDITENG_DLLPUBLIC SvxContourItem final : public SfxBoolItem { public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxContourItem) SvxContourItem( const bool bContoured /*= false*/, const sal_uInt16 nId ); diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx index 259eb412e1e1..2e85f39c0020 100644 --- a/include/editeng/crossedoutitem.hxx +++ b/include/editeng/crossedoutitem.hxx @@ -37,6 +37,7 @@ protected: public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxCrossedOutItem) SvxCrossedOutItem( const FontStrikeout eSt /*= STRIKEOUT_NONE*/, const sal_uInt16 nId ); diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx index 94d48e4b8d9c..77b0f70b4330 100644 --- a/include/editeng/emphasismarkitem.hxx +++ b/include/editeng/emphasismarkitem.hxx @@ -37,7 +37,7 @@ protected: public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxEmphasisMarkItem) SvxEmphasisMarkItem( const FontEmphasisMark eVal /*= FontEmphasisMark::NONE*/, TypedWhichId nId ); diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx index d889d7bc309e..94db1972673c 100644 --- a/include/editeng/escapementitem.hxx +++ b/include/editeng/escapementitem.hxx @@ -44,6 +44,7 @@ class EDITENG_DLLPUBLIC SvxEscapementItem final : public SfxEnumItemInterface public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxEscapementItem) explicit SvxEscapementItem( const sal_uInt16 nId ); SvxEscapementItem( const SvxEscapement eEscape, const sal_uInt16 nId ); diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index c8643a8095d7..a2db8e82bf71 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -50,6 +50,7 @@ protected: public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxFontHeightItem) SvxFontHeightItem( const sal_uInt32 nSz /*= 240*/, const sal_uInt16 nPropHeight /*= 100*/, const sal_uInt16 nId ); diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index 7dec33e9e891..a20692982752 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -70,6 +70,7 @@ class EDITENG_DLLPUBLIC SvxFieldItem final : public SfxPoolItem { std::unique_ptr mpField; public: + DECLARE_ITEM_TYPE_FUNCTION(SvxFieldItem) SvxFieldItem( std::unique_ptr pField, const sal_uInt16 nId ); SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ); SvxFieldItem( const SvxFieldItem& rItem ); diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx index 71756464e5b0..46cccdc44e57 100644 --- a/include/editeng/flstitem.hxx +++ b/include/editeng/flstitem.hxx @@ -42,6 +42,7 @@ private: css::uno::Sequence< OUString > aFontNameSeq; public: + DECLARE_ITEM_TYPE_FUNCTION(SvxFontListItem) SvxFontListItem( const FontList* pFontLst, const sal_uInt16 nId ); diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx index c00208fee9bf..1f93e88e5fde 100644 --- a/include/editeng/fontitem.hxx +++ b/include/editeng/fontitem.hxx @@ -40,6 +40,7 @@ protected: public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxFontItem) explicit SvxFontItem(const sal_uInt16 nId); SvxFontItem(const FontFamily eFam, OUString aFamilyName, OUString aStyleName, diff --git a/include/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx index 93e46b433b29..df5f9dd33503 100644 --- a/include/editeng/forbiddenruleitem.hxx +++ b/include/editeng/forbiddenruleitem.hxx @@ -32,6 +32,7 @@ class EDITENG_DLLPUBLIC SvxForbiddenRuleItem final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxForbiddenRuleItem) SvxForbiddenRuleItem( bool bOn /*= false*/, const sal_uInt16 nId ); diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx index 7e9b0b27661e..2e696cae795f 100644 --- a/include/editeng/formatbreakitem.hxx +++ b/include/editeng/formatbreakitem.hxx @@ -38,6 +38,7 @@ class EDITENG_DLLPUBLIC SvxFormatBreakItem final : public SfxEnumItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxFormatBreakItem) inline SvxFormatBreakItem( const SvxBreak eBrk /*= SvxBreak::NONE*/, const sal_uInt16 nWhich ); SvxFormatBreakItem(SvxFormatBreakItem const &) = default; // SfxPoolItem copy function dichotomy @@ -62,7 +63,7 @@ public: inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxBreak eBreak, const sal_uInt16 _nWhich ) : - SfxEnumItem( _nWhich, SfxItemType::SvxFormatBreakItemType, eBreak ) + SfxEnumItem( _nWhich, eBreak ) {} diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx index e2bba96b8974..6a7d2623628c 100644 --- a/include/editeng/frmdiritem.hxx +++ b/include/editeng/frmdiritem.hxx @@ -34,6 +34,7 @@ protected: virtual ItemInstanceManager* getItemInstanceManager() const override; public: + DECLARE_ITEM_TYPE_FUNCTION(SvxFrameDirectionItem) SvxFrameDirectionItem( SvxFrameDirection nValue, sal_uInt16 nWhich ); virtual ~SvxFrameDirectionItem() override; diff --git a/include/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx index c59d4db0cf0d..159a3f2c251a 100644 --- a/include/editeng/hngpnctitem.hxx +++ b/include/editeng/hngpnctitem.hxx @@ -32,6 +32,7 @@ class EDITENG_DLLPUBLIC SvxHangingPunctuationItem final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxHangingPunctuationItem) SvxHangingPunctuationItem( bool bOn /*= false*/, const sal_uInt16 nId ); virtual SvxHangingPunctuationItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx index d7aa7ea61862..5e68ca9281ae 100644 --- a/include/editeng/hyphenzoneitem.hxx +++ b/include/editeng/hyphenzoneitem.hxx @@ -47,6 +47,7 @@ class EDITENG_DLLPUBLIC SvxHyphenZoneItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxHyphenZoneItem) SvxHyphenZoneItem( const bool bHyph /*= false*/, const sal_uInt16 nId ); diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index 616427f466f9..82e02932a035 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -30,6 +30,7 @@ class EDITENG_DLLPUBLIC SvxHorJustifyItem final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxJustifyMethodItem) SvxJustifyMethodItem( const SvxCellJustifyMethod eMethod, const sal_uInt16 nId ); diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx index c108560ce3aa..f3633687fd8b 100644 --- a/include/editeng/keepitem.hxx +++ b/include/editeng/keepitem.hxx @@ -34,7 +34,7 @@ class EDITENG_DLLPUBLIC SvxFormatKeepItem final : public SfxBoolItem { public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxFormatKeepItem) inline SvxFormatKeepItem( const bool bKeep /*= false*/, const sal_uInt16 _nWhich ); SvxFormatKeepItem(SvxFormatKeepItem const &) = default; // SfxPoolItem copy function dichotomy diff --git a/include/editeng/kernitem.hxx b/include/editeng/kernitem.hxx index 23a8c1909546..8e66d0e1c462 100644 --- a/include/editeng/kernitem.hxx +++ b/include/editeng/kernitem.hxx @@ -36,7 +36,7 @@ class EDITENG_DLLPUBLIC SvxKerningItem final : public SfxInt16Item { public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxKerningItem) SvxKerningItem( const short nKern /*= 0*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx index 4ebef0837a6c..524a3c9af392 100644 --- a/include/editeng/langitem.hxx +++ b/include/editeng/langitem.hxx @@ -33,8 +33,9 @@ // MSVC hack: class SAL_DLLPUBLIC_RTTI SvxLanguageItem_Base: public SfxEnumItem { protected: - explicit SvxLanguageItem_Base(sal_uInt16 nWhich, SfxItemType eItemType, LanguageType nValue): - SfxEnumItem(nWhich, eItemType, nValue) + DECLARE_ITEM_TYPE_FUNCTION(SvxLanguageItem_Base) + explicit SvxLanguageItem_Base(sal_uInt16 nWhich, LanguageType nValue): + SfxEnumItem(nWhich, nValue) {} }; @@ -45,7 +46,7 @@ protected: public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxLanguageItem) SvxLanguageItem( const LanguageType eLang /*= LANGUAGE_GERMAN*/, const sal_uInt16 nId ); diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx index 0e481767a730..f8d21d65e66c 100644 --- a/include/editeng/lineitem.hxx +++ b/include/editeng/lineitem.hxx @@ -41,6 +41,7 @@ class EDITENG_DLLPUBLIC SvxLineItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxLineItem) explicit SvxLineItem( const sal_uInt16 nId ); SvxLineItem( const SvxLineItem& rCpy ); virtual ~SvxLineItem() override; diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx index f5b4d1054056..726fffc2301e 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -108,6 +108,7 @@ public: sal_uInt16 GetPropLeft() const { return m_nPropLeftMargin; } + DECLARE_ITEM_TYPE_FUNCTION(SvxLeftMarginItem) explicit SvxLeftMarginItem(const sal_uInt16 nId); SvxLeftMarginItem(const tools::Long nLeft, const sal_uInt16 nId); SvxLeftMarginItem(SvxLeftMarginItem const &) = default; // SfxPoolItem copy function dichotomy @@ -153,6 +154,7 @@ public: sal_Int32 ResolveTextLeft(const SvxFontUnitMetrics& rMetrics) const; SvxIndentValue GetTextLeft() const; + DECLARE_ITEM_TYPE_FUNCTION(SvxTextLeftMarginItem) explicit SvxTextLeftMarginItem(const sal_uInt16 nId); SvxTextLeftMarginItem(SvxIndentValue stLeft, const sal_uInt16 nId); SvxTextLeftMarginItem(SvxTextLeftMarginItem const &) = default; // SfxPoolItem copy function dichotomy @@ -199,6 +201,7 @@ public: SvxIndentValue GetTextFirstLineOffset() const; sal_Int32 ResolveTextFirstLineOffset(const SvxFontUnitMetrics& rMetrics) const; + DECLARE_ITEM_TYPE_FUNCTION(SvxFirstLineIndentItem) explicit SvxFirstLineIndentItem(const sal_uInt16 nId); SvxFirstLineIndentItem(SvxIndentValue stValue, const sal_uInt16 nId); SvxFirstLineIndentItem(SvxFirstLineIndentItem const &) = default; // SfxPoolItem copy function dichotomy @@ -243,6 +246,7 @@ public: sal_uInt16 GetPropRight() const; + DECLARE_ITEM_TYPE_FUNCTION(SvxRightMarginItem) explicit SvxRightMarginItem(const sal_uInt16 nId); SvxRightMarginItem(SvxIndentValue stRight, const sal_uInt16 nId); SvxRightMarginItem(SvxRightMarginItem const &) = default; // SfxPoolItem copy function dichotomy @@ -279,6 +283,7 @@ public: void SetGutterMargin(const tools::Long nGutterMargin) { m_nGutterMargin = nGutterMargin; } tools::Long GetGutterMargin() const { return m_nGutterMargin; } + DECLARE_ITEM_TYPE_FUNCTION(SvxGutterLeftMarginItem) explicit SvxGutterLeftMarginItem(const sal_uInt16 nId); SvxGutterLeftMarginItem(SvxGutterLeftMarginItem const &) = default; // SfxPoolItem copy function dichotomy @@ -311,6 +316,7 @@ private: public: tools::Long GetRightGutterMargin() const { return m_nRightGutterMargin; } + DECLARE_ITEM_TYPE_FUNCTION(SvxGutterRightMarginItem) explicit SvxGutterRightMarginItem(const sal_uInt16 nId); SvxGutterRightMarginItem(SvxGutterRightMarginItem const &) = default; // SfxPoolItem copy function dichotomy @@ -354,6 +360,7 @@ public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxLRSpaceItem) explicit SvxLRSpaceItem( const sal_uInt16 nId ); SvxLRSpaceItem(SvxIndentValue stLeft, SvxIndentValue stRight, SvxIndentValue stValue, const sal_uInt16 nId); diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx index 1bc4e769cff1..d34db2eaae3a 100644 --- a/include/editeng/lspcitem.hxx +++ b/include/editeng/lspcitem.hxx @@ -47,6 +47,7 @@ public: // writer? => Rather have a crooked vales as the default, but the // programmer sees that there's something special happening. + DECLARE_ITEM_TYPE_FUNCTION(SvxLineSpacingItem) SvxLineSpacingItem( sal_uInt16 nLineHeight /*= LINE_SPACE_DEFAULT_HEIGHT*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem diff --git a/include/editeng/nhypitem.hxx b/include/editeng/nhypitem.hxx index b0bd0192cb92..537051b90a7c 100644 --- a/include/editeng/nhypitem.hxx +++ b/include/editeng/nhypitem.hxx @@ -26,6 +26,7 @@ class EDITENG_DLLPUBLIC SvxNoHyphenItem final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxNoHyphenItem) SvxNoHyphenItem( const bool bNoHyphen, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index c6067c53cb40..9226e1a3b867 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -317,6 +317,7 @@ class EDITENG_DLLPUBLIC SvxNumBulletItem final : public SfxPoolItem { SvxNumRule maNumRule; public: + DECLARE_ITEM_TYPE_FUNCTION(SvxNumBulletItem) explicit SvxNumBulletItem(SvxNumRule const & rRule); explicit SvxNumBulletItem(SvxNumRule && rRule); SvxNumBulletItem(SvxNumRule const & rRule, sal_uInt16 nWhich ); diff --git a/include/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx index 112a62e6aaef..b37290fffdb8 100644 --- a/include/editeng/opaqitem.hxx +++ b/include/editeng/opaqitem.hxx @@ -33,6 +33,7 @@ class EDITENG_DLLPUBLIC SvxOpaqueItem final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxOpaqueItem) explicit SvxOpaqueItem( const sal_uInt16 nId , const bool bOpa = true ); // "pure virtual Methods" from SfxPoolItem @@ -45,7 +46,7 @@ public: }; inline SvxOpaqueItem::SvxOpaqueItem( const sal_uInt16 nId, const bool bOpa ) - : SfxBoolItem( nId, bOpa, SfxItemType::SvxOpaqueItemType ) + : SfxBoolItem( nId, bOpa ) {} #endif diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx index f4cbd2df81ab..3967edc2a515 100644 --- a/include/editeng/optitems.hxx +++ b/include/editeng/optitems.hxx @@ -31,7 +31,7 @@ class EDITENG_DLLPUBLIC SfxHyphenRegionItem final : public SfxPoolItem sal_uInt8 nMinTrail; public: - + DECLARE_ITEM_TYPE_FUNCTION(SfxHyphenRegionItem) SfxHyphenRegionItem( const sal_uInt16 nId ); virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx index 251dc5150dc0..75a2ea50fbc6 100644 --- a/include/editeng/orphitem.hxx +++ b/include/editeng/orphitem.hxx @@ -30,7 +30,7 @@ class EDITENG_DLLPUBLIC SvxOrphansItem final : public SfxByteItem { public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxOrphansItem) SvxOrphansItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx index c58274b8fe16..d20e3a154a18 100644 --- a/include/editeng/paravertalignitem.hxx +++ b/include/editeng/paravertalignitem.hxx @@ -36,7 +36,7 @@ class EDITENG_DLLPUBLIC SvxParaVertAlignItem final : public SfxUInt16Item public: enum class Align { Automatic, Baseline, Top, Center, Bottom }; static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxParaVertAlignItem) SvxParaVertAlignItem( Align nValue /*= 0*/, TypedWhichId nId ); virtual SvxParaVertAlignItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/editeng/pbinitem.hxx b/include/editeng/pbinitem.hxx index a4fadccb7ef3..b8ae2a1ee760 100644 --- a/include/editeng/pbinitem.hxx +++ b/include/editeng/pbinitem.hxx @@ -37,7 +37,7 @@ class EDITENG_DLLPUBLIC SvxPaperBinItem final : public SfxByteItem { public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxPaperBinItem) explicit inline SvxPaperBinItem( const sal_uInt16 nId , const sal_uInt8 nTray = PAPERBIN_PRINTER_SETTINGS ); @@ -50,7 +50,7 @@ public: }; inline SvxPaperBinItem::SvxPaperBinItem( const sal_uInt16 nId, const sal_uInt8 nT ) - : SfxByteItem( nId, nT, SfxItemType::SvxPaperBinItemType ) + : SfxByteItem( nId, nT ) {} #endif diff --git a/include/editeng/pgrditem.hxx b/include/editeng/pgrditem.hxx index ef8c24e66290..d3a21ee55064 100644 --- a/include/editeng/pgrditem.hxx +++ b/include/editeng/pgrditem.hxx @@ -33,6 +33,7 @@ class EDITENG_DLLPUBLIC SvxParaGridItem final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxParaGridItem) SvxParaGridItem( const bool bSnapToGrid /*= true*/, const sal_uInt16 nId ); diff --git a/include/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx index 45ca6ac6f4d3..26e3044e6d9c 100644 --- a/include/editeng/pmdlitem.hxx +++ b/include/editeng/pmdlitem.hxx @@ -36,7 +36,7 @@ private: public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxPageModelItem) explicit inline SvxPageModelItem( TypedWhichId nWh ); inline SvxPageModelItem( const OUString& rModel, bool bA /*= false*/, TypedWhichId nWh ); diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx index 392a9627feb6..20800f656b8c 100644 --- a/include/editeng/postitem.hxx +++ b/include/editeng/postitem.hxx @@ -38,6 +38,7 @@ protected: public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxPostureItem) SvxPostureItem( const FontItalic ePost /*= ITALIC_NONE*/, const sal_uInt16 nId ); diff --git a/include/editeng/prntitem.hxx b/include/editeng/prntitem.hxx index 34f490b46084..68953f7fca27 100644 --- a/include/editeng/prntitem.hxx +++ b/include/editeng/prntitem.hxx @@ -35,6 +35,7 @@ class EDITENG_DLLPUBLIC SvxPrintItem final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxPrintItem) explicit SvxPrintItem( const sal_uInt16 nId , const bool bPrt = true ); // "pure virtual Methods" from SfxPoolItem @@ -47,7 +48,7 @@ public: }; inline SvxPrintItem::SvxPrintItem( const sal_uInt16 nId, const bool bPrt ) - : SfxBoolItem( nId, bPrt, SfxItemType::SvxPrintItemType ) + : SfxBoolItem( nId, bPrt ) {} #endif diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx index 0c3b473700d1..3a51db7e9b7c 100644 --- a/include/editeng/protitem.hxx +++ b/include/editeng/protitem.hxx @@ -39,6 +39,7 @@ class EDITENG_DLLPUBLIC SvxProtectItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxProtectItem) explicit inline SvxProtectItem( const sal_uInt16 nId ); SvxProtectItem(SvxProtectItem const &) = default; // SfxPoolItem copy function dichotomy @@ -66,7 +67,7 @@ public: }; inline SvxProtectItem::SvxProtectItem( const sal_uInt16 nId ) - : SfxPoolItem( nId, SfxItemType::SvxProtectItemType ) + : SfxPoolItem( nId ) { bCntnt = bSize = bPos = false; } diff --git a/include/editeng/rsiditem.hxx b/include/editeng/rsiditem.hxx index 9e9cf18767ee..41fe62283321 100644 --- a/include/editeng/rsiditem.hxx +++ b/include/editeng/rsiditem.hxx @@ -19,7 +19,8 @@ class EDITENG_DLLPUBLIC SvxRsidItem final : public SfxUInt32Item { public: - SvxRsidItem( sal_uInt32 nRsid, sal_uInt16 nId ) : SfxUInt32Item( nId, nRsid, SfxItemType::SvxRsidItemType ) {} + DECLARE_ITEM_TYPE_FUNCTION(SvxRsidItem) + SvxRsidItem( sal_uInt32 nRsid, sal_uInt16 nId ) : SfxUInt32Item( nId, nRsid ) {} virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx index 9a4cac3de2b5..6f6e9a8d3827 100644 --- a/include/editeng/scriptspaceitem.hxx +++ b/include/editeng/scriptspaceitem.hxx @@ -33,6 +33,7 @@ class EDITENG_DLLPUBLIC SvxScriptSpaceItem final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxScriptSpaceItem) SvxScriptSpaceItem( bool bOn /*= false*/, const sal_uInt16 nId ); diff --git a/include/editeng/scripttypeitem.hxx b/include/editeng/scripttypeitem.hxx index bfe84f5f6a9a..f5ebe264d5ca 100644 --- a/include/editeng/scripttypeitem.hxx +++ b/include/editeng/scripttypeitem.hxx @@ -26,6 +26,7 @@ class EDITENG_DLLPUBLIC SvxScriptSetItem final : public SfxSetItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxScriptSetItem) SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool ); virtual SvxScriptSetItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx index 549c2f5fc2ec..a247cffe386d 100644 --- a/include/editeng/shaditem.hxx +++ b/include/editeng/shaditem.hxx @@ -43,6 +43,7 @@ class EDITENG_DLLPUBLIC SvxShadowItem final : public SfxEnumItemInterface public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxShadowItem) explicit SvxShadowItem( const sal_uInt16 nId , const Color *pColor = nullptr, const sal_uInt16 nWidth = 100 /*5pt*/, const SvxShadowLocation eLoc = SvxShadowLocation::NONE ); diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx index dbe30a672265..0cc0ade42eb9 100644 --- a/include/editeng/shdditem.hxx +++ b/include/editeng/shdditem.hxx @@ -33,7 +33,7 @@ class EDITENG_DLLPUBLIC SvxShadowedItem final : public SfxBoolItem { public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxShadowedItem) SvxShadowedItem( const bool bShadowed /*= false*/, const sal_uInt16 nId ); diff --git a/include/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx index 172099985fac..9438acc5af58 100644 --- a/include/editeng/sizeitem.hxx +++ b/include/editeng/sizeitem.hxx @@ -38,8 +38,9 @@ class EDITENG_DLLPUBLIC SvxSizeItem : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxSizeItem) explicit SvxSizeItem( const sal_uInt16 nId ); - SvxSizeItem( const sal_uInt16 nId, const Size& rSize, SfxItemType eItemType = SfxItemType::SvxSizeItemType); + SvxSizeItem( const sal_uInt16 nId, const Size& rSize); // "pure virtual Methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx index 553e3263f7a5..4ada7aeb69f7 100644 --- a/include/editeng/spltitem.hxx +++ b/include/editeng/spltitem.hxx @@ -34,7 +34,7 @@ class EDITENG_DLLPUBLIC SvxFormatSplitItem final : public SfxBoolItem public: static SfxPoolItem* CreateDefault(); virtual ~SvxFormatSplitItem() override; - + DECLARE_ITEM_TYPE_FUNCTION(SvxFormatSplitItem) inline SvxFormatSplitItem( const bool bSplit /*= true*/, const sal_uInt16 nWh ); diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx index 840b294243f9..3c06537496e7 100644 --- a/include/editeng/tstpitem.hxx +++ b/include/editeng/tstpitem.hxx @@ -97,6 +97,7 @@ class EDITENG_DLLPUBLIC SvxTabStopItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxTabStopItem) explicit SvxTabStopItem( sal_uInt16 nWhich ); SvxTabStopItem( const sal_uInt16 nTabs, const sal_uInt16 nDist, diff --git a/include/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx index d39a3ac6035d..8ea442b71bac 100644 --- a/include/editeng/twolinesitem.hxx +++ b/include/editeng/twolinesitem.hxx @@ -28,6 +28,7 @@ class EDITENG_DLLPUBLIC SvxTwoLinesItem final : public SfxPoolItem sal_Unicode cStartBracket, cEndBracket; bool bOn; public: + DECLARE_ITEM_TYPE_FUNCTION(SvxTwoLinesItem) SvxTwoLinesItem( bool bOn /*= true*/, sal_Unicode nStartBracket /*= 0*/, sal_Unicode nEndBracket /*= 0*/, diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx index ec0f35d54ae6..703e4e0e39ac 100644 --- a/include/editeng/udlnitem.hxx +++ b/include/editeng/udlnitem.hxx @@ -34,9 +34,9 @@ class EDITENG_DLLPUBLIC SvxTextLineItem : public SfxEnumItem model::ComplexColor maComplexColor; public: + DECLARE_ITEM_TYPE_FUNCTION(SvxTextLineItem) SvxTextLineItem( const FontLineStyle eSt, - const sal_uInt16 nId, - SfxItemType eItemType = SfxItemType::SvxTextLineItemType); + const sal_uInt16 nId); // "pure virtual Methods" from SfxPoolItem virtual bool GetPresentation( SfxItemPresentation ePres, @@ -94,6 +94,7 @@ protected: public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxUnderlineItem) SvxUnderlineItem( const FontLineStyle eSt, const sal_uInt16 nId ); @@ -113,6 +114,7 @@ protected: public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxOverlineItem) SvxOverlineItem( const FontLineStyle eSt, const sal_uInt16 nId ); diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx index 2658033614a4..ef427ac78f0c 100644 --- a/include/editeng/ulspitem.hxx +++ b/include/editeng/ulspitem.hxx @@ -39,6 +39,7 @@ class EDITENG_DLLPUBLIC SvxULSpaceItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxULSpaceItem) explicit SvxULSpaceItem( const sal_uInt16 nId ); SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow, const sal_uInt16 nId ); diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx index f8beb7c7a62f..87528d048422 100644 --- a/include/editeng/wghtitem.hxx +++ b/include/editeng/wghtitem.hxx @@ -38,6 +38,7 @@ protected: public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxWeightItem) SvxWeightItem( const FontWeight eWght /*= WEIGHT_NORMAL*/, const sal_uInt16 nId ); diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx index 0bb6138fd082..f048697bdbf6 100644 --- a/include/editeng/widwitem.hxx +++ b/include/editeng/widwitem.hxx @@ -30,7 +30,7 @@ class EDITENG_DLLPUBLIC SvxWidowsItem final : public SfxByteItem { public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxWidowsItem) SvxWidowsItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem diff --git a/include/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx index d01be0e41495..df3996587492 100644 --- a/include/editeng/writingmodeitem.hxx +++ b/include/editeng/writingmodeitem.hxx @@ -28,6 +28,7 @@ class EDITENG_DLLPUBLIC SvxWritingModeItem final : public SfxUInt16Item { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxWritingModeItem) SvxWritingModeItem( css::text::WritingMode eValue /*= css::text::WritingMode_LR_TB*/, TypedWhichId nWhich /*= SDRATTR_TEXTDIRECTION*/ ); virtual ~SvxWritingModeItem() override; diff --git a/include/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx index 6226d3262e07..d809e59bc894 100644 --- a/include/editeng/wrlmitem.hxx +++ b/include/editeng/wrlmitem.hxx @@ -34,7 +34,7 @@ class EDITENG_DLLPUBLIC SvxWordLineModeItem final : public SfxBoolItem { public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxWordLineModeItem) SvxWordLineModeItem( const bool bWordLineMode /*= false*/, const sal_uInt16 nId ); diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx index a0ee0a63fb55..288bdc81ad21 100644 --- a/include/editeng/xmlcnitm.hxx +++ b/include/editeng/xmlcnitm.hxx @@ -30,7 +30,7 @@ class EDITENG_DLLPUBLIC SvXMLAttrContainerItem final : public SfxPoolItem SvXMLAttrContainerData maContainerData; public: - + DECLARE_ITEM_TYPE_FUNCTION(SvXMLAttrContainerItem) SvXMLAttrContainerItem( sal_uInt16 nWhich = 0 ); SvXMLAttrContainerItem( const SvXMLAttrContainerItem& ); virtual ~SvXMLAttrContainerItem() override; diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index d8c1ca989496..01de050679dc 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -83,8 +83,9 @@ class SFX2_DLLPUBLIC SfxLinkItem final : public SfxPoolItem void operator =(SfxLinkItem const &) = delete; public: + DECLARE_ITEM_TYPE_FUNCTION(SfxLinkItem) SfxLinkItem( sal_uInt16 nWhichId, const Link& rValue ) - : SfxPoolItem( nWhichId, SfxItemType::SfxLinkItemType ) + : SfxPoolItem( nWhichId ) { aLink = rValue; } virtual ~SfxLinkItem() override; diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 5c0641e8ca79..17ec9d15dc39 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -91,6 +91,7 @@ private: public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SfxDocumentInfoItem) SfxDocumentInfoItem(); SfxDocumentInfoItem( const OUString &rFileName, const css::uno::Reference< css::document::XDocumentProperties> & i_xDocProps, diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index 81d0ee391445..da7d2c52be8e 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -69,9 +69,9 @@ class SFX2_DLLPUBLIC SfxEventNamesItem final : public SfxPoolItem SfxEventNamesList aEventsList; public: - + DECLARE_ITEM_TYPE_FUNCTION(SfxEventNamesItem) SfxEventNamesItem ( const sal_uInt16 nId ) - : SfxPoolItem( nId, SfxItemType::SfxEventNamesItemType ) {} + : SfxPoolItem( nId ) {} virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index b2b7159e9256..f78f51509d4f 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -152,7 +152,7 @@ class SFX2_DLLPUBLIC SfxFrameItem final : public SfxPoolItem SfxFrameWeakRef wFrame; public: - + DECLARE_ITEM_TYPE_FUNCTION(SfxFrameItem) SfxFrameItem( sal_uInt16 nWhich, SfxViewFrame const *p ); SfxFrameItem( sal_uInt16 nWhich, SfxFrame *p ); @@ -170,6 +170,7 @@ class SFX2_DLLPUBLIC SfxUnoAnyItem final : public SfxPoolItem css::uno::Any aValue; public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SfxUnoAnyItem) SfxUnoAnyItem( sal_uInt16 nWhich, const css::uno::Any& rAny ); const css::uno::Any& GetValue() const { return aValue; } @@ -186,6 +187,7 @@ class SFX2_DLLPUBLIC SfxUnoFrameItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SfxUnoFrameItem) SfxUnoFrameItem(); SfxUnoFrameItem( sal_uInt16 nWhich, css::uno::Reference< css::frame::XFrame > i_xFrame ); const css::uno::Reference< css::frame::XFrame >& diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx index 1b6ff400c6bf..955304107360 100644 --- a/include/sfx2/minfitem.hxx +++ b/include/sfx2/minfitem.hxx @@ -40,6 +40,7 @@ class SFX2_DLLPUBLIC SfxMacroInfoItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SfxMacroInfoItem) SfxMacroInfoItem( sal_uInt16 nWhich, const BasicManager* pMgr, OUString aLibName, diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx index 17b7f0cf1de2..6b04fcc4e96c 100644 --- a/include/sfx2/objitem.hxx +++ b/include/sfx2/objitem.hxx @@ -31,6 +31,7 @@ class SFX2_DLLPUBLIC SfxObjectItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SfxObjectItem) SfxObjectItem( sal_uInt16 nWhich=0, SfxShell *pSh=nullptr ); virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 3238e40d85a9..bac056f0a5d1 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -943,13 +943,14 @@ class SFX2_DLLPUBLIC SfxObjectShellItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SfxObjectShellItem) SfxObjectShellItem() : - SfxPoolItem( 0, SfxItemType::SfxObjectShellItemType ), + SfxPoolItem( 0 ), pObjSh( nullptr ) {} SfxObjectShellItem( sal_uInt16 nWhichId, SfxObjectShell *pObjShell ): - SfxPoolItem( nWhichId, SfxItemType::SfxObjectShellItemType ), + SfxPoolItem( nWhichId ), pObjSh( pObjShell ) {} diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 6559416094a5..17d0dd035f78 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -49,6 +49,7 @@ namespace com::sun::star::frame { class XFrame; } class SFX2_DLLPUBLIC SfxTabDialogItem final : public SfxSetItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SfxTabDialogItem) SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet ); SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool); virtual SfxTabDialogItem* Clone(SfxItemPool* pToPool = nullptr) const override; diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx index d61981b44de8..3206f929197c 100644 --- a/include/sfx2/tplpitem.hxx +++ b/include/sfx2/tplpitem.hxx @@ -31,6 +31,7 @@ class SFX2_DLLPUBLIC SfxTemplateItem final : public SfxFlagItem OUString aStyleIdentifier; public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SfxTemplateItem) SfxTemplateItem(); SfxTemplateItem( sal_uInt16 nWhich, OUString aStyle, diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index de21273be0b3..7ef97412e8d6 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -267,8 +267,9 @@ class SFX2_DLLPUBLIC SfxViewFrameItem final : public SfxPoolItem SfxViewFrame* pFrame; public: + DECLARE_ITEM_TYPE_FUNCTION(SfxViewFrameItem) SfxViewFrameItem( SfxViewFrame *pViewFrame ): - SfxPoolItem( 0, SfxItemType::SfxViewFrameItemType ), + SfxPoolItem( 0 ), pFrame( pViewFrame) {} diff --git a/include/sfx2/watermarkitem.hxx b/include/sfx2/watermarkitem.hxx index c298894bb518..710158e58291 100644 --- a/include/sfx2/watermarkitem.hxx +++ b/include/sfx2/watermarkitem.hxx @@ -17,6 +17,7 @@ class SFX2_DLLPUBLIC SfxWatermarkItem final : public SfxPoolItem { public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SfxWatermarkItem) SfxWatermarkItem(); virtual SfxWatermarkItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx index fa1fd9b9d7e8..aa5d0aa750ba 100644 --- a/include/sfx2/zoomitem.hxx +++ b/include/sfx2/zoomitem.hxx @@ -59,7 +59,7 @@ class SFX2_DLLPUBLIC SvxZoomItem final : public SfxUInt16Item public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxZoomItem) SvxZoomItem( SvxZoomType eZoomType = SvxZoomType::PERCENT, sal_uInt16 nVal = 0, TypedWhichId nWhich = SID_ATTR_ZOOM ); diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx index 292648d0f572..d40d3768a3db 100644 --- a/include/svl/cenumitm.hxx +++ b/include/svl/cenumitm.hxx @@ -26,11 +26,12 @@ class SVL_DLLPUBLIC SfxEnumItemInterface: public SfxPoolItem { protected: - explicit SfxEnumItemInterface(sal_uInt16 which, SfxItemType eItemType): SfxPoolItem(which, eItemType) {} + explicit SfxEnumItemInterface(sal_uInt16 which): SfxPoolItem(which) {} SfxEnumItemInterface(const SfxEnumItemInterface &) = default; public: + DECLARE_ITEM_TYPE_FUNCTION(SfxEnumItemInterface) virtual bool operator ==(const SfxPoolItem & rItem) const override; diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index 17becbaba92c..57644cd9c4e1 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -29,9 +29,9 @@ class SVL_DLLPUBLIC CntByteItem: public SfxPoolItem sal_uInt8 m_nValue; public: - - CntByteItem(sal_uInt16 which, sal_uInt8 nTheValue, SfxItemType eItemType = SfxItemType::CntByteItemType): - SfxPoolItem(which, eItemType), m_nValue(nTheValue) {} + DECLARE_ITEM_TYPE_FUNCTION(CntByteItem) + CntByteItem(sal_uInt16 which, sal_uInt8 nTheValue): + SfxPoolItem(which), m_nValue(nTheValue) {} virtual bool operator ==(const SfxPoolItem & rItem) const override; @@ -62,9 +62,9 @@ class SVL_DLLPUBLIC CntUInt16Item: public SfxPoolItem sal_uInt16 m_nValue; public: - - CntUInt16Item(sal_uInt16 which, sal_uInt16 nTheValue, SfxItemType eItemType = SfxItemType::CntUInt16ItemType): - SfxPoolItem(which, eItemType), m_nValue(nTheValue) + DECLARE_ITEM_TYPE_FUNCTION(CntUInt16Item) + CntUInt16Item(sal_uInt16 which, sal_uInt16 nTheValue): + SfxPoolItem(which), m_nValue(nTheValue) {} virtual bool operator ==(const SfxPoolItem & rItem) const override; @@ -97,9 +97,9 @@ class SVL_DLLPUBLIC CntInt32Item: public SfxPoolItem sal_Int32 m_nValue; public: - - CntInt32Item(sal_uInt16 which, sal_Int32 nTheValue, SfxItemType eItemType = SfxItemType::CntInt32ItemType): - SfxPoolItem(which, eItemType), m_nValue(nTheValue) + DECLARE_ITEM_TYPE_FUNCTION(CntInt32Item) + CntInt32Item(sal_uInt16 which, sal_Int32 nTheValue): + SfxPoolItem(which), m_nValue(nTheValue) {} virtual bool operator ==(const SfxPoolItem & rItem) const override; @@ -132,9 +132,9 @@ class SVL_DLLPUBLIC CntUInt32Item: public SfxPoolItem sal_uInt32 m_nValue; public: - - CntUInt32Item(sal_uInt16 which, sal_uInt32 nTheValue, SfxItemType eItemType = SfxItemType::CntUInt32ItemType): - SfxPoolItem(which, eItemType), m_nValue(nTheValue) + DECLARE_ITEM_TYPE_FUNCTION(CntUInt32Item) + CntUInt32Item(sal_uInt16 which, sal_uInt32 nTheValue): + SfxPoolItem(which), m_nValue(nTheValue) {} virtual bool operator ==(const SfxPoolItem & rItem) const override; diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx index fd398e8f0cbb..518ebe51db62 100644 --- a/include/svl/eitem.hxx +++ b/include/svl/eitem.hxx @@ -30,8 +30,8 @@ class SAL_DLLPUBLIC_RTTI SfxEnumItem : public SfxEnumItemInterface EnumT m_nValue; protected: - explicit SfxEnumItem(sal_uInt16 const nWhich, SfxItemType eItemType, EnumT const nValue) - : SfxEnumItemInterface(nWhich, eItemType) + explicit SfxEnumItem(sal_uInt16 const nWhich, EnumT const nValue) + : SfxEnumItemInterface(nWhich) , m_nValue(nValue) { } @@ -84,10 +84,9 @@ protected: public: static SfxPoolItem* CreateDefault(); - - explicit SfxBoolItem(sal_uInt16 const nWhich = 0, bool const bValue = false, - SfxItemType eItemType = SfxItemType::SfxBoolItemType) - : SfxPoolItem(nWhich, eItemType) + DECLARE_ITEM_TYPE_FUNCTION(SfxBoolItem) + explicit SfxBoolItem(sal_uInt16 const nWhich = 0, bool const bValue = false) + : SfxPoolItem(nWhich) , m_bValue(bValue) { } diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx index f269e65582a8..8a8f70b869b4 100644 --- a/include/svl/flagitem.hxx +++ b/include/svl/flagitem.hxx @@ -28,9 +28,8 @@ class SVL_DLLPUBLIC SfxFlagItem: public SfxPoolItem sal_uInt16 nVal; public: - - explicit SfxFlagItem( sal_uInt16 nWhich = 0, sal_uInt16 nValue = 0, - SfxItemType eItemType = SfxItemType::SfxFlagItemType ); + DECLARE_ITEM_TYPE_FUNCTION(SfxFlagItem) + explicit SfxFlagItem( sal_uInt16 nWhich = 0, sal_uInt16 nValue = 0 ); virtual sal_uInt8 GetFlagCount() const; diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx index edbb56273232..198330020697 100644 --- a/include/svl/globalnameitem.hxx +++ b/include/svl/globalnameitem.hxx @@ -30,6 +30,7 @@ class SVL_DLLPUBLIC SfxGlobalNameItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SfxGlobalNameItem) SfxGlobalNameItem(); SfxGlobalNameItem( sal_uInt16 nWhich, const SvGlobalName& ); virtual ~SfxGlobalNameItem() override; diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx index a50a5af9dc82..ea1dbef3f22d 100644 --- a/include/svl/grabbagitem.hxx +++ b/include/svl/grabbagitem.hxx @@ -22,6 +22,7 @@ private: std::map m_aMap; public: + DECLARE_ITEM_TYPE_FUNCTION(SfxGrabBagItem) SfxGrabBagItem(); SfxGrabBagItem(sal_uInt16 nWhich); SfxGrabBagItem(sal_uInt16 nWhich, std::map aMap); diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx index bb49d18c9dbb..19fa21406c4d 100644 --- a/include/svl/ilstitem.hxx +++ b/include/svl/ilstitem.hxx @@ -32,6 +32,7 @@ class SVL_DLLPUBLIC SfxIntegerListItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SfxIntegerListItem) SfxIntegerListItem(); SfxIntegerListItem( sal_uInt16 nWhich, std::vector < sal_Int32 >&& rList ); SfxIntegerListItem( sal_uInt16 nWhich, const css::uno::Sequence < sal_Int32 >& rList ); diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx index 4ef7e4d47f1e..321931bd9bf3 100644 --- a/include/svl/imageitm.hxx +++ b/include/svl/imageitm.hxx @@ -28,6 +28,7 @@ class SVL_DLLPUBLIC SfxImageItem final : public SfxInt16Item { public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SfxImageItem) SfxImageItem( sal_uInt16 nWhich = 0 ); SfxImageItem( const SfxImageItem& ); virtual ~SfxImageItem() override; diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx index 70a502c645a8..774d986f62b6 100644 --- a/include/svl/int64item.hxx +++ b/include/svl/int64item.hxx @@ -18,6 +18,7 @@ class SVL_DLLPUBLIC SfxInt64Item final : public SfxPoolItem sal_Int64 mnValue; public: + DECLARE_ITEM_TYPE_FUNCTION(SfxInt64Item) SfxInt64Item( sal_uInt16 nWhich, sal_Int64 nVal ); virtual ~SfxInt64Item() override; diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index 1197ed5de085..d8452fef6c2f 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -29,10 +29,9 @@ class SVL_DLLPUBLIC SfxByteItem: public CntByteItem { public: static SfxPoolItem* CreateDefault(); - - explicit SfxByteItem(sal_uInt16 which = 0, sal_uInt8 nValue = 0, - SfxItemType eItemType = SfxItemType::SfxByteItemType): - CntByteItem(which, nValue, eItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SfxByteItem) + explicit SfxByteItem(sal_uInt16 which = 0, sal_uInt8 nValue = 0): + CntByteItem(which, nValue) {} virtual SfxByteItem* Clone(SfxItemPool * = nullptr) const override { return new SfxByteItem(*this); } @@ -44,10 +43,9 @@ class SVL_DLLPUBLIC SfxInt16Item: public SfxPoolItem public: static SfxPoolItem* CreateDefault(); - - explicit SfxInt16Item(sal_uInt16 which = 0, sal_Int16 nTheValue = 0, - SfxItemType eItemType = SfxItemType::SfxInt16ItemType): - SfxPoolItem(which, eItemType), m_nValue(nTheValue) + DECLARE_ITEM_TYPE_FUNCTION(SfxInt16Item) + explicit SfxInt16Item(sal_uInt16 which = 0, sal_Int16 nTheValue = 0): + SfxPoolItem(which), m_nValue(nTheValue) {} virtual bool operator ==(const SfxPoolItem & rItem) const override; @@ -80,10 +78,9 @@ class SVL_DLLPUBLIC SfxUInt16Item: public CntUInt16Item { public: static SfxPoolItem* CreateDefault(); - - explicit SfxUInt16Item(sal_uInt16 which = 0, sal_uInt16 nValue = 0, - SfxItemType eItemType = SfxItemType::SfxUInt16ItemType): - CntUInt16Item(which, nValue, eItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SfxUInt16Item) + explicit SfxUInt16Item(sal_uInt16 which = 0, sal_uInt16 nValue = 0): + CntUInt16Item(which, nValue) {} virtual SfxUInt16Item* Clone(SfxItemPool * = nullptr) const override { return new SfxUInt16Item(*this); } @@ -98,9 +95,9 @@ class SVL_DLLPUBLIC SfxInt32Item: public CntInt32Item public: static SfxPoolItem* CreateDefault(); - explicit SfxInt32Item(sal_uInt16 which = 0, sal_Int32 nValue = 0, - SfxItemType eItemType = SfxItemType::SfxInt32ItemType): - CntInt32Item(which, nValue, eItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SfxInt32Item) + explicit SfxInt32Item(sal_uInt16 which = 0, sal_Int32 nValue = 0): + CntInt32Item(which, nValue) {} virtual SfxInt32Item* Clone(SfxItemPool * = nullptr) const override { return new SfxInt32Item(*this); } @@ -114,9 +111,9 @@ class SVL_DLLPUBLIC SfxUInt32Item: public CntUInt32Item { public: static SfxPoolItem* CreateDefault(); - - explicit SfxUInt32Item(sal_uInt16 which = 0, sal_uInt32 nValue = 0, SfxItemType eItemType = SfxItemType::SfxUInt32ItemType): - CntUInt32Item(which, nValue, eItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SfxUInt32Item) + explicit SfxUInt32Item(sal_uInt16 which = 0, sal_uInt32 nValue = 0): + CntUInt32Item(which, nValue) {} virtual SfxUInt32Item* Clone(SfxItemPool * = nullptr) const override { return new SfxUInt32Item(*this); } diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx index af19872d05eb..9a61bb55e643 100644 --- a/include/svl/lckbitem.hxx +++ b/include/svl/lckbitem.hxx @@ -33,6 +33,7 @@ public: SfxLockBytesItem(); virtual ~SfxLockBytesItem() override; + DECLARE_ITEM_TYPE_FUNCTION(SfxLockBytesItem) SfxLockBytesItem(SfxLockBytesItem const &) = default; SfxLockBytesItem(SfxLockBytesItem &&) = default; SfxLockBytesItem & operator =(SfxLockBytesItem const &) = delete; // due to SfxPoolItem diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index 999acb8a9f02..0445396f4f22 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -110,6 +110,7 @@ This item describes a Macro table. class SVL_DLLPUBLIC SvxMacroItem final : public SfxPoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxMacroItem) explicit inline SvxMacroItem ( const sal_uInt16 nId ); // "pure virtual methods" of SfxPoolItem @@ -135,7 +136,7 @@ private: }; inline SvxMacroItem::SvxMacroItem( const sal_uInt16 nId ) - : SfxPoolItem( nId, SfxItemType::SvxMacroItemType ) + : SfxPoolItem( nId ) {} inline bool SvxMacroItem::HasMacro( SvMacroItemId nEvent ) const diff --git a/include/svl/metitem.hxx b/include/svl/metitem.hxx index 125ee7c3dc1d..30cf75b7f864 100644 --- a/include/svl/metitem.hxx +++ b/include/svl/metitem.hxx @@ -25,8 +25,7 @@ class SVL_DLLPUBLIC SfxMetricItem: public SfxInt32Item { public: - explicit SfxMetricItem( sal_uInt16 nWhich, sal_Int32 nValue, - SfxItemType eItemType = SfxItemType::SfxMetricItemType ); + explicit SfxMetricItem( sal_uInt16 nWhich, sal_Int32 nValue ); virtual void ScaleMetrics( tools::Long lMult, tools::Long lDiv ) override; virtual bool HasMetrics() const override; diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 43dc82143339..3475aea6c039 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -105,7 +105,16 @@ enum class SfxItemState { SET = 0x0040 }; -enum class SfxItemType : sal_uInt16 { +/** + * These defines SfxItemType. Each derivation from SfxPoolItem needs one + * unique value that is returned in the call to ItemType(). This is done + * using DECLARE_ITEM_TYPE_FUNCTION in the public section of each definition + * of a derivation of SfxItemType, also for types derived deeper than one + * step. It overloads virtual SfxItemType ItemType() with the secified + * type, see that macro. +*/ +enum class SfxItemType : sal_uInt16 +{ AffineMatrixItemType, CntByteItemType, CntInt32ItemType, @@ -117,11 +126,11 @@ enum class SfxItemType : sal_uInt16 { InvalidOrDisabledItemType, MediaItemType, NameOrIndexType, - OStringListItemType, OfaPtrItemType, OfaXColorListItemType, OptionalBoolItemType, - RectangleAlignmentType, + OStringListItemType, + SampleItemType, SbxItemType, ScCondFormatItemType, ScConsolidateItemType, @@ -130,6 +139,7 @@ enum class SfxItemType : sal_uInt16 { ScInputStatusItemType, ScLineBreakCellType, ScMergeAttrType, + ScMergeFlagAttrType, ScPageHFItemType, ScPageScaleToItemType, ScPivotItemType, @@ -149,6 +159,7 @@ enum class SfxItemType : sal_uInt16 { ScUserListItemType, ScVerticalStackCellType, ScViewObjectModeItemType, + SdOptionsGridItemType, SdOptionsMiscItemType, SdOptionsPrintItemType, SdrAllPositionXItemType, @@ -157,12 +168,12 @@ enum class SfxItemType : sal_uInt16 { SdrAllSizeWidthItemType, SdrAngleItemType, SdrCaptionAngleItemType, - SdrCaptionGapItemType, SdrCaptionEscAbsItemType, SdrCaptionEscDirItemType, - SdrCaptionEscRelItemType, SdrCaptionEscIsRelItemType, + SdrCaptionEscRelItemType, SdrCaptionFitLineLenItemType, + SdrCaptionGapItemType, SdrCaptionLineLenItemType, SdrCaptionTypeItemType, SdrCircKindItemType, @@ -178,21 +189,23 @@ enum class SfxItemType : sal_uInt16 { SdrFractionItemType, SdrGrafBlueItemType, SdrGrafContrastItemType, - SdrGrafCropType, + SdrGrafCropItemType, SdrGrafGamma100ItemType, SdrGrafGreenItemType, - SdrGrafLuminanceItemType, - SdrGrafRedItemType, SdrGrafInvertItemType, - SdrGrafModeItem_Base, + SdrGrafLuminanceItemType, + SdrGrafModeItemType, + SdrGrafModeItem_BaseType, + SdrGrafRedItemType, SdrGrafTransparenceItemType, + SdrHorzShearAllItemType, + SdrHorzShearOneItemType, SdrLayerIdItemType, SdrLayerNameItemType, SdrLogicSizeHeightItemType, SdrLogicSizeWidthItemType, SdrMeasureBelowRefEdgeItemType, SdrMeasureDecimalPlacesItemType, - SdrMeasureFormatStringItemType, SdrMeasureKindItemType, SdrMeasureOverhangItemType, SdrMeasureScaleItemType, @@ -229,30 +242,30 @@ enum class SfxItemType : sal_uInt16 { SdrTextAniCountItemType, SdrTextAniDelayItemType, SdrTextAniDirectionItemType, + SdrTextAniKindItemType, SdrTextAniStartInsideItemType, SdrTextAniStopInsideItemType, - SdrTextAniKindItemType, SdrTextFitToSizeTypeItemType, SdrTextFixedCellHeightItemType, - SdrTextHorzAdjustType, - SdrTextVertAdjustType, + SdrTextHorzAdjustItemType, + SdrTextVertAdjustItemType, SdrTransformRef1XItemType, SdrTransformRef1YItemType, SdrTransformRef2XItemType, SdrTransformRef2YItemType, - SdrHorzShearAllItemType, SdrVertShearAllItemType, - SdrHorzShearOneItemType, SdrVertShearOneItemType, SdrYesNoItemType, SfxBoolItemType, SfxByteItemType, SfxDocumentInfoItemType, + SfxEnumItemInterfaceType, SfxEventNamesItemType, SfxFlagItemType, SfxFrameItemType, SfxGlobalNameItemType, SfxGrabBagItemType, + SfxHyphenRegionItemType, SfxImageItemType, SfxInt16ItemType, SfxInt32ItemType, @@ -261,13 +274,11 @@ enum class SfxItemType : sal_uInt16 { SfxLinkItemType, SfxLockBytesItemType, SfxMacroInfoItemType, - SfxMetricItemType, SfxObjectItemType, SfxObjectShellItemType, SfxPointItemType, SfxRangeItemType, SfxRectangleItemType, - SfxRegionItemType, SfxScriptOrganizerItemType, SfxSetItemType, SfxStringItemType, @@ -282,7 +293,6 @@ enum class SfxItemType : sal_uInt16 { SfxVisibilityItemType, SfxVoidItemType, SfxWatermarkItemType, - SfxZoomItemType, Svx3DCharacterModeItemType, Svx3DCloseBackItemType, Svx3DCloseFrontItemType, @@ -296,7 +306,6 @@ enum class SfxItemType : sal_uInt16 { Svx3DTextureModeItemType, Svx3DTextureProjectionXItemType, Svx3DTextureProjectionYItemType, - SvXMLAttrContainerItemType, SvxAdjustItemType, SvxAutoKernItemType, SvxB3DVectorItemType, @@ -333,6 +342,8 @@ enum class SfxItemType : sal_uInt16 { SvxFontListItemType, SvxForbiddenRuleItemType, SvxFormatBreakItemType, + SvxFormatKeepItemType, + SvxFormatSplitItemType, SvxFrameDirectionItemType, SvxGalleryItemType, SvxGradientListItemType, @@ -348,42 +359,50 @@ enum class SfxItemType : sal_uInt16 { SvxHyphenZoneItemType, SvxJustifyMethodItemType, SvxKerningItemType, - SvxLRSpaceItemType, SvxLanguageItemType, + SvxLanguageItem_BaseType, SvxLeftMarginItemType, SvxLineEndListItemType, SvxLineItemType, SvxLineSpacingItemType, SvxLongLRSpaceItemType, SvxLongULSpaceItemType, + SvxLRSpaceItemType, SvxMacroItemType, SvxMarginItemType, + SvXMLAttrContainerItemType, SvxNoHyphenItemType, - SvxNumBulletItemType, SvxNumberInfoItemType, + SvxNumBulletItemType, SvxObjectItemType, SvxOpaqueItemType, SvxOrientationItemType, SvxOrphansItemType, SvxOverlineItemType, SvxPageItemType, + SvxPageModelItemType, SvxPagePosSizeItemType, SvxPaperBinItemType, SvxParaGridItemType, SvxParaVertAlignItemType, SvxPatternListItemType, + SvxPostItAuthorItemType, SvxPostItDateItemType, + SvxPostItIdItemType, + SvxPostItTextItemType, SvxPostureItemType, SvxPrintItemType, SvxProtectItemType, + SvxRectangleAlignmentItemType, SvxRightMarginItemType, SvxRotateModeItemType, SvxRsidItemType, SvxScriptSetItemType, SvxScriptSpaceItemType, SvxSearchItemType, - SvxShadowItemType, + SvxSetItemType, SvxShadowedItemType, + SvxShadowItemType, SvxSizeItemType, SvxSmartTagItemType, SvxStatusItemType, @@ -392,22 +411,26 @@ enum class SfxItemType : sal_uInt16 { SvxTextLineItemType, SvxTextRotateItemType, SvxTwoLinesItemType, - SvxUnderlineItemType, SvxULSpaceItemType, + SvxUnderlineItemType, SvxVerJustifyItemType, SvxViewLayoutItemType, SvxWeightItemType, SvxWidowsItemType, - SvxWordLineItemType, + SvxWordLineModeItemType, SvxWritingModeItemType, + SvxZoomItemType, SvxZoomSliderItemType, SwAddPrinterItemType, - SwChannelGrfType, + SwAttrSetChgType, + SwChannelBGrfType, + SwChannelGGrfType, + SwChannelRGrfType, SwCondCollItemType, SwContrastGrfType, SwCropGrfType, SwDocDisplayItemType, - SwDrawModeGrf_BaseType, + SwDrawModeGrfType, SwElemItemType, SwEnvItemType, SwFltAnchorType, @@ -421,25 +444,26 @@ enum class SfxItemType : sal_uInt16 { SwFormatChainType, SwFormatCharFormatType, SwFormatColType, - SwFormatContentControlType, SwFormatContentType, + SwFormatContentControlType, SwFormatDropType, - SwFormatEditInReadonly, + SwFormatEditInReadonlyType, + SwFormatEndAtTextEndType, SwFormatFieldType, - SwFormatFrameSizeType, SwFormatFillOrderType, SwFormatFlyCntType, SwFormatFlySplitType, SwFormatFollowTextFlowType, SwFormatFooterType, - SwFormatFootnoteEndAtTextEndType, SwFormatFootnoteType, + SwFormatFootnoteAtTextEndType, + SwFormatFrameSizeType, SwFormatHeaderType, SwFormatHoriOrientType, SwFormatINetFormatType, SwFormatLayoutSplitType, + SwFormatLineBreakType, SwFormatLineNumberType, - SwFormatLinebreakType, SwFormatMetaType, SwFormatNoBalancedColumnsType, SwFormatPageDescType, @@ -449,7 +473,7 @@ enum class SfxItemType : sal_uInt16 { SwFormatSurroundType, SwFormatURLType, SwFormatVertOrientType, - SwFormatWrapInfluenceOnOjPosType, + SwFormatWrapInfluenceOnObjPosType, SwFormatWrapTextAtFlyStartType, SwGammaGrfType, SwHeaderAndFooterEatSpacingItemType, @@ -459,18 +483,22 @@ enum class SfxItemType : sal_uInt16 { SwMirrorGrfType, SwMsgPoolItemType, SwNumRuleItemType, - SwPaMItemType, SwPageFootnoteInfoItemType, + SwPaMItemType, + SwParaConnectBorderItemType, SwPtrItemType, + SwPtrMsgPoolItemType, + SwRegisterItemType, SwRotationGrfType, SwShadowCursorItemType, - SwTOXMarkType, + SwTableBoxFormulaType, SwTableBoxNumFormatType, SwTableBoxValueType, - SwTableFormulaType, SwTextGridItemType, + SwTOXMarkType, SwTransparencyGrfType, SwUINumRuleItemType, + SwUpdateAttrType, SwWrtShellItemType, XColorItemType, XFillAttrSetItemType, @@ -514,7 +542,7 @@ enum class SfxItemType : sal_uInt16 { XLineEndItemType, XLineEndWidthItemType, XLineJointItemType, - XLineStartCenterItem, + XLineStartCenterItemType, XLineStartItemType, XLineStartWidthItemType, XLineStyleItemType, @@ -537,6 +565,9 @@ class SfxItemPool; typedef struct _xmlTextWriter* xmlTextWriterPtr; class ItemInstanceManager; +#define DECLARE_ITEM_TYPE_FUNCTION(T) \ + virtual SfxItemType ItemType() const override { return SfxItemType::T##Type; } + class SVL_DLLPUBLIC SfxPoolItem { friend class SfxItemPool; @@ -551,7 +582,6 @@ class SVL_DLLPUBLIC SfxPoolItem mutable sal_uInt32 m_nRefCount; sal_uInt16 m_nWhich; - SfxItemType m_eItemType; #ifdef DBG_UTIL // for debugging add a serial number, will be set in the constructor @@ -640,10 +670,11 @@ private: } protected: - - explicit SfxPoolItem( sal_uInt16 nWhich, SfxItemType ); - SfxPoolItem( const SfxPoolItem& rCopy) - : SfxPoolItem(rCopy.m_nWhich, rCopy.m_eItemType) {} + // costructors are protected; SfxPoolItem is a base + // class and ought bot to be constructed (also guaranteed + // by pure virtual function ItemType now) + explicit SfxPoolItem(sal_uInt16 nWhich); + SfxPoolItem(const SfxPoolItem& rCopy) : SfxPoolItem(rCopy.m_nWhich) {} public: virtual ~SfxPoolItem(); @@ -654,8 +685,8 @@ public: assert(m_nRefCount==0); m_nWhich = nId; } - sal_uInt16 Which() const { return m_nWhich; } - SfxItemType ItemType() const { return m_eItemType;} + sal_uInt16 Which() const { return m_nWhich; } + virtual SfxItemType ItemType() const = 0; // StaticWhichCast asserts if the TypedWhichId is not matching its type, otherwise it returns a reference. // You can use StaticWhichCast when you are sure about the type at compile time -- like a static_cast. @@ -757,7 +788,7 @@ private: // each SfxPoolItem (except when !isShareable()). It just // uses an unordered_set holding ptrs to SfxPoolItems added // and SfxPoolItem::operator== to linearly search for one. -// Thus this is not the fastest, but as fast as old 'poooled' +// Thus this is not the fastest, but as fast as old 'pooled' // stuff - better use an intelligent, pro-Item implementation // that does e.g. hashing or whatever might be feasible for // that specific Item (see other derivations) diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index 763d2d859663..f78d0f9a0851 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.hxx @@ -30,6 +30,7 @@ class SVL_DLLPUBLIC SfxPointItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SfxPointItem) SfxPointItem(); SfxPointItem( sal_uInt16 nWhich, const Point& rVal ); diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index 0b7dadb88a33..24d4e59e1eb3 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -29,6 +29,7 @@ class SVL_DLLPUBLIC SfxRectangleItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SfxRectangleItem) SfxRectangleItem(); SfxRectangleItem( sal_uInt16 nWhich, const tools::Rectangle& rVal ); diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index 6276863a47de..452fc71ab18d 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -31,6 +31,7 @@ private: sal_uInt16 nFrom; sal_uInt16 nTo; public: + DECLARE_ITEM_TYPE_FUNCTION(SfxRangeItem) SfxRangeItem( sal_uInt16 nWID, sal_uInt16 nFrom, sal_uInt16 nTo ); virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, diff --git a/include/svl/setitem.hxx b/include/svl/setitem.hxx index 6468037870be..219906f97f62 100644 --- a/include/svl/setitem.hxx +++ b/include/svl/setitem.hxx @@ -31,10 +31,9 @@ class SVL_DLLPUBLIC SfxSetItem : public SfxPoolItem SfxSetItem& operator=(const SfxSetItem&) = delete; public: - SfxSetItem(sal_uInt16 nWhich, SfxItemSet&& pSet, - SfxItemType eItemType = SfxItemType::SfxSetItemType); - SfxSetItem(sal_uInt16 nWhich, const SfxItemSet& rSet, - SfxItemType eItemType = SfxItemType::SfxSetItemType); + DECLARE_ITEM_TYPE_FUNCTION(SfxSetItem) + SfxSetItem(sal_uInt16 nWhich, SfxItemSet&& pSet); + SfxSetItem(sal_uInt16 nWhich, const SfxItemSet& rSet); SfxSetItem(const SfxSetItem&, SfxItemPool* pPool = nullptr); virtual bool operator==(const SfxPoolItem&) const override; diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index 48e558149881..53406cc4382d 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -34,6 +34,7 @@ class SVL_DLLPUBLIC SfxStringListItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SfxStringListItem) SfxStringListItem(); SfxStringListItem( sal_uInt16 nWhich, const std::vector *pList=nullptr ); virtual ~SfxStringListItem() override; diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index c51d2d752e02..f9c71d4e767b 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -92,6 +92,7 @@ class SVL_DLLPUBLIC SvxSearchItem final : public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxSearchItem) explicit SvxSearchItem( const sal_uInt16 nId ); SvxSearchItem( const SvxSearchItem& rItem ); virtual ~SvxSearchItem() override; diff --git a/include/svl/stritem.hxx b/include/svl/stritem.hxx index 977f4bddc7b0..5708de213224 100644 --- a/include/svl/stritem.hxx +++ b/include/svl/stritem.hxx @@ -28,12 +28,12 @@ class SVL_DLLPUBLIC SfxStringItem: public SfxPoolItem { public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SfxStringItem) + SfxStringItem(sal_uInt16 which = 0) + : SfxPoolItem(which) {} - SfxStringItem(sal_uInt16 which = 0, SfxItemType eItemType = SfxItemType::SfxStringItemType) - : SfxPoolItem(which, eItemType) {} - - SfxStringItem(sal_uInt16 which, const OUString & rValue, SfxItemType eItemType = SfxItemType::SfxStringItemType): - SfxPoolItem(which, eItemType), m_aValue(rValue) {} + SfxStringItem(sal_uInt16 which, const OUString & rValue): + SfxPoolItem(which), m_aValue(rValue) {} virtual bool operator ==(const SfxPoolItem & rItem) const override; // Note that all the subclasses are currently marked as false since we haven't check them to diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index 8a458bbf2f6c..225f602ccb23 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -30,8 +30,9 @@ class SVL_DLLPUBLIC SfxVisibilityItem final : public SfxPoolItem public: + DECLARE_ITEM_TYPE_FUNCTION(SfxVisibilityItem) explicit SfxVisibilityItem(sal_uInt16 which, bool bVisible): - SfxPoolItem(which, SfxItemType::SfxVisibilityItemType) + SfxPoolItem(which) { m_nValue.bVisible = bVisible; } diff --git a/include/svl/voiditem.hxx b/include/svl/voiditem.hxx index 911c691470fb..07f37326e888 100644 --- a/include/svl/voiditem.hxx +++ b/include/svl/voiditem.hxx @@ -27,6 +27,7 @@ class SVL_DLLPUBLIC SfxVoidItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SfxVoidItem) explicit SfxVoidItem(sal_uInt16 nWhich); SfxVoidItem(const SfxVoidItem& rCopy); SfxVoidItem(SfxVoidItem&& rOrig); diff --git a/include/svx/RectangleAlignmentItem.hxx b/include/svx/RectangleAlignmentItem.hxx index 62bcbe2b1d02..24fa546d0e02 100644 --- a/include/svx/RectangleAlignmentItem.hxx +++ b/include/svx/RectangleAlignmentItem.hxx @@ -27,6 +27,7 @@ class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SvxRectangleAlignmentItem final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxRectangleAlignmentItem) SvxRectangleAlignmentItem(sal_uInt16 nWhich, model::RectangleAlignment nValue); virtual ~SvxRectangleAlignmentItem() override; diff --git a/include/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx index c68847d4ca57..63ace9d3e91b 100644 --- a/include/svx/SmartTagItem.hxx +++ b/include/svx/SmartTagItem.hxx @@ -50,6 +50,7 @@ class SVX_DLLPUBLIC SvxSmartTagItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxSmartTagItem) SvxSmartTagItem( const TypedWhichId nId, const css::uno::Sequence < css::uno::Sequence< css::uno::Reference< css::smarttags::XSmartTagAction > > >& rActionComponentsSequence, const css::uno::Sequence < css::uno::Sequence< sal_Int32 > >& rActionIndicesSequence, diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index 99117d11eb19..08a78123bc87 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -30,6 +30,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxOrientationItem final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxOrientationItem) SvxOrientationItem( const SvxCellOrientation eOrientation, const TypedWhichId nId ); @@ -64,6 +65,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxMarginItem final : public SfxPoolItem sal_Int16 nBottomMargin; public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxMarginItem) SvxMarginItem( const TypedWhichId nId ); SvxMarginItem( sal_Int16 nLeft, sal_Int16 nTop /*= 0*/, sal_Int16 nRight /*= 0*/, sal_Int16 nBottom /*= 0*/, diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index 88351f285be0..b8536817a293 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -78,6 +78,7 @@ enum class SvxChartRegress class SAL_WARN_UNUSED UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SvxChartRegressItem final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxChartRegressItem) SvxChartRegressItem(SvxChartRegress eRegress /*= SvxChartRegress::Linear*/, TypedWhichId nId ); @@ -89,6 +90,7 @@ public: class SAL_WARN_UNUSED UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SvxChartTextOrderItem final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxChartTextOrderItem) SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= SvxChartTextOrder::SideBySide*/, TypedWhichId nId ); @@ -103,6 +105,7 @@ public: class SAL_WARN_UNUSED UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SvxChartKindErrorItem final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxChartKindErrorItem) SvxChartKindErrorItem(SvxChartKindError /*eOrient = SvxChartKindError::NONE*/, TypedWhichId nId ); @@ -114,6 +117,7 @@ public: class SAL_WARN_UNUSED UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SvxChartIndicateItem final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxChartIndicateItem) SvxChartIndicateItem(SvxChartIndicate eOrient /*= SvxChartIndicate::NONE*/, TypedWhichId nId ); @@ -128,6 +132,7 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxDoubleItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxDoubleItem) SvxDoubleItem(double fValue /*= 0.0*/, TypedWhichId nId ); SvxDoubleItem(const SvxDoubleItem& rItem); diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx index 4c064dbf40bc..2ad29035302f 100644 --- a/include/svx/clipfmtitem.hxx +++ b/include/svx/clipfmtitem.hxx @@ -37,6 +37,7 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxClipboardFormatItem final : public Sf public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxClipboardFormatItem) SvxClipboardFormatItem(TypedWhichId nId); SvxClipboardFormatItem(const SvxClipboardFormatItem&); virtual ~SvxClipboardFormatItem() override; diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx index 4cfffd47c7c1..50e02e9434e7 100644 --- a/include/svx/drawitem.hxx +++ b/include/svx/drawitem.hxx @@ -30,6 +30,7 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxColorListItem final : public SfxPoolI public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxColorListItem) SvxColorListItem(); SvxColorListItem( XColorListRef pTable, TypedWhichId nWhich ); @@ -55,6 +56,7 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxGradientListItem final : public SfxPo public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxGradientListItem) SvxGradientListItem(); SvxGradientListItem( XGradientListRef pList, TypedWhichId nWhich ); @@ -79,6 +81,7 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxHatchListItem final : public SfxPoolI public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxHatchListItem) SvxHatchListItem(); SvxHatchListItem( XHatchListRef pList, TypedWhichId nWhich ); @@ -104,6 +107,7 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxBitmapListItem final : public SfxPool public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxBitmapListItem) SvxBitmapListItem(); SvxBitmapListItem( XBitmapListRef pBL, TypedWhichId nWhich ); @@ -129,6 +133,7 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxPatternListItem final : public SfxPoo public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxPatternListItem) SvxPatternListItem(); SvxPatternListItem( XPatternListRef pBL, TypedWhichId nWhich ); @@ -153,6 +158,7 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxDashListItem final : public SfxPoolIt public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxDashListItem) SvxDashListItem(); SvxDashListItem( XDashListRef pList, TypedWhichId nWhich ); @@ -178,6 +184,7 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxLineEndListItem final : public SfxPoo public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxLineEndListItem) SvxLineEndListItem(); SvxLineEndListItem( XLineEndListRef pList, TypedWhichId nWhich ); diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx index 7302c93d97c6..17ea6f621ee4 100644 --- a/include/svx/e3ditem.hxx +++ b/include/svx/e3ditem.hxx @@ -30,6 +30,7 @@ class SAL_WARN_UNUSED UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SvxB3DVectorItem final basegfx::B3DVector m_aVal; public: + DECLARE_ITEM_TYPE_FUNCTION(SvxB3DVectorItem) SvxB3DVectorItem( TypedWhichId nWhich, const basegfx::B3DVector& rVal ); SvxB3DVectorItem( const SvxB3DVectorItem& ); virtual ~SvxB3DVectorItem() override; diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx index cf786ab2d95a..07a113e246a1 100644 --- a/include/svx/galleryitem.hxx +++ b/include/svx/galleryitem.hxx @@ -47,6 +47,7 @@ class SVXCORE_DLLPUBLIC SvxGalleryItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxGalleryItem) SvxGalleryItem(); SvxGalleryItem( const SvxGalleryItem& ); virtual ~SvxGalleryItem() override; diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx index 615a750a1c01..6069c1d00211 100644 --- a/include/svx/grfcrop.hxx +++ b/include/svx/grfcrop.hxx @@ -27,11 +27,11 @@ class SVXCORE_DLLPUBLIC SvxGrfCrop : public SfxPoolItem { sal_Int32 m_nLeft, m_nRight, m_nTop, m_nBottom; public: - SvxGrfCrop( TypedWhichId, SfxItemType eType = SfxItemType::SvxGrfCropType ); + DECLARE_ITEM_TYPE_FUNCTION(SvxGrfCrop) + SvxGrfCrop( TypedWhichId); SvxGrfCrop( sal_Int32 nLeft, sal_Int32 nRight, sal_Int32 nTop, sal_Int32 nBottom, - TypedWhichId, - SfxItemType eItemType = SfxItemType::SvxGrfCropType ); + TypedWhichId ); virtual ~SvxGrfCrop() override; SvxGrfCrop(SvxGrfCrop const &) = default; diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx index 95a42c273c59..a17385f165fc 100644 --- a/include/svx/hlnkitem.hxx +++ b/include/svx/hlnkitem.hxx @@ -61,8 +61,9 @@ class SVX_DLLPUBLIC SvxHyperlinkItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxHyperlinkItem) SvxHyperlinkItem( TypedWhichId _nWhich = SID_HYPERLINK_GETLINK ): - SfxPoolItem(_nWhich, SfxItemType::SvxHyperlinkItemType) + SfxPoolItem(_nWhich ) { eType = HLINK_DEFAULT; nMacroEvents=HyperDialogEvent::NONE; }; SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem ); SvxHyperlinkItem( TypedWhichId nWhich, OUString aName, OUString aURL, diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx index 490b456bb95e..24446b8b5ab8 100644 --- a/include/svx/numinf.hxx +++ b/include/svx/numinf.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC SvxNumberInfoItem final : public SfxPoolItem { public: - + DECLARE_ITEM_TYPE_FUNCTION(SvxNumberInfoItem) SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const TypedWhichId nId ); SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, OUString aVal, diff --git a/include/svx/ofaitem.hxx b/include/svx/ofaitem.hxx index 3e9b90ea0060..e3d027aa75b5 100644 --- a/include/svx/ofaitem.hxx +++ b/include/svx/ofaitem.hxx @@ -30,6 +30,7 @@ private: void* pPtr; public: + DECLARE_ITEM_TYPE_FUNCTION(OfaPtrItem) OfaPtrItem( sal_uInt16 nWhich, void *pPtr ); virtual bool operator==( const SfxPoolItem& ) const override; @@ -43,6 +44,7 @@ class SVX_DLLPUBLIC OfaXColorListItem final : public SfxPoolItem private: rtl::Reference mxRef; public: + DECLARE_ITEM_TYPE_FUNCTION(OfaXColorListItem) OfaXColorListItem( sal_uInt16 _nWhich, rtl::Reference xRef ); virtual bool operator==( const SfxPoolItem& rItem ) const override; diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index 09ceb4f3e509..73eeeaa55c7d 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -68,8 +68,9 @@ class SVX_DLLPUBLIC SvxGridItem : public SvxOptionsGrid, public SfxPoolItem friend class SvxGridTabPage; public: + DECLARE_ITEM_TYPE_FUNCTION(SvxGridItem) SvxGridItem( TypedWhichId _nWhich) - : SfxPoolItem(_nWhich, SfxItemType::SvxGridItemType){}; + : SfxPoolItem(_nWhich){}; virtual SvxGridItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index de93730731d2..b7ec34cf70b3 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -58,6 +58,7 @@ private: public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxPageItem) SvxPageItem( const TypedWhichId nId ); SvxPageItem( const SvxPageItem& rItem ); @@ -97,6 +98,7 @@ public: class SVX_DLLPUBLIC SvxSetItem final : public SfxSetItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SvxSetItem) SvxSetItem( const TypedWhichId nId, const SfxItemSet& rSet ); SvxSetItem( const SvxSetItem& rItem, SfxItemPool* pPool = nullptr ); SvxSetItem( const TypedWhichId nId, SfxItemSet&& pSet ); diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx index af980a3e5b9e..08a856d96569 100644 --- a/include/svx/postattr.hxx +++ b/include/svx/postattr.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC SvxPostItAuthorItem final : public SfxStringItem { public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxPostItAuthorItem) SvxPostItAuthorItem( TypedWhichId nWhich ); SvxPostItAuthorItem( const OUString& rAuthor, TypedWhichId nWhich ); @@ -49,7 +49,7 @@ class SVX_DLLPUBLIC SvxPostItDateItem final : public SfxStringItem { public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxPostItDateItem) SvxPostItDateItem( TypedWhichId nWhich ); SvxPostItDateItem( const OUString& rDate, TypedWhichId nWhich ); @@ -68,7 +68,7 @@ class SVX_DLLPUBLIC SvxPostItTextItem final : public SfxStringItem { public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxPostItTextItem) SvxPostItTextItem( TypedWhichId nWhich ); SvxPostItTextItem( const OUString& rText, TypedWhichId nWhich ); @@ -89,7 +89,7 @@ class SVX_DLLPUBLIC SvxPostItIdItem final : public SfxStringItem { public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxPostItIdItem) SvxPostItIdItem( TypedWhichId nWhich ); virtual SvxPostItIdItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index fa8510e5079f..ff8af7ed7c53 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -39,6 +39,7 @@ class SVX_DLLPUBLIC SvxRotateModeItem final : public SfxEnumItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxRotateModeItem) SvxRotateModeItem( SvxRotateMode eMode, TypedWhichId nWhich); SvxRotateModeItem( const SvxRotateModeItem& rItem ); virtual ~SvxRotateModeItem() override; diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index b45683d31970..626fa5d17a9b 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -42,6 +42,7 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxLongLRSpaceItem) SvxLongLRSpaceItem(tools::Long lLeft, tools::Long lRight, TypedWhichId nId); SvxLongLRSpaceItem(); SvxLongLRSpaceItem(SvxLongLRSpaceItem const &) = default; @@ -72,6 +73,7 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxLongULSpaceItem) SvxLongULSpaceItem(tools::Long lUpper, tools::Long lLower, TypedWhichId nId); SvxLongULSpaceItem(); SvxLongULSpaceItem(SvxLongULSpaceItem const &) = default; @@ -105,6 +107,7 @@ private: const SvxPagePosSizeItem& operator=(const SvxPagePosSizeItem &) = delete; public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxPagePosSizeItem) SvxPagePosSizeItem(const Point &rPos, tools::Long lWidth, tools::Long lHeight); SvxPagePosSizeItem(); SvxPagePosSizeItem(SvxPagePosSizeItem const &) = default; @@ -170,6 +173,7 @@ public: static SfxPoolItem* CreateDefault(); // right edge of the surrounding frame // nLeft, nRight each the distance to the surrounding frame + DECLARE_ITEM_TYPE_FUNCTION(SvxColumnItem) SvxColumnItem(sal_uInt16 nAct = 0); SvxColumnItem(sal_uInt16 nActCol, sal_uInt16 nLeft, sal_uInt16 nRight); // Table with borders @@ -216,6 +220,7 @@ class SVX_DLLPUBLIC SvxObjectItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SvxObjectItem) SvxObjectItem(tools::Long nStartX, tools::Long nEndX, tools::Long nStartY, tools::Long nEndY); SvxObjectItem(SvxObjectItem const &) = default; diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx index 2d778010c6cd..4652e5ad9c15 100644 --- a/include/svx/sdangitm.hxx +++ b/include/svx/sdangitm.hxx @@ -27,8 +27,9 @@ class SVXCORE_DLLPUBLIC SdrAngleItem: public SfxInt32Item { public: - SdrAngleItem(TypedWhichId nId, Degree100 nAngle, SfxItemType eItemType = SfxItemType::SdrAngleItemType) - : SfxInt32Item(nId,nAngle.get(), eItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrAngleItem) + SdrAngleItem(TypedWhichId nId, Degree100 nAngle) + : SfxInt32Item(nId,nAngle.get()) {} virtual SdrAngleItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual bool GetPresentation(SfxItemPresentation ePres, diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index 7821bbd2e0a8..4e45758ba95c 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -61,6 +61,7 @@ private: public: SAL_DLLPRIVATE SdrCustomShapeGeometryItem(); + DECLARE_ITEM_TYPE_FUNCTION(SdrCustomShapeGeometryItem) SdrCustomShapeGeometryItem( const css::uno::Sequence< css::beans::PropertyValue >& ); virtual ~SdrCustomShapeGeometryItem() override; diff --git a/include/svx/sdgcpitm.hxx b/include/svx/sdgcpitm.hxx index d2c25d57f896..fe5c0690ee04 100644 --- a/include/svx/sdgcpitm.hxx +++ b/include/svx/sdgcpitm.hxx @@ -31,11 +31,10 @@ class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafCropItem final : public SvxGrfCrop { public: - - + DECLARE_ITEM_TYPE_FUNCTION(SdrGrafCropItem) SdrGrafCropItem( sal_Int32 nLeftCrop = 0, sal_Int32 nTopCrop = 0, sal_Int32 nRightCrop = 0, sal_Int32 nBottomCrop = 0 ) : - SvxGrfCrop( nLeftCrop, nRightCrop, nTopCrop, nBottomCrop, SDRATTR_GRAFCROP, SfxItemType::SdrGrafCropType ) {} + SvxGrfCrop( nLeftCrop, nRightCrop, nTopCrop, nBottomCrop, SDRATTR_GRAFCROP ) {} virtual SdrGrafCropItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; diff --git a/include/svx/sdggaitm.hxx b/include/svx/sdggaitm.hxx index 6ec033a53798..23bc67799916 100644 --- a/include/svx/sdggaitm.hxx +++ b/include/svx/sdggaitm.hxx @@ -31,8 +31,8 @@ class SVXCORE_DLLPUBLIC SdrGrafGamma100Item final : public SfxUInt32Item { public: - - SdrGrafGamma100Item( sal_uInt32 nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100, SfxItemType::SdrGrafGamma100ItemType ) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrGrafGamma100Item) + SdrGrafGamma100Item( sal_uInt32 nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100 ) {} SAL_DLLPRIVATE virtual SdrGrafGamma100Item* Clone( SfxItemPool* pPool = nullptr ) const override; diff --git a/include/svx/sdgluitm.hxx b/include/svx/sdgluitm.hxx index 13e35435aed5..8f25ce790c02 100644 --- a/include/svx/sdgluitm.hxx +++ b/include/svx/sdgluitm.hxx @@ -31,9 +31,9 @@ class SVXCORE_DLLPUBLIC SdrGrafLuminanceItem final : public SdrSignedPercentItem { public: - + DECLARE_ITEM_TYPE_FUNCTION(SdrGrafLuminanceItem) SdrGrafLuminanceItem( short nLuminancePercent = 0 ) - : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, nLuminancePercent, SfxItemType::SdrGrafLuminanceItemType ) {} + : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, nLuminancePercent ) {} virtual SdrGrafLuminanceItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; @@ -45,9 +45,9 @@ public: class SVXCORE_DLLPUBLIC SdrGrafContrastItem final : public SdrSignedPercentItem { public: - + DECLARE_ITEM_TYPE_FUNCTION(SdrGrafContrastItem) SdrGrafContrastItem( short nContrastPercent = 0 ) - : SdrSignedPercentItem( SDRATTR_GRAFCONTRAST, nContrastPercent, SfxItemType::SdrGrafContrastItemType ) {} + : SdrSignedPercentItem( SDRATTR_GRAFCONTRAST, nContrastPercent ) {} virtual SdrGrafContrastItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index cb5a1d90cb6c..89b0bfa951b3 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -28,13 +28,15 @@ // MSVC hack: class SAL_DLLPUBLIC_RTTI SdrGrafModeItem_Base: public SfxEnumItem { protected: + DECLARE_ITEM_TYPE_FUNCTION(SdrGrafModeItem_Base) SdrGrafModeItem_Base(GraphicDrawMode eMode): - SfxEnumItem(SDRATTR_GRAFMODE, SfxItemType::SdrGrafModeItem_Base, eMode) {} + SfxEnumItem(SDRATTR_GRAFMODE, eMode) {} }; class SVXCORE_DLLPUBLIC SdrGrafModeItem final : public SdrGrafModeItem_Base { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrGrafModeItem) SdrGrafModeItem( GraphicDrawMode eMode = GraphicDrawMode::Standard ) : SdrGrafModeItem_Base( eMode ) {} SAL_DLLPRIVATE virtual SdrGrafModeItem* Clone( SfxItemPool* pPool = nullptr ) const override; diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx index 751cd769aedc..a5aca34d90b3 100644 --- a/include/svx/sdmetitm.hxx +++ b/include/svx/sdmetitm.hxx @@ -29,8 +29,9 @@ class SVXCORE_DLLPUBLIC SdrMetricItem: public SfxInt32Item { public: - SdrMetricItem(TypedWhichId nId, sal_Int32 nVal, SfxItemType eItemType = SfxItemType::SdrMetricItemType) - : SfxInt32Item(nId,nVal,eItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrMetricItem) + SdrMetricItem(TypedWhichId nId, sal_Int32 nVal) + : SfxInt32Item(nId,nVal) {} virtual SdrMetricItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual bool HasMetrics() const override; virtual void ScaleMetrics(tools::Long nMul, tools::Long nDiv) override; diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx index b94a45bb9555..53696db39b3e 100644 --- a/include/svx/sdooitm.hxx +++ b/include/svx/sdooitm.hxx @@ -29,8 +29,9 @@ class SVXCORE_DLLPUBLIC SdrOnOffItem: public SfxBoolItem { public: - SdrOnOffItem(TypedWhichId nId, bool bOn, SfxItemType eItemType = SfxItemType::SdrOnOffItemType) - : SfxBoolItem(nId, bOn, eItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrOnOffItem) + SdrOnOffItem(TypedWhichId nId, bool bOn) + : SfxBoolItem(nId, bOn) {} virtual SdrOnOffItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual OUString GetValueTextByVal(bool bVal) const override; diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx index a7d439d0cf0a..9d5d63077f6a 100644 --- a/include/svx/sdprcitm.hxx +++ b/include/svx/sdprcitm.hxx @@ -31,8 +31,9 @@ class SVXCORE_DLLPUBLIC SdrPercentItem : public SfxUInt16Item { public: - SdrPercentItem(TypedWhichId nId, sal_uInt16 nVal, SfxItemType eItemKind = SfxItemType::SdrPercentItemType) - : SfxUInt16Item(nId, nVal, eItemKind) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrPercentItem) + SdrPercentItem(TypedWhichId nId, sal_uInt16 nVal) + : SfxUInt16Item(nId, nVal) {} virtual SdrPercentItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; @@ -48,8 +49,9 @@ public: class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrSignedPercentItem : public SfxInt16Item { public: - SdrSignedPercentItem( sal_uInt16 nId, sal_Int16 nVal, SfxItemType eItemType = SfxItemType::SdrSignedPercentItemType ) - : SfxInt16Item( nId, nVal, eItemType ) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrSignedPercentItem) + SdrSignedPercentItem( sal_uInt16 nId, sal_Int16 nVal ) + : SfxInt16Item( nId, nVal ) {} virtual SdrSignedPercentItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; diff --git a/include/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx index c5a95eeb0cf2..c1fc1cb8f24b 100644 --- a/include/svx/sdtaaitm.hxx +++ b/include/svx/sdtaaitm.hxx @@ -25,7 +25,8 @@ class SVXCORE_DLLPUBLIC SdrTextAniAmountItem final : public SfxInt16Item { public: - SdrTextAniAmountItem(sal_Int16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT, nVal, SfxItemType::SdrTextAniAmountItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrTextAniAmountItem) + SdrTextAniAmountItem(sal_Int16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT, nVal) {} virtual SdrTextAniAmountItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual bool HasMetrics() const override; virtual void ScaleMetrics(tools::Long nMul, tools::Long nDiv) override; diff --git a/include/svx/sdtacitm.hxx b/include/svx/sdtacitm.hxx index b54491c45ad8..610efa7f256b 100644 --- a/include/svx/sdtacitm.hxx +++ b/include/svx/sdtacitm.hxx @@ -25,7 +25,8 @@ // Number of loops. 0=infinite. class SAL_DLLPUBLIC_RTTI SdrTextAniCountItem final : public SfxUInt16Item { public: - SdrTextAniCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT, nVal, SfxItemType::SdrTextAniCountItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrTextAniCountItem) + SdrTextAniCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT, nVal) {} virtual SdrTextAniCountItem* Clone(SfxItemPool * = nullptr) const override { return new SdrTextAniCountItem(*this); } diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index 6225352e2738..61b9ab7e4a9d 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -33,8 +33,9 @@ enum class SdrTextAniDirection class SVXCORE_DLLPUBLIC SdrTextAniDirectionItem final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrTextAniDirectionItem) SdrTextAniDirectionItem(SdrTextAniDirection eDir=SdrTextAniDirection::Left) - : SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION, SfxItemType::SdrTextAniDirectionItemType, eDir) {} + : SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION, eDir) {} virtual SdrTextAniDirectionItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; diff --git a/include/svx/sdtaiitm.hxx b/include/svx/sdtaiitm.hxx index 9a09d6a02344..5c83d3a9ee10 100644 --- a/include/svx/sdtaiitm.hxx +++ b/include/svx/sdtaiitm.hxx @@ -24,7 +24,8 @@ class SVXCORE_DLLPUBLIC SdrTextAniStartInsideItem final : public SdrYesNoItem { public: - SdrTextAniStartInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn, SfxItemType::SdrTextAniStartInsideItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrTextAniStartInsideItem) + SdrTextAniStartInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {} virtual ~SdrTextAniStartInsideItem() override; virtual SdrTextAniStartInsideItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -36,7 +37,8 @@ public: class SVXCORE_DLLPUBLIC SdrTextAniStopInsideItem final : public SdrYesNoItem { public: - SdrTextAniStopInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn, SfxItemType::SdrTextAniStopInsideItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrTextAniStopInsideItem) + SdrTextAniStopInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {} virtual ~SdrTextAniStopInsideItem() override; virtual SdrTextAniStopInsideItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index 4838c85c4a53..b0e5d3da3f7f 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -34,10 +34,11 @@ enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // aligned to top (normally class SVXCORE_DLLPUBLIC SdrTextVertAdjustItem final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrTextVertAdjustItem) SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): - SfxEnumItem(SDRATTR_TEXT_VERTADJUST, SfxItemType::SdrTextVertAdjustType, eAdj) {} + SfxEnumItem(SDRATTR_TEXT_VERTADJUST, eAdj) {} SdrTextVertAdjustItem(SdrTextVertAdjust eAdj, TypedWhichId nWhich) - : SfxEnumItem(nWhich, SfxItemType::SdrTextVertAdjustType, eAdj) {} + : SfxEnumItem(nWhich, eAdj) {} virtual SdrTextVertAdjustItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 5; } @@ -60,8 +61,9 @@ enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // left adjusted class SVXCORE_DLLPUBLIC SdrTextHorzAdjustItem final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrTextHorzAdjustItem) SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): - SfxEnumItem(SDRATTR_TEXT_HORZADJUST, SfxItemType::SdrTextHorzAdjustType, eAdj) {} + SfxEnumItem(SDRATTR_TEXT_HORZADJUST, eAdj) {} virtual SdrTextHorzAdjustItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index 38ec15a2b851..bc867b4dc410 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -78,8 +78,9 @@ enum class SdrTextAniKind { class SVXCORE_DLLPUBLIC SdrTextAniKindItem final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrTextAniKindItem) SdrTextAniKindItem(SdrTextAniKind eKind=SdrTextAniKind::NONE) - : SfxEnumItem(SDRATTR_TEXT_ANIKIND, SfxItemType::SdrTextAniKindItemType, eKind) {} + : SfxEnumItem(SDRATTR_TEXT_ANIKIND, eKind) {} virtual SdrTextAniKindItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 5; } diff --git a/include/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx index f20e2c8e1af9..fdd8157ca132 100644 --- a/include/svx/sdtayitm.hxx +++ b/include/svx/sdtayitm.hxx @@ -25,7 +25,8 @@ class SVXCORE_DLLPUBLIC SdrTextAniDelayItem final : public SfxUInt16Item { public: - SdrTextAniDelayItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY, nVal, SfxItemType::SdrTextAniDelayItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrTextAniDelayItem) + SdrTextAniDelayItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY, nVal) {} virtual SdrTextAniDelayItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx index 2fe5427c55bc..8b9767c7836f 100644 --- a/include/svx/sdtfchim.hxx +++ b/include/svx/sdtfchim.hxx @@ -26,7 +26,7 @@ class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrTextFixedCellHeightItem final : public SfxBoolItem { public: - + DECLARE_ITEM_TYPE_FUNCTION(SdrTextFixedCellHeightItem) SdrTextFixedCellHeightItem( bool bUseFixedCellHeight = false ); SVX_DLLPRIVATE virtual bool GetPresentation(SfxItemPresentation ePresentation, diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index c61349d5352d..3b4dba561f65 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -35,8 +35,9 @@ class SVXCORE_DLLPUBLIC SdrTextFitToSizeTypeItem final { public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SdrTextFitToSizeTypeItem) SdrTextFitToSizeTypeItem(css::drawing::TextFitToSizeType const eFit = css::drawing::TextFitToSizeType_NONE) - : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE, SfxItemType::SdrTextFitToSizeTypeItemType, eFit) + : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE, eFit) { } diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx index 08884c3404d2..756d9ba2387a 100644 --- a/include/svx/sdynitm.hxx +++ b/include/svx/sdynitm.hxx @@ -29,8 +29,9 @@ //-------------------------------------------------- ---------- class SVXCORE_DLLPUBLIC SdrYesNoItem: public SfxBoolItem { public: - SdrYesNoItem(TypedWhichId nId, bool bOn, SfxItemType eItemType = SfxItemType::SdrYesNoItemType) - : SfxBoolItem(nId, bOn, eItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrYesNoItem) + SdrYesNoItem(TypedWhichId nId, bool bOn) + : SfxBoolItem(nId, bOn) {} virtual SdrYesNoItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual OUString GetValueTextByVal(bool bVal) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; diff --git a/include/svx/statusitem.hxx b/include/svx/statusitem.hxx index 1a78fe677d0f..d47ff2e91ccc 100644 --- a/include/svx/statusitem.hxx +++ b/include/svx/statusitem.hxx @@ -29,6 +29,7 @@ private: StatusCategory m_eCategory; public: + DECLARE_ITEM_TYPE_FUNCTION(SvxStatusItem) SvxStatusItem(TypedWhichId nWhich, const OUString& rString, StatusCategory eStatusCategory); diff --git a/include/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx index c749b7eab112..bd46e04eeff0 100644 --- a/include/svx/svx3ditems.hxx +++ b/include/svx/svx3ditems.hxx @@ -63,12 +63,14 @@ inline SfxBoolItem makeSvx3DDoubleSidedItem(bool bVal) { // Added extra Item (Bool) for chart2 to be able to show reduced line geometry class Svx3DReducedLineGeometryItem final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(Svx3DReducedLineGeometryItem) Svx3DReducedLineGeometryItem(bool bVal = false); Svx3DReducedLineGeometryItem* Clone(SfxItemPool * = nullptr) const override; }; class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DNormalsKindItem final : public SfxUInt16Item { public: + DECLARE_ITEM_TYPE_FUNCTION(Svx3DNormalsKindItem) Svx3DNormalsKindItem(sal_uInt16 nVal = 0); // use drawing::NormalsKind @@ -83,6 +85,7 @@ inline SfxBoolItem makeSvx3DNormalsInvertItem(bool bVal) { class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DTextureProjectionXItem final : public SfxUInt16Item { public: + DECLARE_ITEM_TYPE_FUNCTION(Svx3DTextureProjectionXItem) Svx3DTextureProjectionXItem(sal_uInt16 nVal = 0); // use drawing::TextureProjectionMode @@ -93,6 +96,7 @@ public: class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DTextureProjectionYItem final : public SfxUInt16Item { public: + DECLARE_ITEM_TYPE_FUNCTION(Svx3DTextureProjectionYItem) Svx3DTextureProjectionYItem(sal_uInt16 nVal = 0); // use drawing::TextureProjectionMode @@ -119,6 +123,7 @@ inline SfxUInt16Item makeSvx3DMaterialSpecularIntensityItem(sal_uInt16 nVal) { class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DTextureKindItem final : public SfxUInt16Item { public: + DECLARE_ITEM_TYPE_FUNCTION(Svx3DTextureKindItem) Svx3DTextureKindItem(sal_uInt16 nVal = 2); // use drawing::TextureKind2 @@ -129,6 +134,7 @@ public: class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DTextureModeItem final : public SfxUInt16Item { public: + DECLARE_ITEM_TYPE_FUNCTION(Svx3DTextureModeItem) Svx3DTextureModeItem(sal_uInt16 nVal = 2); // use drawing:TextureMode @@ -144,6 +150,7 @@ inline SfxBoolItem makeSvx3DTextureFilterItem(bool bVal) { // Svx3D _3DSCENE_ Items class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DPerspectiveItem final : public SfxUInt16Item { public: + DECLARE_ITEM_TYPE_FUNCTION(Svx3DPerspectiveItem) Svx3DPerspectiveItem(ProjectionType nVal = ProjectionType::Perspective); // use drawing::ProjectionMode @@ -270,6 +277,7 @@ inline SfxUInt16Item makeSvx3DShadowSlantItem(sal_uInt16 nVal) { class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DShadeModeItem final : public SfxUInt16Item { public: + DECLARE_ITEM_TYPE_FUNCTION(Svx3DShadeModeItem) Svx3DShadeModeItem(sal_uInt16 nVal = 2); // use drawing::ShadeMode @@ -282,6 +290,7 @@ public: // #107245# Item to replace bExtrudeSmoothed and bLatheSmoothed class Svx3DSmoothNormalsItem final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(Svx3DSmoothNormalsItem) Svx3DSmoothNormalsItem(bool bVal = true); Svx3DSmoothNormalsItem* Clone(SfxItemPool * = nullptr) const override; }; @@ -289,6 +298,7 @@ public: // #107245# Item to replace bExtrudeSmoothFrontBack and bLatheSmoothFrontBack class Svx3DSmoothLidsItem final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(Svx3DSmoothLidsItem) Svx3DSmoothLidsItem(bool bVal = false); Svx3DSmoothLidsItem* Clone(SfxItemPool * = nullptr) const override; }; @@ -296,6 +306,7 @@ public: // #107245# Item to replace bExtrudeCharacterMode and bLatheCharacterMode class Svx3DCharacterModeItem final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(Svx3DCharacterModeItem) Svx3DCharacterModeItem(bool bVal = false); Svx3DCharacterModeItem* Clone(SfxItemPool * = nullptr) const override; }; @@ -303,6 +314,7 @@ public: // #107245# Item to replace bExtrudeCloseFront and bLatheCloseFront class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DCloseFrontItem final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(Svx3DCloseFrontItem) Svx3DCloseFrontItem(bool bVal = true); Svx3DCloseFrontItem* Clone(SfxItemPool * = nullptr) const override; }; @@ -310,6 +322,7 @@ public: // #107245# Item to replace bExtrudeCloseBack and bLatheCloseBack class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DCloseBackItem final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(Svx3DCloseBackItem) Svx3DCloseBackItem(bool bVal = true); Svx3DCloseBackItem* Clone(SfxItemPool * = nullptr) const override; }; diff --git a/include/svx/svxgraphicitem.hxx b/include/svx/svxgraphicitem.hxx index 6d78b0980baa..d8a618c451ec 100644 --- a/include/svx/svxgraphicitem.hxx +++ b/include/svx/svxgraphicitem.hxx @@ -29,6 +29,7 @@ class SVX_DLLPUBLIC SvxGraphicItem final : public SfxPoolItem Graphic aGraphic; public: + DECLARE_ITEM_TYPE_FUNCTION(SvxGraphicItem) SvxGraphicItem( Graphic aGraphic); virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index 064de9ff9ece..ec9335c498b9 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -32,8 +32,9 @@ enum class SdrCaptionEscDir { Horizontal, Vertical, BestFit }; class SVXCORE_DLLPUBLIC SdrCaptionEscDirItem final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrCaptionEscDirItem) SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SdrCaptionEscDir::Horizontal) - : SfxEnumItem(SDRATTR_CAPTIONESCDIR, SfxItemType::SdrCaptionEscDirItemType, eDir) {} + : SfxEnumItem(SDRATTR_CAPTIONESCDIR, eDir) {} SAL_DLLPRIVATE virtual SdrCaptionEscDirItem* Clone(SfxItemPool* pPool=nullptr) const override; SAL_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; // { return 3; } @@ -49,7 +50,8 @@ public: class SVXCORE_DLLPUBLIC SdrCaptionEscIsRelItem final : public SdrYesNoItem { public: - SdrCaptionEscIsRelItem(bool bRel=true): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel, SfxItemType::SdrCaptionEscIsRelItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrCaptionEscIsRelItem) + SdrCaptionEscIsRelItem(bool bRel=true): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {} virtual ~SdrCaptionEscIsRelItem() override; virtual SdrCaptionEscIsRelItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -68,7 +70,8 @@ public: class SVXCORE_DLLPUBLIC SdrCaptionEscRelItem final : public SfxInt32Item { public: - SdrCaptionEscRelItem(sal_Int32 nEscRel=5000): SfxInt32Item(SDRATTR_CAPTIONESCREL, nEscRel, SfxItemType::SdrCaptionEscRelItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrCaptionEscRelItem) + SdrCaptionEscRelItem(sal_Int32 nEscRel=5000): SfxInt32Item(SDRATTR_CAPTIONESCREL, nEscRel) {} virtual ~SdrCaptionEscRelItem() override; virtual SdrCaptionEscRelItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -87,7 +90,8 @@ public: class SdrCaptionEscAbsItem final : public SdrMetricItem { public: - SdrCaptionEscAbsItem(tools::Long nEscAbs=0): SdrMetricItem(SDRATTR_CAPTIONESCABS, nEscAbs, SfxItemType::SdrCaptionEscAbsItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrCaptionEscAbsItem) + SdrCaptionEscAbsItem(tools::Long nEscAbs=0): SdrMetricItem(SDRATTR_CAPTIONESCABS, nEscAbs) {} virtual SdrCaptionEscAbsItem* Clone(SfxItemPool*) const override { return new SdrCaptionEscAbsItem(*this); diff --git a/include/svx/sxcgitm.hxx b/include/svx/sxcgitm.hxx index cb2cd2f465ab..72cf407d3388 100644 --- a/include/svx/sxcgitm.hxx +++ b/include/svx/sxcgitm.hxx @@ -29,8 +29,9 @@ class SdrCaptionGapItem final : public SdrMetricItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrCaptionGapItem) SdrCaptionGapItem(tools::Long nGap = 0) - : SdrMetricItem(SDRATTR_CAPTIONGAP, nGap, SfxItemType::SdrCaptionGapItemType) + : SdrMetricItem(SDRATTR_CAPTIONGAP, nGap) { } virtual SdrCaptionGapItem* Clone(SfxItemPool*) const override diff --git a/include/svx/sxcllitm.hxx b/include/svx/sxcllitm.hxx index 00ebe20ddfe4..5a2badc2f9dd 100644 --- a/include/svx/sxcllitm.hxx +++ b/include/svx/sxcllitm.hxx @@ -30,7 +30,8 @@ */ class SVXCORE_DLLPUBLIC SdrCaptionLineLenItem final : public SdrMetricItem { public: - SdrCaptionLineLenItem(tools::Long nLineLen=0): SdrMetricItem(SDRATTR_CAPTIONLINELEN,nLineLen, SfxItemType::SdrCaptionLineLenItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrCaptionLineLenItem) + SdrCaptionLineLenItem(tools::Long nLineLen=0): SdrMetricItem(SDRATTR_CAPTIONLINELEN,nLineLen) {} virtual ~SdrCaptionLineLenItem() override; virtual SdrCaptionLineLenItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -46,7 +47,8 @@ public: */ class SVXCORE_DLLPUBLIC SdrCaptionFitLineLenItem final : public SdrYesNoItem { public: - SdrCaptionFitLineLenItem(bool bBestFit=true): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit, SfxItemType::SdrCaptionFitLineLenItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrCaptionFitLineLenItem) + SdrCaptionFitLineLenItem(bool bBestFit=true): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {} virtual ~SdrCaptionFitLineLenItem() override; virtual SdrCaptionFitLineLenItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx index 5872f079b34e..9cde9ca99a05 100644 --- a/include/svx/sxctitm.hxx +++ b/include/svx/sxctitm.hxx @@ -29,8 +29,9 @@ enum class SdrCaptionType { Type1, Type2, Type3, Type4 }; class SVXCORE_DLLPUBLIC SdrCaptionTypeItem final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrCaptionTypeItem) SdrCaptionTypeItem(SdrCaptionType eStyle=SdrCaptionType::Type3) - : SfxEnumItem(SDRATTR_CAPTIONTYPE, SfxItemType::SdrCaptionTypeItemType, eStyle) {} + : SfxEnumItem(SDRATTR_CAPTIONTYPE, eStyle) {} SAL_DLLPRIVATE virtual SdrCaptionTypeItem* Clone(SfxItemPool* pPool=nullptr) const override; SAL_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; // { return 4; } SAL_DLLPRIVATE static OUString GetValueTextByPos(sal_uInt16 nPos); diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index 7aa6bdb6f55b..df6be79f8a5f 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -30,8 +30,9 @@ enum class SdrEdgeKind class SVXCORE_DLLPUBLIC SdrEdgeKindItem final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrEdgeKindItem) SdrEdgeKindItem(SdrEdgeKind eStyle=SdrEdgeKind::OrthoLines) - : SfxEnumItem(SDRATTR_EDGEKIND, SfxItemType::SdrEdgeKindItemType, eStyle) {} + : SfxEnumItem(SDRATTR_EDGEKIND, eStyle) {} SAL_DLLPRIVATE virtual SdrEdgeKindItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 5; } SAL_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/sxelditm.hxx b/include/svx/sxelditm.hxx index bd8d4fca2353..12c98d1670fb 100644 --- a/include/svx/sxelditm.hxx +++ b/include/svx/sxelditm.hxx @@ -24,13 +24,13 @@ class SAL_DLLPUBLIC_RTTI SdrEdgeLineDeltaCountItem final : public SfxUInt16Item { + DECLARE_ITEM_TYPE_FUNCTION(SdrEdgeLineDeltaCountItem) SdrEdgeLineDeltaCountItem(SdrEdgeLineDeltaCountItem const&) = default; void operator=(SdrEdgeLineDeltaCountItem const&) = delete; public: SdrEdgeLineDeltaCountItem(sal_uInt16 nVal = 0) - : SfxUInt16Item(SDRATTR_EDGELINEDELTACOUNT, nVal, - SfxItemType::SdrEdgeLineDeltaCountItemType) + : SfxUInt16Item(SDRATTR_EDGELINEDELTACOUNT, nVal) { } virtual ~SdrEdgeLineDeltaCountItem() override; diff --git a/include/svx/sxenditm.hxx b/include/svx/sxenditm.hxx index c678b51b06dd..bd30cfb1a6b7 100644 --- a/include/svx/sxenditm.hxx +++ b/include/svx/sxenditm.hxx @@ -25,7 +25,8 @@ class SVXCORE_DLLPUBLIC SdrEdgeNode1HorzDistItem final : public SdrMetricItem { public: - SdrEdgeNode1HorzDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST, nVal, SfxItemType::SdrEdgeNode1HorzDistItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrEdgeNode1HorzDistItem) + SdrEdgeNode1HorzDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST, nVal) {} SAL_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SAL_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; SAL_DLLPRIVATE virtual SdrEdgeNode1HorzDistItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -33,7 +34,8 @@ public: class SVXCORE_DLLPUBLIC SdrEdgeNode1VertDistItem final : public SdrMetricItem { public: - SdrEdgeNode1VertDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST, nVal, SfxItemType::SdrEdgeNode1VertDistItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrEdgeNode1VertDistItem) + SdrEdgeNode1VertDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST, nVal) {} SAL_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SAL_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; SAL_DLLPRIVATE virtual SdrEdgeNode1VertDistItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -41,7 +43,8 @@ public: class SVXCORE_DLLPUBLIC SdrEdgeNode2HorzDistItem final : public SdrMetricItem { public: - SdrEdgeNode2HorzDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST, nVal, SfxItemType::SdrEdgeNode2HorzDistItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrEdgeNode2HorzDistItem) + SdrEdgeNode2HorzDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST, nVal) {} SAL_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SAL_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; SAL_DLLPRIVATE virtual SdrEdgeNode2HorzDistItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -49,7 +52,8 @@ public: class SVXCORE_DLLPUBLIC SdrEdgeNode2VertDistItem final : public SdrMetricItem { public: - SdrEdgeNode2VertDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST, nVal, SfxItemType::SdrEdgeNode2VertDistItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrEdgeNode2VertDistItem) + SdrEdgeNode2VertDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST, nVal) {} SAL_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SAL_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; SAL_DLLPRIVATE virtual SdrEdgeNode2VertDistItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -57,15 +61,17 @@ public: class SdrEdgeNode1GlueDistItem final : public SdrMetricItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrEdgeNode1GlueDistItem) SdrEdgeNode1GlueDistItem(tools::Long nVal=0) - : SdrMetricItem(SDRATTR_EDGENODE1GLUEDIST, nVal, SfxItemType::SdrEdgeNode1GlueDistItemType) {} + : SdrMetricItem(SDRATTR_EDGENODE1GLUEDIST, nVal) {} virtual SdrEdgeNode1GlueDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SdrEdgeNode2GlueDistItem final : public SdrMetricItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrEdgeNode2GlueDistItem) SdrEdgeNode2GlueDistItem(tools::Long nVal=0) - : SdrMetricItem(SDRATTR_EDGENODE2GLUEDIST, nVal, SfxItemType::SdrEdgeNode2GlueDistItemType) {} + : SdrMetricItem(SDRATTR_EDGENODE2GLUEDIST, nVal) {} virtual SdrEdgeNode2GlueDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; diff --git a/include/svx/sxmbritm.hxx b/include/svx/sxmbritm.hxx index 5cdc6e69f3eb..7b828842fff1 100644 --- a/include/svx/sxmbritm.hxx +++ b/include/svx/sxmbritm.hxx @@ -31,7 +31,8 @@ // (SdrMeasureLineDistItem) over the reference edge class SVXCORE_DLLPUBLIC SdrMeasureBelowRefEdgeItem final : public SdrYesNoItem { public: - SdrMeasureBelowRefEdgeItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASUREBELOWREFEDGE,bOn, SfxItemType::SdrMeasureBelowRefEdgeItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrMeasureBelowRefEdgeItem) + SdrMeasureBelowRefEdgeItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASUREBELOWREFEDGE,bOn) {} virtual ~SdrMeasureBelowRefEdgeItem() override; virtual SdrMeasureBelowRefEdgeItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sxmtfitm.hxx b/include/svx/sxmtfitm.hxx index 1100a0948f16..194baa84f061 100644 --- a/include/svx/sxmtfitm.hxx +++ b/include/svx/sxmtfitm.hxx @@ -29,7 +29,8 @@ // Abrogate TextUpsideDown, TextRota90 and TextAutoAngle. (n.i.) class SdrMeasureTextIsFixedAngleItem final : public SdrYesNoItem { public: - SdrMeasureTextIsFixedAngleItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTISFIXEDANGLE,bOn, SfxItemType::SdrMeasureTextIsFixedAngleItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrMeasureTextIsFixedAngleItem) + SdrMeasureTextIsFixedAngleItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTISFIXEDANGLE,bOn) {} virtual ~SdrMeasureTextIsFixedAngleItem() override; virtual SdrMeasureTextIsFixedAngleItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -42,8 +43,9 @@ public: //Angle of the text in 1/100deg. 0=horizontal; read from left to right. (n.i.) class SdrMeasureTextFixedAngleItem final : public SdrAngleItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrMeasureTextFixedAngleItem) SdrMeasureTextFixedAngleItem(Degree100 nVal=0_deg100) - : SdrAngleItem(SDRATTR_MEASURETEXTFIXEDANGLE,nVal, SfxItemType::SdrMeasureTextFixedAngleItemType) {} + : SdrAngleItem(SDRATTR_MEASURETEXTFIXEDANGLE,nVal) {} virtual ~SdrMeasureTextFixedAngleItem() override; virtual SdrMeasureTextFixedAngleItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -56,8 +58,9 @@ public: // The decimal places used for the measure value class SVXCORE_DLLPUBLIC SdrMeasureDecimalPlacesItem final : public SfxInt16Item { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrMeasureDecimalPlacesItem) SdrMeasureDecimalPlacesItem(sal_Int16 nVal=2) - : SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES, nVal, SfxItemType::SdrMeasureDecimalPlacesItemType) {} + : SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES, nVal) {} virtual ~SdrMeasureDecimalPlacesItem() override; virtual SdrMeasureDecimalPlacesItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index 3cb963ca5b7e..ac483bd16ce2 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -27,8 +27,9 @@ class SVXCORE_DLLPUBLIC SdrMeasureTextHPosItem final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrMeasureTextHPosItem) SdrMeasureTextHPosItem(css::drawing::MeasureTextHorzPos ePos = css::drawing::MeasureTextHorzPos::MeasureTextHorzPos_AUTO) - : SfxEnumItem(SDRATTR_MEASURETEXTHPOS, SfxItemType::SdrMeasureTextHPosItemType, ePos) + : SfxEnumItem(SDRATTR_MEASURETEXTHPOS, ePos) { } SAL_DLLPRIVATE virtual SdrMeasureTextHPosItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -43,8 +44,9 @@ public: class SVXCORE_DLLPUBLIC SdrMeasureTextVPosItem final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrMeasureTextVPosItem) SdrMeasureTextVPosItem(css::drawing::MeasureTextVertPos ePos = css::drawing::MeasureTextVertPos_AUTO) - : SfxEnumItem(SDRATTR_MEASURETEXTVPOS, SfxItemType::SdrMeasureTextVPosItemType, ePos) + : SfxEnumItem(SDRATTR_MEASURETEXTVPOS, ePos) { } SAL_DLLPRIVATE virtual SdrMeasureTextVPosItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sxmtritm.hxx b/include/svx/sxmtritm.hxx index 3f0c3579a625..4c4e6d928070 100644 --- a/include/svx/sxmtritm.hxx +++ b/include/svx/sxmtritm.hxx @@ -25,7 +25,8 @@ // text across the dimension line (90deg counter-clockwise rotation) class SVXCORE_DLLPUBLIC SdrMeasureTextRota90Item final : public SdrYesNoItem { public: - SdrMeasureTextRota90Item(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTROTA90,bOn, SfxItemType::SdrMeasureTextRota90ItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrMeasureTextRota90Item) + SdrMeasureTextRota90Item(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTROTA90,bOn) {} virtual ~SdrMeasureTextRota90Item() override; virtual SdrMeasureTextRota90Item* Clone(SfxItemPool* pPool=nullptr) const override; @@ -39,7 +40,8 @@ public: // Text is also switched to the other side of the dimension line, if not Rota90 class SdrMeasureTextUpsideDownItem final : public SdrYesNoItem { public: - SdrMeasureTextUpsideDownItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTUPSIDEDOWN,bOn, SfxItemType::SdrMeasureTextUpsideDownItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(SdrMeasureTextUpsideDownItem) + SdrMeasureTextUpsideDownItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTUPSIDEDOWN,bOn) {} virtual ~SdrMeasureTextUpsideDownItem() override; virtual SdrMeasureTextUpsideDownItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index d409f2973ad2..3aab0c799c27 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -28,8 +28,9 @@ // (based on the facts of the MapUnit of the model). This unity is displayed if necessary. class SVXCORE_DLLPUBLIC SdrMeasureUnitItem final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdrMeasureUnitItem) SdrMeasureUnitItem(FieldUnit eUnit=FieldUnit::NONE) - : SfxEnumItem(SDRATTR_MEASUREUNIT, SfxItemType::SdrMeasureUnitItemType, eUnit) {} + : SfxEnumItem(SDRATTR_MEASUREUNIT, eUnit) {} SAL_DLLPRIVATE virtual SdrMeasureUnitItem* Clone(SfxItemPool* pPool=nullptr) const override; SAL_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; // { return 14; } diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx index 495443c85c10..e0d45f78b4f9 100644 --- a/include/svx/viewlayoutitem.hxx +++ b/include/svx/viewlayoutitem.hxx @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC SvxViewLayoutItem final : public SfxUInt16Item public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SvxViewLayoutItem) SvxViewLayoutItem( sal_uInt16 nColumns = 0, bool bBookMode = false, TypedWhichId nWhich = SID_ATTR_VIEWLAYOUT ); SvxViewLayoutItem( const SvxViewLayoutItem& ); virtual ~SvxViewLayoutItem() override; diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index 151ad52c662e..0201c7a9730e 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -35,7 +35,8 @@ private: public: static SfxPoolItem* CreateDefault(); - XFillBitmapItem() : NameOrIndex(XATTR_FILLBITMAP, -1, SfxItemType::XFillBitmapItemType ) {} + DECLARE_ITEM_TYPE_FUNCTION(XFillBitmapItem) + XFillBitmapItem() : NameOrIndex(XATTR_FILLBITMAP, -1 ) {} XFillBitmapItem(const OUString& rName, const GraphicObject& rGraphicObject); XFillBitmapItem( const GraphicObject& rGraphicObject ); XFillBitmapItem( const XFillBitmapItem& rItem ); diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx index abb38c6d8b4c..7336d0bc62a2 100644 --- a/include/svx/xcolit.hxx +++ b/include/svx/xcolit.hxx @@ -33,10 +33,11 @@ class SVXCORE_DLLPUBLIC XColorItem : public NameOrIndex public: static SfxPoolItem* CreateDefault(); - XColorItem(SfxItemType eItemType = SfxItemType::XColorItemType) : NameOrIndex(eItemType) {} - XColorItem(TypedWhichId nWhich, sal_Int32 nIndex, const Color& rTheColor, SfxItemType eItemType = SfxItemType::XColorItemType); - XColorItem(TypedWhichId nWhich, const Color& rTheColor, SfxItemType eItemType = SfxItemType::XColorItemType); - XColorItem(TypedWhichId nWhich, const OUString& rName, const Color& rTheColor, SfxItemType eItemType = SfxItemType::XColorItemType); + DECLARE_ITEM_TYPE_FUNCTION(XColorItem) + XColorItem() : NameOrIndex() {} + XColorItem(TypedWhichId nWhich, sal_Int32 nIndex, const Color& rTheColor); + XColorItem(TypedWhichId nWhich, const Color& rTheColor); + XColorItem(TypedWhichId nWhich, const OUString& rName, const Color& rTheColor); XColorItem(const XColorItem& rItem); virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx index 9f7cf907924e..5afefbe3ab12 100644 --- a/include/svx/xfillit0.hxx +++ b/include/svx/xfillit0.hxx @@ -33,6 +33,7 @@ class SVXCORE_DLLPUBLIC XFillStyleItem final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(XFillBmpPosItem) XFillBmpPosItem( RectPoint eRP = RectPoint::MM ); SVX_DLLPRIVATE virtual XFillBmpPosItem* Clone( SfxItemPool* pPool = nullptr ) const override; diff --git a/include/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx index 9fb283bab5ff..73200736a0ce 100644 --- a/include/svx/xflbmsli.hxx +++ b/include/svx/xflbmsli.hxx @@ -26,6 +26,7 @@ class SVXCORE_DLLPUBLIC XFillBmpSizeLogItem final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(XFillBmpSizeLogItem) XFillBmpSizeLogItem( bool bLog = true ); SVX_DLLPRIVATE virtual XFillBmpSizeLogItem* Clone( SfxItemPool* pPool = nullptr ) const override; diff --git a/include/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx index 76611d3bd56a..bb5375a42c5d 100644 --- a/include/svx/xflbmsxy.hxx +++ b/include/svx/xflbmsxy.hxx @@ -26,6 +26,7 @@ class SVXCORE_DLLPUBLIC XFillBmpSizeXItem final : public SfxMetricItem { public: + DECLARE_ITEM_TYPE_FUNCTION(XFillBmpSizeXItem) XFillBmpSizeXItem( tools::Long nSizeX = 0 ); SVX_DLLPRIVATE virtual XFillBmpSizeXItem* Clone( SfxItemPool* pPool = nullptr ) const override; @@ -42,6 +43,7 @@ public: class SVXCORE_DLLPUBLIC XFillBmpSizeYItem final : public SfxMetricItem { public: + DECLARE_ITEM_TYPE_FUNCTION(XFillBmpSizeYItem) XFillBmpSizeYItem( tools::Long nSizeY = 0 ); SVX_DLLPRIVATE virtual XFillBmpSizeYItem* Clone( SfxItemPool* pPool = nullptr ) const override; diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx index ab92eca975a5..ba2331e16242 100644 --- a/include/svx/xflbmtit.hxx +++ b/include/svx/xflbmtit.hxx @@ -26,6 +26,7 @@ class SVXCORE_DLLPUBLIC XFillBmpTileItem final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(XFillBmpTileItem) XFillBmpTileItem( bool bTile = true ); virtual XFillBmpTileItem* Clone( SfxItemPool* pPool = nullptr ) const override; diff --git a/include/svx/xflboxy.hxx b/include/svx/xflboxy.hxx index acc8fb7fdea7..75532d9a8d3e 100644 --- a/include/svx/xflboxy.hxx +++ b/include/svx/xflboxy.hxx @@ -26,6 +26,7 @@ class SVXCORE_DLLPUBLIC XFillBmpPosOffsetXItem final : public SfxInt32Item { public: + DECLARE_ITEM_TYPE_FUNCTION(XFillBmpPosOffsetXItem) XFillBmpPosOffsetXItem( sal_Int32 nOffPosX = 0 ); SVX_DLLPRIVATE virtual XFillBmpPosOffsetXItem* Clone( SfxItemPool* pPool = nullptr ) const override; @@ -39,6 +40,7 @@ public: class SVXCORE_DLLPUBLIC XFillBmpPosOffsetYItem final : public SfxInt32Item { public: + DECLARE_ITEM_TYPE_FUNCTION(XFillBmpPosOffsetYItem) XFillBmpPosOffsetYItem( sal_Int32 nOffPosY = 0 ); SVX_DLLPRIVATE virtual XFillBmpPosOffsetYItem* Clone( SfxItemPool* pPool = nullptr ) const override; diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx index 3d3f3b28e4d1..6f167deb5803 100644 --- a/include/svx/xflbstit.hxx +++ b/include/svx/xflbstit.hxx @@ -26,6 +26,7 @@ class SVXCORE_DLLPUBLIC XFillBmpStretchItem final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(XFillBmpStretchItem) XFillBmpStretchItem( bool bStretch = true ); virtual XFillBmpStretchItem* Clone( SfxItemPool* pPool = nullptr ) const override; diff --git a/include/svx/xflbtoxy.hxx b/include/svx/xflbtoxy.hxx index b561ab775300..61cd72cef552 100644 --- a/include/svx/xflbtoxy.hxx +++ b/include/svx/xflbtoxy.hxx @@ -26,6 +26,7 @@ class SVXCORE_DLLPUBLIC XFillBmpTileOffsetXItem final : public SfxUInt16Item { public: + DECLARE_ITEM_TYPE_FUNCTION(XFillBmpTileOffsetXItem) XFillBmpTileOffsetXItem( sal_uInt16 nOffX = 0 ); SVX_DLLPRIVATE virtual XFillBmpTileOffsetXItem* Clone( SfxItemPool* pPool = nullptr ) const override; @@ -39,6 +40,7 @@ public: class SVXCORE_DLLPUBLIC XFillBmpTileOffsetYItem final : public SfxUInt16Item { public: + DECLARE_ITEM_TYPE_FUNCTION(XFillBmpTileOffsetYItem) XFillBmpTileOffsetYItem( sal_uInt16 nOffX = 0 ); SVX_DLLPRIVATE virtual XFillBmpTileOffsetYItem* Clone( SfxItemPool* pPool = nullptr ) const override; diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx index dc38c9393450..ea2908e6ee71 100644 --- a/include/svx/xflclit.hxx +++ b/include/svx/xflclit.hxx @@ -33,7 +33,8 @@ class SVXCORE_DLLPUBLIC XFillColorItem final : public XColorItem { public: static SfxPoolItem* CreateDefault(); - XFillColorItem() : XColorItem(SfxItemType::XFillColorItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(XFillColorItem) + XFillColorItem() : XColorItem() {} XFillColorItem(sal_Int32 nIndex, const Color& rTheColor); XFillColorItem(const OUString& rName, const Color& rTheColor); diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index f7909b14586a..44c1d3f0ba08 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -36,6 +36,7 @@ private: public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(XFillFloatTransparenceItem) XFillFloatTransparenceItem(); XFillFloatTransparenceItem(const OUString& rName, const basegfx::BGradient& rGradient, bool bEnable = true ); XFillFloatTransparenceItem( const basegfx::BGradient& rTheGradient, bool bEnable = true ); diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx index 90d5bb3eabef..8b79a85accbc 100644 --- a/include/svx/xflgrit.hxx +++ b/include/svx/xflgrit.hxx @@ -34,20 +34,17 @@ class SVXCORE_DLLPUBLIC XFillGradientItem : public NameOrIndex public: static SfxPoolItem* CreateDefault(); - XFillGradientItem(TypedWhichId nWhich = XATTR_FILLGRADIENT, - SfxItemType eItemType = SfxItemType::XFillGradientItemType) - : NameOrIndex(nWhich, -1, eItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(XFillGradientItem) + XFillGradientItem(TypedWhichId nWhich = XATTR_FILLGRADIENT) + : NameOrIndex(nWhich, -1) {} XFillGradientItem(sal_Int32 nIndex, const basegfx::BGradient& rTheGradient, - TypedWhichId nWhich = XATTR_FILLGRADIENT, - SfxItemType eItemType = SfxItemType::XFillGradientItemType); + TypedWhichId nWhich = XATTR_FILLGRADIENT); XFillGradientItem(const OUString& rName, const basegfx::BGradient& rTheGradient, - TypedWhichId nWhich = XATTR_FILLGRADIENT, - SfxItemType eItemType = SfxItemType::XFillGradientItemType); + TypedWhichId nWhich = XATTR_FILLGRADIENT); XFillGradientItem(const basegfx::BGradient& rTheGradient, - TypedWhichId nWhich = XATTR_FILLGRADIENT, - SfxItemType eItemType = SfxItemType::XFillGradientItemType); + TypedWhichId nWhich = XATTR_FILLGRADIENT); XFillGradientItem(const XFillGradientItem& rItem); virtual bool operator==(const SfxPoolItem& rItem) const override; diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index 6084e042f9ea..7d0997e44275 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -35,7 +35,8 @@ class SVXCORE_DLLPUBLIC XFillHatchItem final : public NameOrIndex public: static SfxPoolItem* CreateDefault(); - XFillHatchItem() : NameOrIndex(XATTR_FILLHATCH, -1, SfxItemType::XFillHatchItemType) {} + DECLARE_ITEM_TYPE_FUNCTION(XFillHatchItem) + XFillHatchItem() : NameOrIndex(XATTR_FILLHATCH, -1) {} XFillHatchItem(const OUString& rName, const XHatch& rTheHatch); XFillHatchItem(const XHatch& rTheHatch); XFillHatchItem(const XFillHatchItem& rItem); diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx index 55128b4957ed..1f2a9b08052b 100644 --- a/include/svx/xfltrit.hxx +++ b/include/svx/xfltrit.hxx @@ -32,6 +32,7 @@ class SVXCORE_DLLPUBLIC XFillTransparenceItem final : public SfxUInt16Item { public: + DECLARE_ITEM_TYPE_FUNCTION(XFillTransparenceItem) XFillTransparenceItem(sal_uInt16 nFillTransparence = 0); virtual XFillTransparenceItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool GetPresentation( SfxItemPresentation ePres, diff --git a/include/svx/xftadit.hxx b/include/svx/xftadit.hxx index 27773a49db75..556deed23eb3 100644 --- a/include/svx/xftadit.hxx +++ b/include/svx/xftadit.hxx @@ -35,6 +35,7 @@ class SVXCORE_DLLPUBLIC XFormTextAdjustItem final : public SfxEnumItem nWhich, sal_Int32 nIndex, SfxItemType eItemType); - NameOrIndex(TypedWhichId nWhich, const OUString& rName, SfxItemType eItemType); + DECLARE_ITEM_TYPE_FUNCTION(NameOrIndex) + NameOrIndex() : SfxStringItem(0) { m_nPalIndex = -1; } + NameOrIndex(TypedWhichId nWhich, sal_Int32 nIndex); + NameOrIndex(TypedWhichId nWhich, const OUString& rName); NameOrIndex(const NameOrIndex& rNameOrIndex); virtual bool operator==(const SfxPoolItem& rItem) const override; diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx index ab8e26561e75..a0ad3e1ff5ea 100644 --- a/include/svx/xlineit0.hxx +++ b/include/svx/xlineit0.hxx @@ -30,6 +30,7 @@ class SVXCORE_DLLPUBLIC XLineStyleItem final : public SfxEnumItem nWhich = SID_ATTR_ZOOMSLIDER ); void AddSnappingPoint( sal_Int32 nNew ); diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 295034402e21..be3d78f4ce5e 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -60,6 +60,7 @@ class SC_DLLPUBLIC ScMergeAttr final : public SfxPoolItem SCCOL nColMerge; SCROW nRowMerge; public: + DECLARE_ITEM_TYPE_FUNCTION(ScMergeAttr) ScMergeAttr(); ScMergeAttr( SCCOL nCol, SCROW nRow ); ScMergeAttr( const ScMergeAttr& ); @@ -90,6 +91,7 @@ public: ScMergeFlagAttr(ScMF nFlags); virtual ~ScMergeFlagAttr() override; + DECLARE_ITEM_TYPE_FUNCTION(ScMergeFlagAttr) ScMergeFlagAttr(ScMergeFlagAttr const &) = default; ScMergeFlagAttr(ScMergeFlagAttr &&) = default; ScMergeFlagAttr & operator =(ScMergeFlagAttr const &) = delete; // due to SfxInt16Item @@ -123,6 +125,7 @@ class SC_DLLPUBLIC ScProtectionAttr final : public SfxPoolItem bool bHidePrint; ///< don't print cell public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(ScProtectionAttr) ScProtectionAttr(); ScProtectionAttr( bool bProtect, bool bHFormula = false, @@ -173,6 +176,7 @@ class SC_DLLPUBLIC ScPageHFItem final : public SfxPoolItem std::unique_ptr pRightArea; public: + DECLARE_ITEM_TYPE_FUNCTION(ScPageHFItem) ScPageHFItem( sal_uInt16 nWhich ); ScPageHFItem( const ScPageHFItem& rItem ); virtual ~ScPageHFItem() override; @@ -198,6 +202,7 @@ public: class SC_DLLPUBLIC ScViewObjectModeItem final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(ScViewObjectModeItem) ScViewObjectModeItem( sal_uInt16 nWhich ); ScViewObjectModeItem( sal_uInt16 nWhich, ScVObjMode eMode ); virtual ~ScViewObjectModeItem() override; @@ -226,6 +231,7 @@ class SC_DLLPUBLIC ScPageScaleToItem final : public SfxPoolItem { public: /** Default c'tor sets the width and height to 0. */ + DECLARE_ITEM_TYPE_FUNCTION(ScPageScaleToItem) explicit ScPageScaleToItem(); explicit ScPageScaleToItem( sal_uInt16 nWidth, sal_uInt16 nHeight ); @@ -268,6 +274,7 @@ typedef o3tl::sorted_vector ScCondFormatIndexes; class SAL_DLLPUBLIC_RTTI ScCondFormatItem final : public SfxPoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(ScCondFormatItem) explicit ScCondFormatItem(); explicit ScCondFormatItem(sal_uInt32 nIndex); explicit ScCondFormatItem(const ScCondFormatIndexes& ); @@ -289,6 +296,7 @@ private: class SC_DLLPUBLIC ScRotateValueItem final : public SdrAngleItem { public: + DECLARE_ITEM_TYPE_FUNCTION(ScRotateValueItem) ScRotateValueItem(Degree100 nAngle); virtual ScRotateValueItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -301,6 +309,7 @@ public: class SC_DLLPUBLIC ScShrinkToFitCell final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(ScShrinkToFitCell) ScShrinkToFitCell(bool bShrink = false); virtual ScShrinkToFitCell* Clone(SfxItemPool *pPool = nullptr) const override; virtual bool GetPresentation(SfxItemPresentation ePres, @@ -313,6 +322,7 @@ public: class SC_DLLPUBLIC ScVerticalStackCell final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(ScVerticalStackCell) ScVerticalStackCell(bool bStack = false); virtual ScVerticalStackCell* Clone(SfxItemPool *pPool = nullptr) const override; virtual bool GetPresentation(SfxItemPresentation ePres, @@ -325,6 +335,7 @@ public: class SC_DLLPUBLIC ScLineBreakCell final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(ScLineBreakCell) ScLineBreakCell(bool bLineBreak = false); virtual ScLineBreakCell* Clone(SfxItemPool *pPool = nullptr) const override; virtual bool GetPresentation(SfxItemPresentation ePres, @@ -337,6 +348,7 @@ public: class ScHyphenateCell final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(ScHyphenateCell) ScHyphenateCell(bool bHyphenate= false); virtual ScHyphenateCell* Clone(SfxItemPool *pPool = nullptr) const override; virtual bool GetPresentation(SfxItemPresentation ePres, @@ -349,6 +361,7 @@ public: class SC_DLLPUBLIC ScIndentItem final : public SfxUInt16Item { public: + DECLARE_ITEM_TYPE_FUNCTION(ScIndentItem) ScIndentItem(sal_uInt16 nIndent = 0); virtual ScIndentItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx index 6b6ace9523c5..094dc066ec74 100644 --- a/sc/inc/defaultsoptions.hxx +++ b/sc/inc/defaultsoptions.hxx @@ -44,6 +44,7 @@ public: class SC_DLLPUBLIC ScTpDefaultsItem final : public SfxPoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(ScTpDefaultsItem) ScTpDefaultsItem( ScDefaultsOptions aOpt ); virtual ~ScTpDefaultsItem() override; diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index 80c5654efeca..020c7c742ee8 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -135,6 +135,7 @@ public: const ScDocOptions& rOpt ); virtual ~ScTpCalcItem() override; + DECLARE_ITEM_TYPE_FUNCTION(ScTpCalcItem) ScTpCalcItem(ScTpCalcItem const &) = default; ScTpCalcItem(ScTpCalcItem &&) = default; ScTpCalcItem & operator =(ScTpCalcItem const &) = delete; // due to SfxPoolItem diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index 6cc1dedcbbb4..8adc26be5106 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -81,6 +81,7 @@ public: class SC_DLLPUBLIC ScTpFormulaItem final : public SfxPoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(ScTpFormulaItem) ScTpFormulaItem( ScFormulaOptions aOpt ); virtual ~ScTpFormulaItem() override; diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index f646a3548246..31a3593a9888 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -53,6 +53,7 @@ public: ScTpPrintItem( const ScPrintOptions& rOpt ); virtual ~ScTpPrintItem() override; + DECLARE_ITEM_TYPE_FUNCTION(ScTpPrintItem) ScTpPrintItem(ScTpPrintItem const &) = default; ScTpPrintItem(ScTpPrintItem &&) = default; ScTpPrintItem & operator =(ScTpPrintItem const &) = delete; // due to SfxPoolItem diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index 2b0a7ef725af..21c6b9f7f8fb 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -138,6 +138,7 @@ public: ScTpViewItem( const ScViewOptions& rOpt ); virtual ~ScTpViewItem() override; + DECLARE_ITEM_TYPE_FUNCTION(ScTpViewItem) ScTpViewItem(ScTpViewItem const &) = default; ScTpViewItem(ScTpViewItem &&) = default; ScTpViewItem & operator =(ScTpViewItem const &) = delete; // due to SfxPoolItem diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index 409f7aa0a6a0..21e7cb350756 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -80,19 +80,19 @@ bool ScHasPriority( const ::editeng::SvxBorderLine* pThis, const ::editeng::SvxB * Merge */ ScMergeAttr::ScMergeAttr(): - SfxPoolItem(ATTR_MERGE, SfxItemType::ScMergeAttrType), + SfxPoolItem(ATTR_MERGE), nColMerge(0), nRowMerge(0) {} ScMergeAttr::ScMergeAttr( SCCOL nCol, SCROW nRow): - SfxPoolItem(ATTR_MERGE, SfxItemType::ScMergeAttrType), + SfxPoolItem(ATTR_MERGE), nColMerge(nCol), nRowMerge(nRow) {} ScMergeAttr::ScMergeAttr(const ScMergeAttr& rItem): - SfxPoolItem(ATTR_MERGE, SfxItemType::ScMergeAttrType) + SfxPoolItem(ATTR_MERGE) { nColMerge = rItem.nColMerge; nRowMerge = rItem.nRowMerge; @@ -183,7 +183,7 @@ void ScMergeFlagAttr::dumpAsXml(xmlTextWriterPtr pWriter) const * Protection */ ScProtectionAttr::ScProtectionAttr(): - SfxPoolItem(ATTR_PROTECTION, SfxItemType::ScProtectionAttrType), + SfxPoolItem(ATTR_PROTECTION), bProtection(true), bHideFormula(false), bHideCell(false), @@ -193,7 +193,7 @@ ScProtectionAttr::ScProtectionAttr(): ScProtectionAttr::ScProtectionAttr( bool bProtect, bool bHFormula, bool bHCell, bool bHPrint): - SfxPoolItem(ATTR_PROTECTION, SfxItemType::ScProtectionAttrType), + SfxPoolItem(ATTR_PROTECTION), bProtection(bProtect), bHideFormula(bHFormula), bHideCell(bHCell), @@ -202,7 +202,7 @@ ScProtectionAttr::ScProtectionAttr( bool bProtect, bool bHFormula, } ScProtectionAttr::ScProtectionAttr(const ScProtectionAttr& rItem): - SfxPoolItem(ATTR_PROTECTION, SfxItemType::ScProtectionAttrType) + SfxPoolItem(ATTR_PROTECTION) { bProtection = rItem.bProtection; bHideFormula = rItem.bHideFormula; @@ -392,7 +392,7 @@ void ScProtectionAttr::dumpAsXml(xmlTextWriterPtr pWriter) const * ScPageHFItem - Dates from the Head and Foot lines */ ScPageHFItem::ScPageHFItem( sal_uInt16 nWhichP ) - : SfxPoolItem( nWhichP, SfxItemType::ScPageHFItemType ) + : SfxPoolItem( nWhichP ) { } @@ -518,12 +518,12 @@ void ScPageHFItem::dumpAsXml(xmlTextWriterPtr pWriter) const * ScViewObjectModeItem - Display Mode of View Objects */ ScViewObjectModeItem::ScViewObjectModeItem( sal_uInt16 nWhichP ) - : SfxEnumItem( nWhichP, SfxItemType::ScViewObjectModeItemType, VOBJ_MODE_SHOW ) + : SfxEnumItem( nWhichP, VOBJ_MODE_SHOW ) { } ScViewObjectModeItem::ScViewObjectModeItem( sal_uInt16 nWhichP, ScVObjMode eMode ) - : SfxEnumItem( nWhichP, SfxItemType::ScViewObjectModeItemType, eMode ) + : SfxEnumItem( nWhichP, eMode ) { } @@ -588,14 +588,14 @@ ScViewObjectModeItem* ScViewObjectModeItem::Clone( SfxItemPool* ) const } ScPageScaleToItem::ScPageScaleToItem() : - SfxPoolItem( ATTR_PAGE_SCALETO, SfxItemType::ScPageScaleToItemType ), + SfxPoolItem( ATTR_PAGE_SCALETO ), mnWidth( 0 ), mnHeight( 0 ) { } ScPageScaleToItem::ScPageScaleToItem( sal_uInt16 nWidth, sal_uInt16 nHeight ) : - SfxPoolItem( ATTR_PAGE_SCALETO, SfxItemType::ScPageScaleToItemType ), + SfxPoolItem( ATTR_PAGE_SCALETO ), mnWidth( nWidth ), mnHeight( nHeight ) { @@ -695,24 +695,24 @@ void ScPageScaleToItem::dumpAsXml(xmlTextWriterPtr pWriter) const } ScCondFormatItem::ScCondFormatItem(): - SfxPoolItem( ATTR_CONDITIONAL, SfxItemType::ScCondFormatItemType ) + SfxPoolItem( ATTR_CONDITIONAL ) { } ScCondFormatItem::ScCondFormatItem( sal_uInt32 nIndex ): - SfxPoolItem( ATTR_CONDITIONAL, SfxItemType::ScCondFormatItemType ) + SfxPoolItem( ATTR_CONDITIONAL ) { maIndex.insert(nIndex); } ScCondFormatItem::ScCondFormatItem( const ScCondFormatIndexes& rIndex ): - SfxPoolItem( ATTR_CONDITIONAL, SfxItemType::ScCondFormatItemType ), + SfxPoolItem( ATTR_CONDITIONAL ), maIndex( rIndex ) { } ScCondFormatItem::ScCondFormatItem( ScCondFormatIndexes&& aIndex ) noexcept: - SfxPoolItem( ATTR_CONDITIONAL, SfxItemType::ScCondFormatItemType ), + SfxPoolItem( ATTR_CONDITIONAL ), maIndex( std::move(aIndex) ) { } @@ -751,7 +751,7 @@ void ScCondFormatItem::dumpAsXml(xmlTextWriterPtr pWriter) const } ScRotateValueItem::ScRotateValueItem(Degree100 nAngle) - : SdrAngleItem(ATTR_ROTATE_VALUE, nAngle, SfxItemType::ScRotateValueItemType) + : SdrAngleItem(ATTR_ROTATE_VALUE, nAngle) { } @@ -772,7 +772,7 @@ bool ScRotateValueItem::GetPresentation(SfxItemPresentation ePresentation, } ScShrinkToFitCell::ScShrinkToFitCell(bool bShrink) - : SfxBoolItem(ATTR_SHRINKTOFIT, bShrink, SfxItemType::ScShrinkToFitCellType) + : SfxBoolItem(ATTR_SHRINKTOFIT, bShrink) { } @@ -792,7 +792,7 @@ bool ScShrinkToFitCell::GetPresentation(SfxItemPresentation, } ScVerticalStackCell::ScVerticalStackCell(bool bStack) - : SfxBoolItem(ATTR_STACKED, bStack, SfxItemType::ScVerticalStackCellType) + : SfxBoolItem(ATTR_STACKED, bStack) { } @@ -812,7 +812,7 @@ bool ScVerticalStackCell::GetPresentation(SfxItemPresentation, } ScLineBreakCell::ScLineBreakCell(bool bStack) - : SfxBoolItem(ATTR_LINEBREAK, bStack, SfxItemType::ScLineBreakCellType) + : SfxBoolItem(ATTR_LINEBREAK, bStack) { } @@ -832,7 +832,7 @@ bool ScLineBreakCell::GetPresentation(SfxItemPresentation, } ScHyphenateCell::ScHyphenateCell(bool bHyphenate) - : SfxBoolItem(ATTR_HYPHENATE, bHyphenate, SfxItemType::ScHyphenateCellType) + : SfxBoolItem(ATTR_HYPHENATE, bHyphenate) { } @@ -852,7 +852,7 @@ bool ScHyphenateCell::GetPresentation(SfxItemPresentation, } ScIndentItem::ScIndentItem(sal_uInt16 nIndent) - : SfxUInt16Item(ATTR_INDENT, nIndent, SfxItemType::ScIndentItemType) + : SfxUInt16Item(ATTR_INDENT, nIndent) { } diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx index 6436b7e9f910..098cc11e6230 100644 --- a/sc/source/core/tool/defaultsoptions.cxx +++ b/sc/source/core/tool/defaultsoptions.cxx @@ -40,7 +40,7 @@ bool ScDefaultsOptions::operator==( const ScDefaultsOptions& rOpt ) const } ScTpDefaultsItem::ScTpDefaultsItem( ScDefaultsOptions aOpt ) : - SfxPoolItem ( SID_SCDEFAULTSOPTIONS, SfxItemType::ScTpDefaultsItemType ), + SfxPoolItem ( SID_SCDEFAULTSOPTIONS ), theOptions (std::move( aOpt )) { } diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index bc6bc326a9b5..98c8bd7124d6 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.cxx @@ -106,7 +106,7 @@ void ScDocOptions::SetFormulaWildcardsEnabled( bool bVal ) // ScTpCalcItem - data for the CalcOptions TabPage ScTpCalcItem::ScTpCalcItem( sal_uInt16 nWhichP, const ScDocOptions& rOpt ) - : SfxPoolItem ( nWhichP, SfxItemType::ScTpCalcItemType ), + : SfxPoolItem ( nWhichP ), theOptions ( rOpt ) { } diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index a0eb6bafb835..4d3027002d27 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -127,7 +127,7 @@ bool ScFormulaOptions::operator!=( const ScFormulaOptions& rOpt ) const } ScTpFormulaItem::ScTpFormulaItem( ScFormulaOptions aOpt ) : - SfxPoolItem ( SID_SCFORMULAOPTIONS, SfxItemType::ScTpFormulaItemType ), + SfxPoolItem ( SID_SCFORMULAOPTIONS ), theOptions (std::move( aOpt )) { } diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index 57fedbda092e..773834ebc630 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -48,7 +48,7 @@ bool ScPrintOptions::operator==( const ScPrintOptions& rOpt ) const } ScTpPrintItem::ScTpPrintItem( const ScPrintOptions& rOpt ) : - SfxPoolItem ( SID_SCPRINTOPTIONS, SfxItemType::ScTpPrintItemType ), + SfxPoolItem ( SID_SCPRINTOPTIONS ), theOptions ( rOpt ) { } diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index bd2f110640d3..5ec30bd7e7da 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -169,7 +169,7 @@ std::unique_ptr ScViewOptions::CreateGridItem() const // ScTpViewItem - data for the ViewOptions TabPage ScTpViewItem::ScTpViewItem( const ScViewOptions& rOpt ) - : SfxPoolItem ( SID_SCVIEWOPTIONS, SfxItemType::ScTpViewItemType ), + : SfxPoolItem ( SID_SCVIEWOPTIONS ), theOptions ( rOpt ) { } diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index a22afdbf16d5..bddd0c689aea 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -33,7 +33,7 @@ ScInputStatusItem::ScInputStatusItem( sal_uInt16 nWhichP, const ScAddress& rCurPos, const ScAddress& rStartPos, const ScAddress& rEndPos, OUString _aString, const EditTextObject* pData ) : - SfxPoolItem ( nWhichP, SfxItemType::ScInputStatusItemType ), + SfxPoolItem ( nWhichP ), aCursorPos ( rCurPos ), aStartPos ( rStartPos ), aEndPos ( rEndPos ), @@ -126,7 +126,7 @@ ScEditViewHint::~ScEditViewHint() ScSortItem::ScSortItem( sal_uInt16 nWhichP, ScViewData* ptrViewData, const ScSortParam* pSortData ) : - SfxPoolItem ( nWhichP, SfxItemType::ScSortItemType ), + SfxPoolItem ( nWhichP ), pViewData ( ptrViewData ) { if ( pSortData ) theSortData = *pSortData; @@ -134,7 +134,7 @@ ScSortItem::ScSortItem( sal_uInt16 nWhichP, ScSortItem::ScSortItem( sal_uInt16 nWhichP, const ScSortParam* pSortData ) : - SfxPoolItem ( nWhichP, SfxItemType::ScSortItemType ), + SfxPoolItem ( nWhichP ), pViewData ( nullptr ) { if ( pSortData ) theSortData = *pSortData; @@ -168,7 +168,7 @@ bool ScSortItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) co ScQueryItem::ScQueryItem( sal_uInt16 nWhichP, ScViewData* ptrViewData, const ScQueryParam* pQueryData ) : - SfxPoolItem ( nWhichP, SfxItemType::ScQueryItemType ), + SfxPoolItem ( nWhichP ), pViewData ( ptrViewData ), bIsAdvanced ( false ) { @@ -180,7 +180,7 @@ ScQueryItem::ScQueryItem( sal_uInt16 nWhichP, ScQueryItem::ScQueryItem( sal_uInt16 nWhichP, const ScQueryParam* pQueryData ) : - SfxPoolItem ( nWhichP, SfxItemType::ScQueryItemType ), + SfxPoolItem ( nWhichP ), pViewData ( nullptr ), bIsAdvanced ( false ) { @@ -248,7 +248,7 @@ ScQueryItem* ScQueryItem::Clone( SfxItemPool * ) const ScSubTotalItem::ScSubTotalItem( sal_uInt16 nWhichP, ScViewData* ptrViewData, const ScSubTotalParam* pSubTotalData ) : - SfxPoolItem ( nWhichP, SfxItemType::ScSubTotalItemType ), + SfxPoolItem ( nWhichP ), pViewData ( ptrViewData ) { if ( pSubTotalData ) theSubTotalData = *pSubTotalData; @@ -280,7 +280,7 @@ bool ScSubTotalItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /* nMemberUd */ * Transporter for the UserLIst dialog */ ScUserListItem::ScUserListItem( sal_uInt16 nWhichP ) - : SfxPoolItem ( nWhichP, SfxItemType::ScUserListItemType ) + : SfxPoolItem ( nWhichP ) { } @@ -326,7 +326,7 @@ void ScUserListItem::SetUserList( const ScUserList& rUserList ) ScConsolidateItem::ScConsolidateItem( sal_uInt16 nWhichP, const ScConsolidateParam* pConsolidateData ) : - SfxPoolItem ( nWhichP, SfxItemType::ScConsolidateItemType ) + SfxPoolItem ( nWhichP ) { if ( pConsolidateData ) theConsData = *pConsolidateData; } @@ -350,7 +350,7 @@ ScConsolidateItem* ScConsolidateItem::Clone( SfxItemPool * ) const */ ScPivotItem::ScPivotItem( sal_uInt16 nWhichP, const ScDPSaveData* pData, const ScRange* pRange, bool bNew ) : - SfxPoolItem ( nWhichP, SfxItemType::ScPivotItemType ) + SfxPoolItem ( nWhichP ) { // pSaveData must always exist if ( pData ) @@ -395,7 +395,7 @@ ScPivotItem* ScPivotItem::Clone( SfxItemPool * ) const */ ScSolveItem::ScSolveItem( sal_uInt16 nWhichP, const ScSolveParam* pSolveData ) - : SfxPoolItem ( nWhichP, SfxItemType::ScSolveItemType ) + : SfxPoolItem ( nWhichP ) { if ( pSolveData ) theSolveData = *pSolveData; } @@ -419,7 +419,7 @@ ScSolveItem* ScSolveItem::Clone( SfxItemPool * ) const */ ScTabOpItem::ScTabOpItem( sal_uInt16 nWhichP, const ScTabOpParam* pTabOpData ) - : SfxPoolItem ( nWhichP, SfxItemType::ScTabOpItemType ) + : SfxPoolItem ( nWhichP ) { if ( pTabOpData ) theTabOpData = *pTabOpData; } diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 84625b899f7b..dcab506e64b6 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -51,6 +51,7 @@ class ScInputStatusItem : public SfxPoolItem public: + DECLARE_ITEM_TYPE_FUNCTION(ScInputStatusItem) ScInputStatusItem( sal_uInt16 nWhich, const ScAddress& rCurPos, const ScAddress& rStartPos, @@ -127,6 +128,7 @@ public: class SC_DLLPUBLIC ScSortItem : public SfxPoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(ScSortItem) ScSortItem( sal_uInt16 nWhich, ScViewData* ptrViewData, const ScSortParam* pSortData ); @@ -148,6 +150,7 @@ private: class SC_DLLPUBLIC ScQueryItem : public SfxPoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(ScQueryItem) ScQueryItem( sal_uInt16 nWhich, ScViewData* ptrViewData, const ScQueryParam* pQueryData ); @@ -175,6 +178,7 @@ private: class SC_DLLPUBLIC ScSubTotalItem : public SfxPoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(ScSubTotalItem) ScSubTotalItem( sal_uInt16 nWhich, ScViewData* ptrViewData, const ScSubTotalParam* pSubTotalData ); @@ -194,6 +198,7 @@ private: class SC_DLLPUBLIC ScUserListItem : public SfxPoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(ScUserListItem) ScUserListItem( sal_uInt16 nWhich ); ScUserListItem( const ScUserListItem& rItem ); virtual ~ScUserListItem() override; @@ -211,6 +216,7 @@ private: class ScConsolidateItem : public SfxPoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(ScConsolidateItem) ScConsolidateItem( sal_uInt16 nWhich, const ScConsolidateParam* pParam ); @@ -226,6 +232,7 @@ private: class ScPivotItem : public SfxPoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(ScPivotItem) ScPivotItem( sal_uInt16 nWhich, const ScDPSaveData* pData, const ScRange* pRange, bool bNew ); ScPivotItem( const ScPivotItem& rItem ); @@ -247,6 +254,7 @@ private: class ScSolveItem : public SfxPoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(ScSolveItem) ScSolveItem( sal_uInt16 nWhich, const ScSolveParam* pParam ); @@ -262,6 +270,7 @@ private: class ScTabOpItem : public SfxPoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(ScTabOpItem) ScTabOpItem( sal_uInt16 nWhich, const ScTabOpParam* pParam ); diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index f9695b39ab10..454e2171baf6 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -404,13 +404,13 @@ bool SdOptionsMisc::WriteData( Any* pValues ) const \************************************************************************/ SdOptionsMiscItem::SdOptionsMiscItem() -: SfxPoolItem ( ATTR_OPTIONS_MISC, SfxItemType::SdOptionsMiscItemType ) +: SfxPoolItem ( ATTR_OPTIONS_MISC ) , maOptionsMisc ( false, false ) { } SdOptionsMiscItem::SdOptionsMiscItem( SdOptions const * pOpts, ::sd::FrameView const * pView ) -: SfxPoolItem ( ATTR_OPTIONS_MISC, SfxItemType::SdOptionsMiscItemType ) +: SfxPoolItem ( ATTR_OPTIONS_MISC ) , maOptionsMisc ( false, false ) { if( pOpts ) @@ -839,13 +839,13 @@ bool SdOptionsPrint::WriteData( Any* pValues ) const \************************************************************************/ SdOptionsPrintItem::SdOptionsPrintItem() -: SfxPoolItem ( ATTR_OPTIONS_PRINT, SfxItemType::SdOptionsPrintItemType ) +: SfxPoolItem ( ATTR_OPTIONS_PRINT ) , maOptionsPrint ( false, false ) { } SdOptionsPrintItem::SdOptionsPrintItem( SdOptions const * pOpts ) -: SfxPoolItem ( ATTR_OPTIONS_PRINT, SfxItemType::SdOptionsPrintItemType ) +: SfxPoolItem ( ATTR_OPTIONS_PRINT ) , maOptionsPrint ( false, false ) { if( !pOpts ) diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 65bca1991090..21ad5153b528 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -240,6 +240,7 @@ class SD_DLLPUBLIC SdOptionsMiscItem final : public SfxPoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdOptionsMiscItem) explicit SdOptionsMiscItem(); SdOptionsMiscItem( SdOptions const * pOpts, ::sd::FrameView const * pView ); @@ -292,6 +293,7 @@ class SdOptionsGridItem final : public SvxGridItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdOptionsGridItem) explicit SdOptionsGridItem( SdOptions const * pOpts ); void SetOptions( SdOptions* pOpts ) const; @@ -384,6 +386,7 @@ class SD_DLLPUBLIC SdOptionsPrintItem final : public SfxPoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SdOptionsPrintItem) explicit SdOptionsPrintItem(); explicit SdOptionsPrintItem( SdOptions const * pOpts ); diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx index 3dc6ea8193d6..571e9e1b9c32 100644 --- a/sfx2/inc/sorgitm.hxx +++ b/sfx2/inc/sorgitm.hxx @@ -31,6 +31,7 @@ private: public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SfxScriptOrganizerItem) SfxScriptOrganizerItem(); virtual SfxScriptOrganizerItem* Clone( SfxItemPool* pPool = nullptr ) const override; diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx index 765eada62029..b0bd034e20b5 100644 --- a/sfx2/source/control/minfitem.cxx +++ b/sfx2/source/control/minfitem.cxx @@ -35,7 +35,7 @@ SfxMacroInfoItem::SfxMacroInfoItem( OUString _aMethodName, OUString _aComment, OUString _aLocationName) : - SfxPoolItem(nWhichId, SfxItemType::SfxMacroInfoItemType), + SfxPoolItem(nWhichId), pBasicManager(pMgr), aLibName(std::move(_aLibName)), aModuleName(std::move(_aModuleName)), diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx index 39280e71dfb8..d4e385ea0cf2 100644 --- a/sfx2/source/control/sorgitm.cxx +++ b/sfx2/source/control/sorgitm.cxx @@ -26,7 +26,7 @@ SfxPoolItem* SfxScriptOrganizerItem::CreateDefault() { return new SfxScriptOrganizerItem; } -SfxScriptOrganizerItem::SfxScriptOrganizerItem() : SfxPoolItem(0, SfxItemType::SfxScriptOrganizerItemType) +SfxScriptOrganizerItem::SfxScriptOrganizerItem() : SfxPoolItem(0) { } diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 598593e0888c..7dd0e642a34d 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -192,7 +192,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString& rFile, const uno::Reference& i_xDocProps, const uno::Sequence& i_cmisProps, bool bIs, bool _bIs, sal_Int64 _nFileSize ) - : SfxStringItem( SID_DOCINFO, rFile, SfxItemType::SfxDocumentInfoItemType ) + : SfxStringItem( SID_DOCINFO, rFile ) , m_AutoloadDelay( i_xDocProps->getAutoloadSecs() ) , m_AutoloadURL( i_xDocProps->getAutoloadURL() ) , m_isAutoloadEnabled( (m_AutoloadDelay > 0) || !m_AutoloadURL.isEmpty() ) diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 331414c4c784..5e75ad64bc57 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -81,7 +81,7 @@ SfxTabDialogItem::SfxTabDialogItem( const SfxTabDialogItem& rAttr, SfxItemPool* } SfxTabDialogItem::SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet ) - : SfxSetItem( nId, rItemSet, SfxItemType::SfxTabDialogItemType ) + : SfxSetItem( nId, rItemSet ) { } diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx index b9748407f82e..a453323bbb80 100644 --- a/sfx2/source/dialog/tplpitem.cxx +++ b/sfx2/source/dialog/tplpitem.cxx @@ -33,7 +33,7 @@ SfxTemplateItem::SfxTemplateItem sal_uInt16 nWhichId, // Slot-ID OUString _aStyle, // Name of the current Styles OUString _aStyleIdentifier // Prog Name of current Style -) : SfxFlagItem( nWhichId, static_cast(SfxStyleSearchBits::All), SfxItemType::SfxTemplateItemType ), +) : SfxFlagItem( nWhichId, static_cast(SfxStyleSearchBits::All) ), aStyle(std::move( _aStyle )), aStyleIdentifier(std::move( _aStyleIdentifier )) { diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx index 47c721046225..e776e6608788 100644 --- a/sfx2/source/doc/objitem.cxx +++ b/sfx2/source/doc/objitem.cxx @@ -69,7 +69,7 @@ bool SfxObjectShellItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMembe } SfxObjectItem::SfxObjectItem( sal_uInt16 nWhichId, SfxShell *pSh ) -: SfxPoolItem( nWhichId, SfxItemType::SfxObjectItemType ), +: SfxPoolItem( nWhichId ), _pSh( pSh ) {} diff --git a/sfx2/source/doc/watermarkitem.cxx b/sfx2/source/doc/watermarkitem.cxx index 3e11ef6e569d..b5a2846cec36 100644 --- a/sfx2/source/doc/watermarkitem.cxx +++ b/sfx2/source/doc/watermarkitem.cxx @@ -12,7 +12,7 @@ #include SfxWatermarkItem::SfxWatermarkItem() -: SfxPoolItem( SID_WATERMARK, SfxItemType::SfxWatermarkItemType ) +: SfxPoolItem( SID_WATERMARK ) , m_aText( u""_ustr ) , m_aFont( u"Liberation Sans"_ustr ) , m_nAngle( 45 ) diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index d346363b3f92..049cfa39f951 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -41,7 +41,7 @@ SvxZoomItem::SvxZoomItem sal_uInt16 nVal, TypedWhichId _nWhich ) -: SfxUInt16Item( _nWhich, nVal, SfxItemType::SfxZoomItemType ), +: SfxUInt16Item( _nWhich, nVal ), nValueSet( SvxZoomEnableFlags::ALL ), eType( eZoomType ) { diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 1e565338fc59..4717805fae3c 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -378,13 +378,13 @@ void SfxFrame::RemoveTopFrame_Impl( SfxFrame* pFrame ) } SfxFrameItem::SfxFrameItem( sal_uInt16 nWhichId, SfxViewFrame const *p ) - : SfxPoolItem( nWhichId, SfxItemType::SfxFrameItemType ), pFrame( p ? &p->GetFrame() : nullptr ) + : SfxPoolItem( nWhichId ), pFrame( p ? &p->GetFrame() : nullptr ) { wFrame = pFrame; } SfxFrameItem::SfxFrameItem( sal_uInt16 nWhichId, SfxFrame *p ): - SfxPoolItem( nWhichId, SfxItemType::SfxFrameItemType ), + SfxPoolItem( nWhichId ), pFrame( p ), wFrame( p ) { } @@ -440,7 +440,7 @@ bool SfxFrameItem::PutValue( const css::uno::Any& rVal, sal_uInt8 ) SfxUnoAnyItem::SfxUnoAnyItem( sal_uInt16 nWhichId, const css::uno::Any& rAny ) - : SfxPoolItem( nWhichId, SfxItemType::SfxUnoAnyItemType ) + : SfxPoolItem( nWhichId ) { aValue = rAny; } @@ -469,12 +469,12 @@ bool SfxUnoAnyItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ } SfxUnoFrameItem::SfxUnoFrameItem() - : SfxPoolItem( 0, SfxItemType::SfxUnoFrameItemType) + : SfxPoolItem( 0) { } SfxUnoFrameItem::SfxUnoFrameItem( sal_uInt16 nWhichId, css::uno::Reference< css::frame::XFrame > i_xFrame ) - : SfxPoolItem( nWhichId, SfxItemType::SfxUnoFrameItemType ) + : SfxPoolItem( nWhichId ) , m_xFrame(std::move( i_xFrame )) { } diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx index 8a873bacbb61..270be1e57530 100644 --- a/svl/source/items/flagitem.cxx +++ b/svl/source/items/flagitem.cxx @@ -26,8 +26,8 @@ #include -SfxFlagItem::SfxFlagItem( sal_uInt16 nW, sal_uInt16 nV, SfxItemType eItemType ) : - SfxPoolItem( nW, eItemType ), +SfxFlagItem::SfxFlagItem( sal_uInt16 nW, sal_uInt16 nV ) : + SfxPoolItem( nW ), nVal(nV) { } diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx index 6cd1ece098ee..aad151edd56a 100644 --- a/svl/source/items/globalnameitem.cxx +++ b/svl/source/items/globalnameitem.cxx @@ -31,13 +31,13 @@ SfxPoolItem* SfxGlobalNameItem::CreateDefault() { return new SfxGlobalNameItem; SfxGlobalNameItem::SfxGlobalNameItem() : - SfxPoolItem(0, SfxItemType::SfxGlobalNameItemType) + SfxPoolItem(0) { } SfxGlobalNameItem::SfxGlobalNameItem( sal_uInt16 nW, const SvGlobalName& rName ) -: SfxPoolItem( nW, SfxItemType::SfxGlobalNameItemType ), +: SfxPoolItem( nW ), m_aName( rName ) { } diff --git a/svl/source/items/grabbagitem.cxx b/svl/source/items/grabbagitem.cxx index f5f5f2bae886..6db53663d736 100644 --- a/svl/source/items/grabbagitem.cxx +++ b/svl/source/items/grabbagitem.cxx @@ -18,17 +18,17 @@ using namespace com::sun::star; SfxGrabBagItem::SfxGrabBagItem() - : SfxPoolItem(0, SfxItemType::SfxGrabBagItemType) + : SfxPoolItem(0) { } SfxGrabBagItem::SfxGrabBagItem(sal_uInt16 nWhich) - : SfxPoolItem(nWhich, SfxItemType::SfxGrabBagItemType) + : SfxPoolItem(nWhich) { } SfxGrabBagItem::SfxGrabBagItem(sal_uInt16 nWhich, std::map aMap) - : SfxPoolItem(nWhich, SfxItemType::SfxGrabBagItemType) + : SfxPoolItem(nWhich) , m_aMap(std::move(aMap)) { } diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx index adbc324c46ee..b52f683272c3 100644 --- a/svl/source/items/ilstitem.cxx +++ b/svl/source/items/ilstitem.cxx @@ -28,18 +28,18 @@ SfxPoolItem* SfxIntegerListItem::CreateDefault() { return new SfxIntegerListItem; } SfxIntegerListItem::SfxIntegerListItem() - : SfxPoolItem(0, SfxItemType::SfxIntegerListItemType) + : SfxPoolItem(0) { } SfxIntegerListItem::SfxIntegerListItem( sal_uInt16 which, ::std::vector < sal_Int32 >&& rList ) - : SfxPoolItem( which, SfxItemType::SfxIntegerListItemType ) + : SfxPoolItem( which ) , m_aList( std::move(rList) ) { } SfxIntegerListItem::SfxIntegerListItem( sal_uInt16 which, const css::uno::Sequence < sal_Int32 >& rList ) - : SfxPoolItem( which, SfxItemType::SfxIntegerListItemType ) + : SfxPoolItem( which ) { comphelper::sequenceToContainer(m_aList, rList); } diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx index 7020054d6889..cba4b7103b82 100644 --- a/svl/source/items/imageitm.cxx +++ b/svl/source/items/imageitm.cxx @@ -25,7 +25,7 @@ SfxPoolItem* SfxImageItem::CreateDefault() { return new SfxImageItem; } SfxImageItem::SfxImageItem( sal_uInt16 which ) - : SfxInt16Item( which, 0, SfxItemType::SfxImageItemType ), mnAngle(0), mbMirrored(false) + : SfxInt16Item( which, 0 ), mnAngle(0), mbMirrored(false) { } diff --git a/svl/source/items/int64item.cxx b/svl/source/items/int64item.cxx index 644802edf9cc..06efd1fc9aca 100644 --- a/svl/source/items/int64item.cxx +++ b/svl/source/items/int64item.cxx @@ -10,7 +10,7 @@ #include SfxInt64Item::SfxInt64Item( sal_uInt16 nWhich, sal_Int64 nVal ) : - SfxPoolItem(nWhich, SfxItemType::SfxInt64ItemType), mnValue(nVal) + SfxPoolItem(nWhich), mnValue(nVal) { } diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index 9a56bdda68af..0ced3eb20146 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -159,8 +159,8 @@ boost::property_tree::ptree SfxUInt32Item::dumpAsJSON() const return aTree; } -SfxMetricItem::SfxMetricItem(sal_uInt16 which, sal_Int32 nValue,SfxItemType eItemType): - SfxInt32Item(which, nValue, eItemType) +SfxMetricItem::SfxMetricItem(sal_uInt16 which, sal_Int32 nValue): + SfxInt32Item(which, nValue) { } diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index 28aad1efa0b4..ea05684b9c64 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -28,7 +28,7 @@ SfxPoolItem* SfxLockBytesItem::CreateDefault() { return new SfxLockBytesItem; } SfxLockBytesItem::SfxLockBytesItem() - : SfxPoolItem(0, SfxItemType::SfxLockBytesItemType) + : SfxPoolItem(0) { } diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 76f78863f03f..2aa31be8db24 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -32,436 +32,8 @@ ////////////////////////////////////////////////////////////////////////////// // list of classes derived from SfxPoolItem -// will not be kept up-to-date, but give a good overview for right now -////////////////////////////////////////////////////////////////////////////// -// -// class SbxItem : public SfxPoolItem -// class SvxChartColorTableItem : public SfxPoolItem -// class DriverPoolingSettingsItem final : public SfxPoolItem -// class DatabaseMapItem final : public SfxPoolItem -// class DbuTypeCollectionItem : public SfxPoolItem -// class OptionalBoolItem : public SfxPoolItem -// class OStringListItem : public SfxPoolItem -// class MediaItem : public SfxPoolItem -// class SvxBoxItem : public SfxPoolItem -// class SvxBoxInfoItem : public SfxPoolItem -// class SvxBrushItem : public SfxPoolItem -// class SvxBulletItem : public SfxPoolItem -// class SvxColorItem : public SfxPoolItem -// class SvxFontHeightItem : public SfxPoolItem -// class SvxFieldItem : public SfxPoolItem -// class SvxFontListItem : public SfxPoolItem -// class SvxFontItem : public SfxPoolItem -// class SvxHyphenZoneItem : public SfxPoolItem -// class SvxLineItem : public SfxPoolItem -// class SvxLRSpaceItem : public SfxPoolItem -// class SvxNumBulletItem : public SfxPoolItem -// class SfxHyphenRegionItem: public SfxPoolItem -// class SvxProtectItem : public SfxPoolItem -// class SvxSizeItem : public SfxPoolItem -// class SwFormatFrameSize: public SvxSizeItem -// class SvxTabStopItem : public SfxPoolItem -// class SvxTwoLinesItem : public SfxPoolItem -// class SvxULSpaceItem : public SfxPoolItem -// class SvXMLAttrContainerItem: public SfxPoolItem -// class SfxLinkItem : public SfxPoolItem -// class SfxEventNamesItem : public SfxPoolItem -// class SfxFrameItem: public SfxPoolItem -// class SfxUnoAnyItem : public SfxPoolItem -// class SfxUnoFrameItem : public SfxPoolItem -// class SfxMacroInfoItem: public SfxPoolItem -// class SfxObjectItem: public SfxPoolItem -// class SfxObjectShellItem: public SfxPoolItem -// class SfxViewFrameItem: public SfxPoolItem -// class SfxWatermarkItem: public SfxPoolItem -// class SfxEnumItemInterface: public SfxPoolItem -// class SvxAdjustItem : public SfxEnumItemInterface -// class SvxEscapementItem : public SfxEnumItemInterface -// class SvxLineSpacingItem : public SfxEnumItemInterface -// class SvxShadowItem : public SfxEnumItemInterface -// class SfxEnumItem : public SfxEnumItemInterface -// class SvxCharReliefItem : public SfxEnumItem -// class SvxCaseMapItem : public SfxEnumItem -// class SvxCrossedOutItem : public SfxEnumItem -// class SvxFormatBreakItem : public SfxEnumItem -// class SvxFrameDirectionItem : public SfxEnumItem -// class SvxHorJustifyItem: public SfxEnumItem -// class SvxVerJustifyItem: public SfxEnumItem -// class SvxJustifyMethodItem: public SfxEnumItem -// class SvxLanguageItem_Base: public SfxEnumItem -// class SvxLanguageItem : public SvxLanguageItem_Base -// class SvxPostureItem : public SfxEnumItem -// class SvxTextLineItem : public SfxEnumItem -// class SvxUnderlineItem : public SvxTextLineItem -// class SvxOverlineItem : public SvxTextLineItem -// class SvxWeightItem : public SfxEnumItem -// class SvxOrientationItem: public SfxEnumItem -// class SvxChartRegressItem : public SfxEnumItem -// class SvxChartTextOrderItem : public SfxEnumItem -// class SvxChartKindErrorItem : public SfxEnumItem -// class SvxChartIndicateItem : public SfxEnumItem -// class SvxRotateModeItem: public SfxEnumItem -// class SdrGrafModeItem_Base: public SfxEnumItem -// class SdrGrafModeItem : public SdrGrafModeItem_Base -// class SdrTextAniDirectionItem: public SfxEnumItem -// class SdrTextVertAdjustItem: public SfxEnumItem -// class SdrTextHorzAdjustItem: public SfxEnumItem -// class SdrTextAniKindItem: public SfxEnumItem -// class SdrTextFitToSizeTypeItem : public SfxEnumItem -// class SdrCaptionEscDirItem: public SfxEnumItem -// class SdrCaptionTypeItem: public SfxEnumItem -// class SdrEdgeKindItem: public SfxEnumItem -// class SdrMeasureTextHPosItem: public SfxEnumItem -// class SdrMeasureTextVPosItem: public SfxEnumItem -// class SdrMeasureUnitItem: public SfxEnumItem -// class XFillStyleItem : public SfxEnumItem -// class XFillBmpPosItem : public SfxEnumItem -// class XFormTextAdjustItem : public SfxEnumItem -// class XFormTextShadowItem : public SfxEnumItem -// class XLineStyleItem : public SfxEnumItem -// class XLineJointItem : public SfxEnumItem -// class XLineCapItem : public SfxEnumItem -// class XFormTextStyleItem : public SfxEnumItem -// class ScViewObjectModeItem: public SfxEnumItem -// class SdrCircKindItem: public SfxEnumItem -// class SdrMeasureKindItem: public SfxEnumItem -// class SwFormatFillOrder: public SfxEnumItem -// class SwFormatFootnoteEndAtTextEnd : public SfxEnumItem -// class SwFormatFootnoteAtTextEnd : public SwFormatFootnoteEndAtTextEnd -// class SwFormatEndAtTextEnd : public SwFormatFootnoteEndAtTextEnd -// class SwFormatSurround: public SfxEnumItem -// class SwMirrorGrf : public SfxEnumItem -// class SwDrawModeGrf_Base: public SfxEnumItem -// class SwDrawModeGrf : public SwDrawModeGrf_Base -//class CntByteItem: public SfxPoolItem -// class SfxByteItem: public CntByteItem -// class SvxOrphansItem: public SfxByteItem -// class SvxPaperBinItem : public SfxByteItem -// class SvxWidowsItem: public SfxByteItem -// class SwTransparencyGrf : public SfxByteItem -//class CntUInt16Item: public SfxPoolItem -// class SfxUInt16Item: public CntUInt16Item -// class SvxTextRotateItem : public SfxUInt16Item -// class SvxCharRotateItem : public SvxTextRotateItem -// class SvxCharScaleWidthItem : public SfxUInt16Item -// class SvxEmphasisMarkItem : public SfxUInt16Item -// class SvxParaVertAlignItem : public SfxUInt16Item -// class SvxWritingModeItem : public SfxUInt16Item -// class SvxZoomItem: public SfxUInt16Item -// class SdrPercentItem : public SfxUInt16Item -// class SdrGrafTransparenceItem : public SdrPercentItem -// class SdrTextAniCountItem: public SfxUInt16Item -// class SdrTextAniDelayItem: public SfxUInt16Item -// class Svx3DNormalsKindItem : public SfxUInt16Item -// class Svx3DTextureProjectionXItem : public SfxUInt16Item -// class Svx3DTextureProjectionYItem : public SfxUInt16Item -// class Svx3DTextureKindItem : public SfxUInt16Item -// class Svx3DTextureModeItem : public SfxUInt16Item -// class Svx3DPerspectiveItem : public SfxUInt16Item -// class Svx3DShadeModeItem : public SfxUInt16Item -// class SdrEdgeLineDeltaCountItem: public SfxUInt16Item -// class SvxViewLayoutItem: public SfxUInt16Item -// class XFillBmpPosOffsetXItem : public SfxInt32Item -// class XFillBmpPosOffsetYItem : public SfxInt32Item -// class XFillBmpTileOffsetXItem : public SfxUInt16Item -// class XFillBmpTileOffsetYItem : public SfxUInt16Item -// class XFillTransparenceItem: public SfxUInt16Item -// class XFormTextShadowTranspItem: public SfxUInt16Item -// class XGradientStepCountItem: public SfxUInt16Item -// class XLineTransparenceItem: public SfxUInt16Item -// class SvxZoomSliderItem: public SfxUInt16Item -// class SdrLayerIdItem: public SfxUInt16Item -// class SwRotationGrf : public SfxUInt16Item -//class CntInt32Item: public SfxPoolItem -// class SfxInt32Item: public CntInt32Item -// class SfxMetricItem: public SfxInt32Item -// class XFillBmpSizeXItem : public SfxMetricItem -// class XFillBmpSizeYItem : public SfxMetricItem -// class XFormTextDistanceItem : public SfxMetricItem -// class XFormTextShadowXValItem : public SfxMetricItem -// class XFormTextShadowYValItem : public SfxMetricItem -// class XFormTextStartItem : public SfxMetricItem -// class XLineEndWidthItem : public SfxMetricItem -// class XLineStartWidthItem : public SfxMetricItem -// class XLineWidthItem : public SfxMetricItem -// class SdrAngleItem: public SfxInt32Item -// -// class SdrCaptionAngleItem: public SdrAngleItem -// class SdrMeasureTextFixedAngleItem: public SdrAngleItem -// class SdrMeasureTextAutoAngleViewItem: public SdrAngleItem -// class SdrRotateAllItem: public SdrAngleItem -// class SdrRotateOneItem: public SdrAngleItem -// class SdrShearAngleItem: public SdrAngleItem -// class SdrHorzShearAllItem: public SdrAngleItem -// class SdrVertShearAllItem: public SdrAngleItem -// class SdrHorzShearOneItem: public SdrAngleItem -// class SdrVertShearOneItem: public SdrAngleItem -// class SdrMetricItem: public SfxInt32Item -// class SdrCaptionEscAbsItem: public SdrMetricItem -// class SdrCaptionGapItem: public SdrMetricItem -// class SdrCaptionLineLenItem: public SdrMetricItem -// class SdrEdgeNode1HorzDistItem: public SdrMetricItem -// class SdrEdgeNode1VertDistItem: public SdrMetricItem -// class SdrEdgeNode2HorzDistItem: public SdrMetricItem -// class SdrEdgeNode2VertDistItem: public SdrMetricItem -// class SdrEdgeNode1GlueDistItem: public SdrMetricItem -// class SdrEdgeNode2GlueDistItem: public SdrMetricItem -// class SdrAllPositionXItem: public SdrMetricItem -// class SdrAllPositionYItem: public SdrMetricItem -// class SdrAllSizeWidthItem: public SdrMetricItem -// class SdrAllSizeHeightItem: public SdrMetricItem -// class SdrLogicSizeWidthItem: public SdrMetricItem -// class SdrLogicSizeHeightItem: public SdrMetricItem -// class SdrMeasureOverhangItem: public SdrMetricItem -// class SdrMoveXItem: public SdrMetricItem -// class SdrMoveYItem: public SdrMetricItem -// class SdrOnePositionXItem: public SdrMetricItem -// class SdrOnePositionYItem: public SdrMetricItem -// class SdrOneSizeWidthItem: public SdrMetricItem -// class SdrOneSizeHeightItem: public SdrMetricItem -// class SdrTransformRef1XItem: public SdrMetricItem -// class SdrTransformRef1YItem: public SdrMetricItem -// class SdrTransformRef2XItem: public SdrMetricItem -// class SdrTransformRef2YItem: public SdrMetricItem -// class SdrCaptionEscRelItem: public SfxInt32Item -//class CntUInt32Item: public SfxPoolItem -// class SfxUInt32Item: public CntUInt32Item -// class SvxRsidItem : public SfxUInt32Item -// class SdrGrafGamma100Item : public SfxUInt32Item -// class SwTableBoxNumFormat : public SfxUInt32Item -//class SfxStringItem: public SfxPoolItem -// class SvxPageModelItem : public SfxStringItem -// class SfxDocumentInfoItem : public SfxStringItem -// class SvxPostItAuthorItem: public SfxStringItem -// class SvxPostItDateItem: public SfxStringItem -// class SvxPostItTextItem: public SfxStringItem -// class SvxPostItIdItem: public SfxStringItem -// class SdrMeasureFormatStringItem: public SfxStringItem -// class NameOrIndex : public SfxStringItem -// class XFillBitmapItem : public NameOrIndex -// class XColorItem : public NameOrIndex -// class XFillColorItem : public XColorItem -// class XFormTextShadowColorItem : public XColorItem -// class XLineColorItem : public XColorItem -// class XSecondaryFillColorItem : public XColorItem -// class XFillGradientItem : public NameOrIndex -// class XFillFloatTransparenceItem : public XFillGradientItem -// class XFillHatchItem : public NameOrIndex -// class XLineDashItem : public NameOrIndex -// class XLineEndItem : public NameOrIndex -// class XLineStartItem : public NameOrIndex -// class SdrLayerNameItem: public SfxStringItem -// class SwNumRuleItem : public SfxStringItem -//class SfxScriptOrganizerItem : public SfxPoolItem -//class SfxBoolItem : public SfxPoolItem -// class SvxAutoKernItem : public SfxBoolItem -// class SvxBlinkItem : public SfxBoolItem -// class SvxCharHiddenItem : public SfxBoolItem -// class SvxContourItem : public SfxBoolItem -// class SvxForbiddenRuleItem : public SfxBoolItem -// class SvxHangingPunctuationItem : public SfxBoolItem -// class SvxFormatKeepItem : public SfxBoolItem -// class SvxNoHyphenItem : public SfxBoolItem -// class SvxOpaqueItem : public SfxBoolItem -// class SvxParaGridItem : public SfxBoolItem -// class SvxPrintItem : public SfxBoolItem -// class SvxScriptSpaceItem : public SfxBoolItem -// class SvxShadowedItem : public SfxBoolItem -// class SvxFormatSplitItem : public SfxBoolItem -// class SvxWordLineModeItem : public SfxBoolItem -// class SdrOnOffItem: public SfxBoolItem -// class SdrGrafInvertItem : public SdrOnOffItem -// class SdrTextFixedCellHeightItem : public SfxBoolItem -// class SdrYesNoItem: public SfxBoolItem -// class SdrTextAniStartInsideItem: public SdrYesNoItem -// class SdrTextAniStopInsideItem: public SdrYesNoItem -// class SdrCaptionEscIsRelItem: public SdrYesNoItem -// class SdrCaptionFitLineLenItem: public SdrYesNoItem -// class SdrMeasureBelowRefEdgeItem: public SdrYesNoItem -// class SdrMeasureTextIsFixedAngleItem: public SdrYesNoItem -// class SdrMeasureTextRota90Item: public SdrYesNoItem -// class SdrMeasureTextUpsideDownItem: public SdrYesNoItem -// class SdrMeasureTextAutoAngleItem: public SdrYesNoItem -// class SdrObjPrintableItem: public SdrYesNoItem -// class SdrObjVisibleItem: public SdrYesNoItem -// class Svx3DReducedLineGeometryItem : public SfxBoolItem -// class Svx3DSmoothNormalsItem : public SfxBoolItem -// class Svx3DSmoothLidsItem : public SfxBoolItem -// class Svx3DCharacterModeItem : public SfxBoolItem -// class Svx3DCloseFrontItem : public SfxBoolItem -// class Svx3DCloseBackItem : public SfxBoolItem -// class XFillBackgroundItem : public SfxBoolItem -// class XFillUseSlideBackgroundItem : public SfxBoolItem -// class XFillBmpSizeLogItem : public SfxBoolItem -// class XFillBmpTileItem : public SfxBoolItem -// class XFillBmpStretchItem : public SfxBoolItem -// class XFormTextMirrorItem : public SfxBoolItem -// class XFormTextOutlineItem : public SfxBoolItem -// class XLineEndCenterItem : public SfxBoolItem -// class XLineStartCenterItem : public SfxBoolItem -// class XFormTextHideFormItem : public SfxBoolItem -// class SwFormatNoBalancedColumns : public SfxBoolItem -// class SwFormatEditInReadonly : public SfxBoolItem -// class SwFormatFollowTextFlow : public SfxBoolItem -// class SwFormatLayoutSplit : public SfxBoolItem -// class SwFormatRowSplit : public SfxBoolItem -// class SwInvertGrf: public SfxBoolItem -// class SwHeaderAndFooterEatSpacingItem : public SfxBoolItem -// class SwRegisterItem : public SfxBoolItem -// class SwParaConnectBorderItem : public SfxBoolItem -// class SfxFlagItem: public SfxPoolItem -// class SfxTemplateItem: public SfxFlagItem -// class SfxGlobalNameItem: public SfxPoolItem -// class SfxGrabBagItem : public SfxPoolItem -// class SfxIntegerListItem : public SfxPoolItem -// class SfxInt64Item : public SfxPoolItem -// class SfxInt16Item: public SfxPoolItem -// class SvxKerningItem : public SfxInt16Item -// class SfxImageItem : public SfxInt16Item -// class SdrSignedPercentItem : public SfxInt16Item -// class SdrGrafRedItem : public SdrSignedPercentItem -// class SdrGrafGreenItem : public SdrSignedPercentItem -// class SdrGrafBlueItem : public SdrSignedPercentItem -// class SdrGrafLuminanceItem : public SdrSignedPercentItem -// class SdrGrafContrastItem : public SdrSignedPercentItem -// class SdrTextAniAmountItem: public SfxInt16Item -// class SdrMeasureDecimalPlacesItem: public SfxInt16Item -// class ScMergeFlagAttr: public SfxInt16Item -// class SwLuminanceGrf : public SfxInt16Item -// class SwContrastGrf : public SfxInt16Item -// class SwChannelGrf : public SfxInt16Item -// class SfxLockBytesItem : public SfxPoolItem -// class SvxMacroItem: public SfxPoolItem -// class SfxVoidItem final: public SfxPoolItem -// class SfxSetItem: public SfxPoolItem -// class SvxScriptSetItem : public SfxSetItem -// class SfxTabDialogItem: public SfxSetItem -// class SvxSetItem: public SfxSetItem -// class XFillAttrSetItem : public SfxSetItem -// class XLineAttrSetItem : public SfxSetItem -// class ScPatternAttr: public SfxSetItem -// class SfxPointItem: public SfxPoolItem -// class SfxRectangleItem: public SfxPoolItem -// class SfxRangeItem : public SfxPoolItem -// class SfxStringListItem : public SfxPoolItem -// class SvxSearchItem : public SfxPoolItem -// class SfxVisibilityItem: public SfxPoolItem -// class AffineMatrixItem : public SfxPoolItem -// class SvxMarginItem: public SfxPoolItem -// class SvxDoubleItem : public SfxPoolItem -// class SvxClipboardFormatItem : public SfxPoolItem -// class SvxColorListItem: public SfxPoolItem -// class SvxGradientListItem : public SfxPoolItem -// class SvxHatchListItem : public SfxPoolItem -// class SvxBitmapListItem : public SfxPoolItem -// class SvxPatternListItem : public SfxPoolItem -// class SvxDashListItem : public SfxPoolItem -// class SvxLineEndListItem : public SfxPoolItem -// class SvxB3DVectorItem : public SfxPoolItem -// class SvxGalleryItem : public SfxPoolItem -// class SvxGrfCrop : public SfxPoolItem -// class SdrGrafCropItem : public SvxGrfCrop -// class SwCropGrf : public SvxGrfCrop -// class SvxHyperlinkItem : public SfxPoolItem -// class SvxNumberInfoItem : public SfxPoolItem -// class OfaPtrItem : public SfxPoolItem -// class OfaXColorListItem : public SfxPoolItem -// class SvxGridItem : public SvxOptionsGrid, public SfxPoolItem -// class SdOptionsGridItem : public SvxGridItem -// class SvxPageItem: public SfxPoolItem -// class SvxLongLRSpaceItem : public SfxPoolItem -// class SvxLongULSpaceItem : public SfxPoolItem -// class SvxPagePosSizeItem : public SfxPoolItem -// class SvxColumnItem : public SfxPoolItem -// class SvxObjectItem : public SfxPoolItem -// class SdrCustomShapeGeometryItem : public SfxPoolItem -// class SvxSmartTagItem : public SfxPoolItem -// class SvxGraphicItem: public SfxPoolItem -// class SdrFractionItem: public SfxPoolItem -// class SdrScaleItem: public SdrFractionItem -// class SdrMeasureScaleItem: public SdrScaleItem -// class SdrResizeXAllItem: public SdrFractionItem -// class SdrResizeYAllItem: public SdrFractionItem -// class SdrResizeXOneItem: public SdrFractionItem -// class SdrResizeYOneItem: public SdrFractionItem -// class ScMergeAttr: public SfxPoolItem -// class ScProtectionAttr: public SfxPoolItem -// class ScPageHFItem : public SfxPoolItem -// class ScPageScaleToItem : public SfxPoolItem -// class ScCondFormatItem : public SfxPoolItem -// class ScTpDefaultsItem : public SfxPoolItem -// class ScTpCalcItem : public SfxPoolItem -// class ScTpFormulaItem : public SfxPoolItem -// class ScTpPrintItem : public SfxPoolItem -// class ScTpViewItem : public SfxPoolItem -// class ScCondFormatDlgItem : public SfxPoolItem -// class ScInputStatusItem : public SfxPoolItem -// class ScSortItem : public SfxPoolItem -// class ScQueryItem : public SfxPoolItem -// class ScSubTotalItem : public SfxPoolItem -// class cUserListItem : public SfxPoolItem -// class ScConsolidateItem : public SfxPoolItem -// class ScPivotItem : public SfxPoolItem -// class ScSolveItem : public SfxPoolItem -// class ScTabOpItem : public SfxPoolItem -// class SdOptionsLayoutItem : public SfxPoolItem -// class SdOptionsMiscItem : public SfxPoolItem -// class SdOptionsSnapItem : public SfxPoolItem -// class SdOptionsPrintItem : public SfxPoolItem -// class SwCondCollItem : public SfxPoolItem -// class SwTableBoxFormula : public SfxPoolItem, public SwTableFormula -// class SwTableBoxValue : public SfxPoolItem -// class SwFormatCharFormat: public SfxPoolItem, public SwClient -// class SwFormatAnchor: public SfxPoolItem -// class SwFormatAutoFormat: public SfxPoolItem -// class SwFormatCol : public SfxPoolItem -// class SwFormatChain: public SfxPoolItem -// class SwFormatContent: public SfxPoolItem -// class SwFormatFlyCnt : public SfxPoolItem -// class SwFormatField : public SfxPoolItem -// class SwFormatFootnote : public SfxPoolItem -// class SwFormatHeader: public SfxPoolItem, public SwClient -// class SwFormatFooter: public SfxPoolItem, public SwClient -// class SwFormatINetFormat : public SfxPoolItem -// class SwFormatLineNumber: public SfxPoolItem -// class SwFormatMeta : public SfxPoolItem -// class SwFormatVertOrient: public SfxPoolItem -// class SwFormatHoriOrient: public SfxPoolItem -// class SwFormatPageDesc : public SfxPoolItem, public SwClient -// class SwFormatRefMark : public SfxPoolItem -// class SwFormatRuby : public SfxPoolItem -// class SwFormatURL: public SfxPoolItem -// class SwFormatWrapInfluenceOnObjPos: public SfxPoolItem -// class SwGammaGrf : public SfxPoolItem -// class SwMsgPoolItem : public SfxPoolItem -// class SwPtrMsgPoolItem : public SwMsgPoolItem -// class SwFormatChg: public SwMsgPoolItem -// class SwUpdateAttr : public SwMsgPoolItem -// class SwTableFormulaUpdate : public SwMsgPoolItem -// class SwAutoFormatGetDocNode: public SwMsgPoolItem -// class SwAttrSetChg: public SwMsgPoolItem -// class SwFindNearestNode : public SwMsgPoolItem -// class SwStringMsgPoolItem : public SwMsgPoolItem -// class SwFormatDrop: public SfxPoolItem, public SwClient -// class SwTextGridItem : public SfxPoolItem -// class SwTOXMark : public SfxPoolItem -// class SwFltAnchor : public SfxPoolItem -// class SwFltRedline : public SfxPoolItem -// class SwFltBookmark : public SfxPoolItem -// class SwFltRDFMark : public SfxPoolItem -// class SwFltTOX : public SfxPoolItem -// class SwDocDisplayItem : public SfxPoolItem -// class SwElemItem : public SfxPoolItem -// class SwAddPrinterItem : public SfxPoolItem, public SwPrintData -// class SwShadowCursorItem : public SfxPoolItem -// class SwTestItem : public SfxPoolItem -// class SwEnvItem : public SfxPoolItem -// class SwLabItem : public SfxPoolItem -// class SwWrtShellItem: public SfxPoolItem -// class SwPageFootnoteInfoItem : public SfxPoolItem -// class SwPtrItem : public SfxPoolItem -// class SwUINumRuleItem : public SfxPoolItem -// class SwPaMItem : public SfxPoolItem +// removed, but use 'grep DECLARE_ITEM_TYPE_FUNCTION' to get a complete list +// of Items that may get incarnated during office runtime ////////////////////////////////////////////////////////////////////////////// #ifdef DBG_UTIL @@ -514,10 +86,10 @@ const SfxPoolItem* DefaultItemInstanceManager::find(const SfxPoolItem& rItem) co ItemInstanceManager* SfxPoolItem::getItemInstanceManager() const { return nullptr; } -SfxPoolItem::SfxPoolItem(sal_uInt16 const nWhich, SfxItemType eType) +SfxPoolItem::SfxPoolItem(sal_uInt16 const nWhich) : m_nRefCount(0) , m_nWhich(nWhich) - , m_eItemType(eType) +// , m_eItemType(eType) #ifdef DBG_UTIL , m_nSerialNumber(nUsedSfxPoolItemCount) #endif @@ -729,8 +301,9 @@ class InvalidOrDisabledItem final : public SfxPoolItem public: // make it StaticDefaultItem to process similar to these // which is plausible (never change and are not allowed to) + DECLARE_ITEM_TYPE_FUNCTION(InvalidOrDisabledItem) InvalidOrDisabledItem() - : SfxPoolItem(0, SfxItemType::InvalidOrDisabledItemType) + : SfxPoolItem(0) { setStaticDefault(); } diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx index 71ac1205b682..7e28facd30e8 100644 --- a/svl/source/items/ptitem.cxx +++ b/svl/source/items/ptitem.cxx @@ -35,13 +35,13 @@ SfxPoolItem* SfxPointItem::CreateDefault() { return new SfxPointItem; } SfxPointItem::SfxPointItem() - : SfxPoolItem(0, SfxItemType::SfxPointItemType) + : SfxPoolItem(0) { } SfxPointItem::SfxPointItem( sal_uInt16 nW, const Point& rVal ) : - SfxPoolItem( nW, SfxItemType::SfxPointItemType ), + SfxPoolItem( nW ), aVal( rVal ) { } diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index cd9eecdf672a..98dc0ebc6323 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -31,13 +31,13 @@ SfxPoolItem* SfxRectangleItem::CreateDefault() { return new SfxRectangleItem; } SfxRectangleItem::SfxRectangleItem() - : SfxPoolItem( 0, SfxItemType::SfxRectangleItemType ) + : SfxPoolItem( 0 ) { } SfxRectangleItem::SfxRectangleItem( sal_uInt16 nW, const tools::Rectangle& rVal ) : - SfxPoolItem( nW, SfxItemType::SfxRectangleItemType ), + SfxPoolItem( nW ), maVal( rVal ) { } diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx index d7e6bff5cbb4..89f7e642ed50 100644 --- a/svl/source/items/rngitem.cxx +++ b/svl/source/items/rngitem.cxx @@ -23,7 +23,7 @@ SfxRangeItem::SfxRangeItem( sal_uInt16 which, sal_uInt16 from, sal_uInt16 to ): - SfxPoolItem( which, SfxItemType::SfxRangeItemType ), + SfxPoolItem( which ), nFrom( from ), nTo( to ) { diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx index 0e4499b55ab4..037097f7bc3a 100644 --- a/svl/source/items/sitem.cxx +++ b/svl/source/items/sitem.cxx @@ -24,9 +24,8 @@ #include #include -SfxSetItem::SfxSetItem( sal_uInt16 which, const SfxItemSet &rSet, - SfxItemType eItemType) : - SfxPoolItem(which, eItemType), +SfxSetItem::SfxSetItem( sal_uInt16 which, const SfxItemSet &rSet) : + SfxPoolItem(which), maSet(rSet) { assert(!dynamic_cast(&rSet) && "cannot handle SfxAllItemSet here"); @@ -34,9 +33,8 @@ SfxSetItem::SfxSetItem( sal_uInt16 which, const SfxItemSet &rSet, } -SfxSetItem::SfxSetItem( sal_uInt16 which, SfxItemSet &&pS, - SfxItemType eItemType) : - SfxPoolItem(which, eItemType), +SfxSetItem::SfxSetItem( sal_uInt16 which, SfxItemSet &&pS) : + SfxPoolItem(which), maSet(pS) { assert(!dynamic_cast(&pS) && "cannot handle SfxAllItemSet here"); diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index 1141784397b1..24c9b640e578 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -30,13 +30,13 @@ SfxPoolItem* SfxStringListItem::CreateDefault() { return new SfxStringListItem; } SfxStringListItem::SfxStringListItem() : - SfxPoolItem( 0, SfxItemType::SfxStringListItemType ) + SfxPoolItem( 0 ) { } SfxStringListItem::SfxStringListItem( sal_uInt16 which, const std::vector* pList ) : - SfxPoolItem( which, SfxItemType::SfxStringListItemType ) + SfxPoolItem( which ) { // FIXME: Putting an empty list does not work // Therefore the query after the count is commented out diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index 1300d42b8b19..5f37d07b7674 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -91,7 +91,7 @@ static Sequence< OUString > lcl_GetNotifyNames() SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) : - SfxPoolItem( nId, SfxItemType::SvxSearchItemType ), + SfxPoolItem( nId ), ConfigItem( CFG_ROOT_NODE ), m_aSearchOpt ( SearchFlags::LEV_RELAXED, diff --git a/svl/source/items/voiditem.cxx b/svl/source/items/voiditem.cxx index ba72003a4149..6bda725d0fcd 100644 --- a/svl/source/items/voiditem.cxx +++ b/svl/source/items/voiditem.cxx @@ -24,7 +24,7 @@ SfxPoolItem* SfxVoidItem::CreateDefault() { return new SfxVoidItem(0); } SfxVoidItem::SfxVoidItem(sal_uInt16 which) - : SfxPoolItem(which, SfxItemType::SfxVoidItemType) + : SfxPoolItem(which) { #ifdef DBG_UTIL if (0 == which) @@ -33,7 +33,7 @@ SfxVoidItem::SfxVoidItem(sal_uInt16 which) } SfxVoidItem::SfxVoidItem(const SfxVoidItem& rCopy) - : SfxPoolItem(rCopy.Which(), SfxItemType::SfxVoidItemType) + : SfxPoolItem(rCopy.Which()) { } 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 { 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 { 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 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 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 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(nVal), - SfxItemType::Svx3DPerspectiveItemType) + : SfxUInt16Item(SDRATTR_3DSCENE_PERSPECTIVE, static_cast(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(nWhich, SfxItemType::RectangleAlignmentType, nValue) + : SfxEnumItem(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 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 nId): - SfxEnumItem( nId, SfxItemType::SvxOrientationItemType, eOrientation ) + SfxEnumItem( nId, eOrientation ) { } SvxOrientationItem::SvxOrientationItem( Degree100 nRotation, bool bStacked, const TypedWhichId 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 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 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 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 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 nId) : - SfxEnumItem(nId, SfxItemType::SvxChartKindErrorItemType, eOrient) + SfxEnumItem(nId, eOrient) { } @@ -156,7 +156,7 @@ SvxChartKindErrorItem* SvxChartKindErrorItem::Clone(SfxItemPool* /*pPool*/) cons SvxChartIndicateItem::SvxChartIndicateItem(SvxChartIndicate eOrient, TypedWhichId nId) : - SfxEnumItem(nId, SfxItemType::SvxChartIndicateItemType, eOrient) + SfxEnumItem(nId, eOrient) { } @@ -167,7 +167,7 @@ SvxChartIndicateItem* SvxChartIndicateItem::Clone(SfxItemPool* /*pPool*/) const SvxChartRegressItem::SvxChartRegressItem(SvxChartRegress eOrient, TypedWhichId 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(0)); }; SvxClipboardFormatItem::SvxClipboardFormatItem( TypedWhichId 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 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 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 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 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 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 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 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 _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 nItemId, SfxItemType eType ) - : SfxPoolItem( nItemId, eType ), +SvxGrfCrop::SvxGrfCrop( TypedWhichId 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 nItemId, - SfxItemType eItemType ) - : SfxPoolItem( nItemId, eItemType ), + sal_Int32 nT, sal_Int32 nB, TypedWhichId 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 _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 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 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 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 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 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 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(0));} SvxPageItem::SvxPageItem( const TypedWhichId 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 _nWhich ) - : SfxStringItem(_nWhich, SfxItemType::SvxPostItDateItemType) + : SfxStringItem(_nWhich) { } SvxPostItDateItem::SvxPostItDateItem( const OUString& rDate, TypedWhichId _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 _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 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 _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 _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(nWhich), rName, SfxItemType::NameOrIndexType) {} + DECLARE_ITEM_TYPE_FUNCTION(SampleItem) + SampleItem(sal_uInt16 nWhich, const OUString& rName) : NameOrIndex(TypedWhichId(nWhich), rName) {} - bool operator==(const SfxPoolItem& rCmp) const + bool operator==(const SfxPoolItem& rCmp) const override { assert(dynamic_cast(&rCmp) && "comparing different pool item subclasses"); auto const & rOther = static_cast(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 StringMap; -NameOrIndex::NameOrIndex(TypedWhichId _nWhich, sal_Int32 nIndex, SfxItemType eItemType) : - SfxStringItem(_nWhich, OUString(), eItemType), +NameOrIndex::NameOrIndex(TypedWhichId _nWhich, sal_Int32 nIndex) : + SfxStringItem(_nWhich, OUString()), m_nPalIndex(nIndex) { setNameOrIndex(); } -NameOrIndex::NameOrIndex(TypedWhichId _nWhich, const OUString& rName, SfxItemType eItemType) : - SfxStringItem(_nWhich, rName, eItemType), +NameOrIndex::NameOrIndex(TypedWhichId _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 _nWhich, sal_Int32 nIndex, const Color& rTheColor, SfxItemType eItemType) : - NameOrIndex(_nWhich, nIndex, eItemType), +XColorItem::XColorItem(TypedWhichId _nWhich, sal_Int32 nIndex, const Color& rTheColor) : + NameOrIndex(_nWhich, nIndex), m_aColor(rTheColor) { } -XColorItem::XColorItem(TypedWhichId _nWhich, const OUString& rName, const Color& rTheColor, SfxItemType eItemType) : - NameOrIndex(_nWhich, rName, eItemType), +XColorItem::XColorItem(TypedWhichId _nWhich, const OUString& rName, const Color& rTheColor) : + NameOrIndex(_nWhich, rName), m_aColor(rTheColor) { } -XColorItem::XColorItem(TypedWhichId _nWhich, const Color& rTheColor, SfxItemType eItemType) - : NameOrIndex(_nWhich, OUString(), eItemType) +XColorItem::XColorItem(TypedWhichId _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::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::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 nWhich, - SfxItemType eItemType) : - NameOrIndex(nWhich, nIndex, eItemType), + TypedWhichId nWhich) : + NameOrIndex(nWhich, nIndex), m_aGradient(rTheGradient) { } XFillGradientItem::XFillGradientItem(const OUString& rName, const basegfx::BGradient& rTheGradient, - TypedWhichId nWhich, - SfxItemType eItemType) - : NameOrIndex(nWhich, rName, eItemType) + TypedWhichId nWhich) + : NameOrIndex(nWhich, rName) , m_aGradient(rTheGradient) { } @@ -2232,9 +2230,8 @@ XFillGradientItem::XFillGradientItem(const XFillGradientItem& rItem) : } XFillGradientItem::XFillGradientItem( const basegfx::BGradient& rTheGradient, - TypedWhichId nWhich, - SfxItemType eItemType ) -: NameOrIndex( nWhich, -1, eItemType ), + TypedWhichId 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::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( *pItemPool ), - SfxItemType::XLineAttrSetItemType) + SfxItemSetFixed( *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( *pItemPool ), - SfxItemType::XFillAttrSetItemType) + SfxItemSetFixed( *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 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) { } diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx index 5c9d1f8b9c71..6da1f80bc61d 100644 --- a/sw/inc/ccoll.hxx +++ b/sw/inc/ccoll.hxx @@ -43,6 +43,7 @@ class SW_DLLPUBLIC SwCondCollItem final : public SfxPoolItem OUString m_sStyles[COND_COMMAND_COUNT]; public: + DECLARE_ITEM_TYPE_FUNCTION(SwCondCollItem) SwCondCollItem(); virtual ~SwCondCollItem() override; diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx index 854f755636bd..a84760f20034 100644 --- a/sw/inc/cellatr.hxx +++ b/sw/inc/cellatr.hxx @@ -38,6 +38,7 @@ constexpr sal_uInt32 getSwDefaultTextFormat() { return NF_STANDARD_FORMAT_TEXT; class SW_DLLPUBLIC SwTableBoxNumFormat final : public SfxUInt32Item { public: + DECLARE_ITEM_TYPE_FUNCTION(SwTableBoxNumFormat) SwTableBoxNumFormat( sal_uInt32 nFormat = getSwDefaultTextFormat() ); // "pure virtual methods" of SfxPoolItem @@ -57,6 +58,7 @@ class SW_DLLPUBLIC SwTableBoxFormula final : public SfxPoolItem, public SwTableF // can only be TableBoxFormat public: + DECLARE_ITEM_TYPE_FUNCTION(SwTableBoxFormula) SwTableBoxFormula( const OUString& rFormula ); // "pure virtual methods" of SfxPoolItem @@ -96,6 +98,7 @@ class SW_DLLPUBLIC SwTableBoxValue final : public SfxPoolItem { double m_nValue; public: + DECLARE_ITEM_TYPE_FUNCTION(SwTableBoxValue) SwTableBoxValue(); SwTableBoxValue( const double aVal ); diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index 0a937b57e0f2..96c5f9b3d905 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -36,6 +36,7 @@ class SW_DLLPUBLIC SwFormatCharFormat final : public SfxPoolItem, public SwClien public: /// single argument ctors shall be explicit. + DECLARE_ITEM_TYPE_FUNCTION(SwFormatCharFormat) explicit SwFormatCharFormat( SwCharFormat *pFormat ); virtual ~SwFormatCharFormat() override; diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index fb6702378b66..0b5eaf85c842 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -46,6 +46,7 @@ class SW_DLLPUBLIC SwFormatAnchor final : public SfxPoolItem static sal_uInt32 s_nOrderCounter; public: + DECLARE_ITEM_TYPE_FUNCTION(SwFormatAnchor) SwFormatAnchor( RndStdIds eRnd = RndStdIds::FLY_AT_PAGE, sal_uInt16 nPageNum = 0 ); SwFormatAnchor( const SwFormatAnchor &rCpy ); virtual ~SwFormatAnchor() override; diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index 85a67ef9ebb2..d7d123e8833d 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -34,11 +34,9 @@ class SW_DLLPUBLIC SwFormatAutoFormat final : public SfxPoolItem std::shared_ptr mpHandle; public: + DECLARE_ITEM_TYPE_FUNCTION(SwFormatAutoFormat) SwFormatAutoFormat( sal_uInt16 nWhich = RES_TXTATR_AUTOFMT ); -public: - - /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; virtual SwFormatAutoFormat* Clone( SfxItemPool* pPool = nullptr ) const override; diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx index 5ffc709896cf..c073dc69361c 100644 --- a/sw/inc/fmtclbl.hxx +++ b/sw/inc/fmtclbl.hxx @@ -28,8 +28,9 @@ class SW_DLLPUBLIC SwFormatNoBalancedColumns final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SwFormatNoBalancedColumns) SwFormatNoBalancedColumns( bool bFlag = false ) - : SfxBoolItem( RES_COLUMNBALANCE, bFlag, SfxItemType::SwFormatNoBalancedColumnsType ) {} + : SfxBoolItem( RES_COLUMNBALANCE, bFlag ) {} /// "pure virtual methods" of SfxPoolItem virtual SwFormatNoBalancedColumns* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index d2b34192b48d..e9d3fd3bcbdf 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -92,6 +92,7 @@ class SW_DLLPUBLIC SwFormatCol final : public SfxPoolItem SAL_DLLPRIVATE void Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct ); public: + DECLARE_ITEM_TYPE_FUNCTION(SwFormatCol) SwFormatCol(); SwFormatCol( const SwFormatCol& ); virtual ~SwFormatCol() override; diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index 2d16e5e22a00..8035118834c1 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -34,7 +34,8 @@ class SW_DLLPUBLIC SwFormatChain final : public SfxPoolItem m_aNext; ///< Next SwFlyFrameFormat (if existent). public: - SwFormatChain() : SfxPoolItem( RES_CHAIN, SfxItemType::SwFormatChainType ) {} + DECLARE_ITEM_TYPE_FUNCTION(SwFormatChain) + SwFormatChain() : SfxPoolItem( RES_CHAIN ) {} SwFormatChain( const SwFormatChain &rCpy ); inline SwFormatChain &operator=( const SwFormatChain& ); diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx index 3765e0a2e4a0..2f2399e9fd1d 100644 --- a/sw/inc/fmtcntnt.hxx +++ b/sw/inc/fmtcntnt.hxx @@ -35,6 +35,7 @@ class SAL_DLLPUBLIC_RTTI SwFormatContent final : public SfxPoolItem SwFormatContent &operator=( const SwFormatContent & ) = delete; public: + DECLARE_ITEM_TYPE_FUNCTION(SwFormatContent) SwFormatContent( const SwStartNode* pStartNode = nullptr ); SwFormatContent( const SwFormatContent &rCpy ); virtual ~SwFormatContent() override; diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx index a971d71cc2ca..168f4837b97a 100644 --- a/sw/inc/fmteiro.hxx +++ b/sw/inc/fmteiro.hxx @@ -34,8 +34,9 @@ class IntlWrapper; class SW_DLLPUBLIC SwFormatEditInReadonly final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SwFormatEditInReadonly) SwFormatEditInReadonly( sal_uInt16 nId = RES_EDIT_IN_READONLY, - bool bPrt = false ) : SfxBoolItem( nId, bPrt, SfxItemType::SwFormatEditInReadonly ) {} + bool bPrt = false ) : SfxBoolItem( nId, bPrt ) {} /// "pure virtual method" of SfxPoolItem virtual SwFormatEditInReadonly* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx index 21b8bf33b6f2..a0dcfd05efd3 100644 --- a/sw/inc/fmtflcnt.hxx +++ b/sw/inc/fmtflcnt.hxx @@ -37,6 +37,7 @@ class SAL_DLLPUBLIC_RTTI SwFormatFlyCnt final : public SfxPoolItem SwFormatFlyCnt& operator=(const SwFormatFlyCnt& rFlyCnt) = delete; public: + DECLARE_ITEM_TYPE_FUNCTION(SwFormatFlyCnt) SwFormatFlyCnt( SwFrameFormat *pFrameFormat ); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx index 3976152b5822..ca5280a87a0b 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -117,6 +117,7 @@ class SW_DLLPUBLIC SwFormatField final public: /// Single argument constructors shall be explicit. + DECLARE_ITEM_TYPE_FUNCTION(SwFormatField) explicit SwFormatField( const SwField &rField ); SwFormatField( const SwFormatField& rAttr ); diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx index b4e1fc599cab..9539037fb6c1 100644 --- a/sw/inc/fmtfollowtextflow.hxx +++ b/sw/inc/fmtfollowtextflow.hxx @@ -32,9 +32,9 @@ class IntlWrapper; class SW_DLLPUBLIC SwFormatFollowTextFlow final : public SfxBoolItem { public: - + DECLARE_ITEM_TYPE_FUNCTION(SwFormatFollowTextFlow) SwFormatFollowTextFlow( bool bFlag = false ) - : SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag, SfxItemType::SwFormatFollowTextFlowType ) + : SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag ) {} /// "pure virtual methods" of SfxPoolItem diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx index 2334e8f91165..9d063d2dfff1 100644 --- a/sw/inc/fmtfordr.hxx +++ b/sw/inc/fmtfordr.hxx @@ -39,6 +39,7 @@ enum SwFillOrder class SwFormatFillOrder final : public SfxEnumItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SwFormatFillOrder) SwFormatFillOrder( SwFillOrder = ATT_TOP_DOWN ); /// "Pure virtual methods" of SfxPoolItem. diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index 5828b1e79ff0..ab9c69c992e8 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -73,6 +73,7 @@ class SW_DLLPUBLIC SwFormatFrameSize final : public SvxSizeItem bool HasMetrics() const override; public: + DECLARE_ITEM_TYPE_FUNCTION(SwFormatFrameSize) SwFormatFrameSize( SwFrameSize eSize = SwFrameSize::Variable, SwTwips nWidth = 0, SwTwips nHeight = 0 ); diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx index 689fca574af0..c751ee03a730 100644 --- a/sw/inc/fmtftn.hxx +++ b/sw/inc/fmtftn.hxx @@ -59,6 +59,7 @@ class SW_DLLPUBLIC SwFormatFootnote final SwFormatFootnote( const SwFormatFootnote& ) = delete; public: + DECLARE_ITEM_TYPE_FUNCTION(SwFormatFootnote) SwFormatFootnote( bool bEndNote = false ); virtual ~SwFormatFootnote() override; diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx index e99aaa0e4946..26106ef6aae9 100644 --- a/sw/inc/fmtftntx.hxx +++ b/sw/inc/fmtftntx.hxx @@ -48,7 +48,7 @@ class SW_DLLPUBLIC SwFormatFootnoteEndAtTextEnd : public SfxEnumItem i_pMeta, const sal_uInt16 i_nWhich ); virtual ~SwFormatMeta() override; diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index bbad533a8d0e..c257e687d1e4 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -39,6 +39,7 @@ class SW_DLLPUBLIC SwFormatVertOrient final : public SfxPoolItem sal_Int16 m_eOrient; sal_Int16 m_eRelation; public: + DECLARE_ITEM_TYPE_FUNCTION(SwFormatVertOrient) SwFormatVertOrient( SwTwips nY = 0, sal_Int16 eVert = css::text::VertOrientation::NONE, sal_Int16 eRel = css::text::RelOrientation::PRINT_AREA ); SwFormatVertOrient(SwFormatVertOrient const &) = default; // SfxPoolItem copy function dichotomy @@ -83,6 +84,7 @@ class SW_DLLPUBLIC SwFormatHoriOrient final : public SfxPoolItem sal_Int16 m_eRelation; bool m_bPosToggle : 1; ///< Flip position on even pages. public: + DECLARE_ITEM_TYPE_FUNCTION(SwFormatHoriOrient) SwFormatHoriOrient( SwTwips nX = 0, sal_Int16 eHori = css::text::HoriOrientation::NONE, sal_Int16 eRel = css::text::RelOrientation::PRINT_AREA, bool bPos = false ); SwFormatHoriOrient(SwFormatHoriOrient const &) = default; // SfxPoolItem copy function dichotomy diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index e72181468439..800868b09e5e 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -43,6 +43,7 @@ class SW_DLLPUBLIC SwFormatPageDesc final : public SfxPoolItem, public SwClient virtual void SwClientNotify( const SwModify&, const SfxHint& rHint ) override; public: + DECLARE_ITEM_TYPE_FUNCTION(SwFormatPageDesc) explicit SwFormatPageDesc( const SwPageDesc *pDesc = nullptr ); SwFormatPageDesc( const SwFormatPageDesc &rCpy ); SwFormatPageDesc &operator=( const SwFormatPageDesc &rCpy ); diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx index 8b44a19d162a..b5a7b96cddc1 100644 --- a/sw/inc/fmtrfmrk.hxx +++ b/sw/inc/fmtrfmrk.hxx @@ -48,6 +48,7 @@ class SAL_DLLPUBLIC_RTTI SwFormatRefMark final : public SfxPoolItem unotools::WeakReference m_wXReferenceMark; public: + DECLARE_ITEM_TYPE_FUNCTION(SwFormatRefMark) SwFormatRefMark( OUString aText ); SwFormatRefMark( const SwFormatRefMark& rRefMark ); virtual ~SwFormatRefMark( ) override; diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx index a3a53e2012a2..6de60a119c10 100644 --- a/sw/inc/fmtrowsplt.hxx +++ b/sw/inc/fmtrowsplt.hxx @@ -31,7 +31,8 @@ class IntlWrapper; class SW_DLLPUBLIC SwFormatRowSplit final : public SfxBoolItem { public: - SwFormatRowSplit( bool bSplit = true ) : SfxBoolItem( RES_ROW_SPLIT, bSplit, SfxItemType::SwFormatRowSplitType ) {} + DECLARE_ITEM_TYPE_FUNCTION(SwFormatRowSplit) + SwFormatRowSplit( bool bSplit = true ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {} // "pure virtual methods" of SfxPoolItem virtual SwFormatRowSplit* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index 6741102ed489..09ad479cc344 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -39,6 +39,7 @@ class SW_DLLPUBLIC SwFormatRuby final : public SfxPoolItem css::text::RubyAdjust m_eAdjustment; ///< Specific adjustment of the Ruby-ch. public: + DECLARE_ITEM_TYPE_FUNCTION(SwFormatRuby) SwFormatRuby( OUString aRubyText ); SwFormatRuby( const SwFormatRuby& rAttr ); virtual ~SwFormatRuby() override; diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index bb22af094214..12b60c8cd29e 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -36,6 +36,7 @@ class SW_DLLPUBLIC SwFormatSurround final : public SfxEnumItem& pContentControl, diff --git a/sw/inc/formatflysplit.hxx b/sw/inc/formatflysplit.hxx index 5f7dda675ed2..0152d7cd52b3 100644 --- a/sw/inc/formatflysplit.hxx +++ b/sw/inc/formatflysplit.hxx @@ -29,6 +29,7 @@ class SW_DLLPUBLIC SwFormatFlySplit final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SwFormatFlySplit) SwFormatFlySplit(bool bSplit = false); SwFormatFlySplit* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/sw/inc/formatlinebreak.hxx b/sw/inc/formatlinebreak.hxx index a5b7ba9f4a5e..c7c16e5faded 100644 --- a/sw/inc/formatlinebreak.hxx +++ b/sw/inc/formatlinebreak.hxx @@ -56,6 +56,7 @@ class SW_DLLPUBLIC SwFormatLineBreak final : public SfxEnumItem bool m_bGrfToggle; // Flip graphics on even pages. public: + DECLARE_ITEM_TYPE_FUNCTION(SwMirrorGrf) SwMirrorGrf( MirrorGraph eMiro = MirrorGraph::Dont ) - : SfxEnumItem( RES_GRFATR_MIRRORGRF, SfxItemType::SwMirrorGrfType, eMiro ), m_bGrfToggle( false ) + : SfxEnumItem( RES_GRFATR_MIRRORGRF, eMiro ), m_bGrfToggle( false ) {} // pure virtual methods of SfxPoolItem @@ -69,6 +70,7 @@ public: class SW_DLLPUBLIC SwCropGrf final : public SvxGrfCrop { public: + DECLARE_ITEM_TYPE_FUNCTION(SwCropGrf) SwCropGrf(); SwCropGrf( sal_Int32 nLeft, sal_Int32 nRight, sal_Int32 nTop, sal_Int32 nBottom ); @@ -87,8 +89,9 @@ private: static Degree10 checkAndCorrectValue(Degree10 nValue); public: + DECLARE_ITEM_TYPE_FUNCTION(SwRotationGrf) SwRotationGrf() - : SfxUInt16Item( RES_GRFATR_ROTATION, 0, SfxItemType::SwRotationGrfType ) + : SfxUInt16Item( RES_GRFATR_ROTATION, 0 ) {} SwRotationGrf( Degree10 nVal, const Size& rSz ); @@ -113,8 +116,9 @@ public: class SW_DLLPUBLIC SwLuminanceGrf final : public SfxInt16Item { public: + DECLARE_ITEM_TYPE_FUNCTION(SwLuminanceGrf) SwLuminanceGrf( sal_Int16 nVal = 0 ) - : SfxInt16Item( RES_GRFATR_LUMINANCE, nVal, SfxItemType::SwLuminanceGrfType ) + : SfxInt16Item( RES_GRFATR_LUMINANCE, nVal ) {} // pure virtual methods from SfxInt16Item @@ -129,8 +133,9 @@ public: class SW_DLLPUBLIC SwContrastGrf final : public SfxInt16Item { public: + DECLARE_ITEM_TYPE_FUNCTION(SwContrastGrf) SwContrastGrf( sal_Int16 nVal = 0 ) - : SfxInt16Item( RES_GRFATR_CONTRAST, nVal, SfxItemType::SwContrastGrfType ) + : SfxInt16Item( RES_GRFATR_CONTRAST, nVal ) {} // pure virtual methods from SfxInt16Item @@ -146,7 +151,7 @@ class SwChannelGrf : public SfxInt16Item { protected: SwChannelGrf( sal_Int16 nVal, sal_uInt16 nWhichL ) - : SfxInt16Item( nWhichL, nVal, SfxItemType::SwChannelGrfType ) + : SfxInt16Item( nWhichL, nVal ) {} public: @@ -161,6 +166,7 @@ public: class SwChannelRGrf final : public SwChannelGrf { public: + DECLARE_ITEM_TYPE_FUNCTION(SwChannelRGrf) SwChannelRGrf( sal_Int16 nVal = 0 ) : SwChannelGrf( nVal, RES_GRFATR_CHANNELR ) {} @@ -169,6 +175,7 @@ public: class SwChannelGGrf final : public SwChannelGrf { public: + DECLARE_ITEM_TYPE_FUNCTION(SwChannelGGrf) SwChannelGGrf( sal_Int16 nVal = 0 ) : SwChannelGrf( nVal, RES_GRFATR_CHANNELG ) {} @@ -177,6 +184,7 @@ public: class SwChannelBGrf final : public SwChannelGrf { public: + DECLARE_ITEM_TYPE_FUNCTION(SwChannelBGrf) SwChannelBGrf( sal_Int16 nVal = 0 ) : SwChannelGrf( nVal, RES_GRFATR_CHANNELB ) {} @@ -187,11 +195,12 @@ class SW_DLLPUBLIC SwGammaGrf final : public SfxPoolItem { double m_nValue; public: - SwGammaGrf() : SfxPoolItem( RES_GRFATR_GAMMA, SfxItemType::SwGammaGrfType ), m_nValue( 1.0 ) + DECLARE_ITEM_TYPE_FUNCTION(SwGammaGrf) + SwGammaGrf() : SfxPoolItem( RES_GRFATR_GAMMA ), m_nValue( 1.0 ) {} SwGammaGrf( const double& rVal ) - : SfxPoolItem( RES_GRFATR_GAMMA, SfxItemType::SwGammaGrfType ), m_nValue( rVal ) + : SfxPoolItem( RES_GRFATR_GAMMA ), m_nValue( rVal ) {} // pure virtual methods from SfxEnumItem @@ -216,8 +225,9 @@ public: class SwInvertGrf final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SwInvertGrf) SwInvertGrf( bool bVal = false ) - : SfxBoolItem( RES_GRFATR_INVERT, bVal, SfxItemType::SwInvertGrfType ) + : SfxBoolItem( RES_GRFATR_INVERT, bVal ) {} // pure virtual methods from SfxInt16Item @@ -232,8 +242,9 @@ public: class SwTransparencyGrf final : public SfxByteItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SwTransparencyGrf) SwTransparencyGrf( sal_Int8 nVal = 0 ) - : SfxByteItem( RES_GRFATR_TRANSPARENCY, nVal, SfxItemType::SwTransparencyGrfType ) + : SfxByteItem( RES_GRFATR_TRANSPARENCY, nVal ) {} // pure virtual methods from SfxInt16Item @@ -253,12 +264,13 @@ public: class SwDrawModeGrf_Base: public SfxEnumItem { protected: SwDrawModeGrf_Base(GraphicDrawMode nMode): - SfxEnumItem(RES_GRFATR_DRAWMODE, SfxItemType::SwDrawModeGrf_BaseType, nMode) {} + SfxEnumItem(RES_GRFATR_DRAWMODE, nMode) {} }; class SW_DLLPUBLIC SwDrawModeGrf final : public SwDrawModeGrf_Base { public: + DECLARE_ITEM_TYPE_FUNCTION(SwDrawModeGrf) SwDrawModeGrf( GraphicDrawMode nMode = GraphicDrawMode::Standard ) : SwDrawModeGrf_Base( nMode ) {} diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx index 1d1c85693290..4ef77ce27706 100644 --- a/sw/inc/hfspacingitem.hxx +++ b/sw/inc/hfspacingitem.hxx @@ -28,8 +28,9 @@ class IntlWrapper; class SW_DLLPUBLIC SwHeaderAndFooterEatSpacingItem final : public SfxBoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SwHeaderAndFooterEatSpacingItem) SwHeaderAndFooterEatSpacingItem( sal_uInt16 nId = RES_HEADER_FOOTER_EAT_SPACING, - bool bPrt = false ) : SfxBoolItem( nId, bPrt, SfxItemType::SwHeaderAndFooterEatSpacingItemType ) {} + bool bPrt = false ) : SfxBoolItem( nId, bPrt ) {} // "pure virtual methods" of SfxPoolItem virtual SwHeaderAndFooterEatSpacingItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index a1d4984b3fb0..f1815d27e8cc 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -46,6 +46,7 @@ class SwTableBox; class SwMsgPoolItem : public SfxPoolItem { public: + DECLARE_ITEM_TYPE_FUNCTION(SwMsgPoolItem) SwMsgPoolItem( sal_uInt16 nWhich ); // "Overhead" of SfxPoolItem @@ -60,6 +61,7 @@ class SwPtrMsgPoolItem final : public SwMsgPoolItem public: void * pObject; + DECLARE_ITEM_TYPE_FUNCTION(SwPtrMsgPoolItem) SwPtrMsgPoolItem( sal_uInt16 nId, void * pObj ) : SwMsgPoolItem( nId ), pObject( pObj ) {} @@ -330,6 +332,7 @@ private: std::vector m_aWhichFmtAttrs; // attributes changed inside RES_TXTATR_AUTOFMT public: + DECLARE_ITEM_TYPE_FUNCTION(SwUpdateAttr) SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW ); SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW, std::vector aW ); @@ -389,6 +392,7 @@ class SwAttrSetChg final : public SwMsgPoolItem SwAttrSet* m_pChgSet; ///< what has changed const SwAttrSet* m_pTheChgdSet; ///< is only used to compare public: + DECLARE_ITEM_TYPE_FUNCTION(SwAttrSetChg) SwAttrSetChg( const SwAttrSet& rTheSet, SwAttrSet& rSet ); SwAttrSetChg( const SwAttrSetChg& ); virtual ~SwAttrSetChg() override; diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index eafdebad1712..a4eca3d6c1c2 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -75,6 +75,7 @@ class SW_DLLPUBLIC SwFormatDrop final : public SfxPoolItem, public SwClient public: static SfxPoolItem* CreateDefault(); + DECLARE_ITEM_TYPE_FUNCTION(SwFormatDrop) SwFormatDrop(); virtual ~SwFormatDrop() override; @@ -133,7 +134,7 @@ class SwRegisterItem final : public SfxBoolItem { public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SwRegisterItem) inline SwRegisterItem( const bool bRegister = false ); /// "pure virtual methods" of SfxPoolItem @@ -153,12 +154,12 @@ class SW_DLLPUBLIC SwNumRuleItem final : public SfxStringItem { public: static SfxPoolItem* CreateDefault(); - + DECLARE_ITEM_TYPE_FUNCTION(SwNumRuleItem) SwNumRuleItem() - : SfxStringItem( RES_PARATR_NUMRULE, OUString(), SfxItemType::SwNumRuleItemType ) {} + : SfxStringItem( RES_PARATR_NUMRULE, OUString() ) {} SwNumRuleItem( const OUString& rRuleName ) - : SfxStringItem( RES_PARATR_NUMRULE, rRuleName, SfxItemType::SwNumRuleItemType ) {} + : SfxStringItem( RES_PARATR_NUMRULE, rRuleName ) {} SwNumRuleItem(SwNumRuleItem const &) = default; // SfxPoolItem copy function dichotomy @@ -183,7 +184,7 @@ public: class SwParaConnectBorderItem final : public SfxBoolItem { public: - + DECLARE_ITEM_TYPE_FUNCTION(SwParaConnectBorderItem) inline SwParaConnectBorderItem( const bool bConnect = true ); /// "pure virtual methods" of SfxPoolItem diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index 3c37018192a4..0836fb731d8b 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -47,6 +47,7 @@ private: bool m_bSquaredMode; public: + DECLARE_ITEM_TYPE_FUNCTION(SwTextGridItem) SwTextGridItem(); virtual ~SwTextGridItem() override; diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 201e519d7404..6ce0514f8351 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -111,6 +111,7 @@ class SW_DLLPUBLIC SwTOXMark final public: // single argument ctors shall be explicit. + DECLARE_ITEM_TYPE_FUNCTION(SwTOXMark) explicit SwTOXMark( const SwTOXType* pTyp ); virtual ~SwTOXMark() override; diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx index f0a32b89f7c6..a14d28a55d2f 100644 --- a/sw/source/core/attr/cellatr.cxx +++ b/sw/source/core/attr/cellatr.cxx @@ -38,7 +38,7 @@ SwTableBoxNumFormat::SwTableBoxNumFormat( sal_uInt32 nFormat ) : SfxUInt32Item( RES_BOXATR_FORMAT, (((nFormat % SV_COUNTRY_LANGUAGE_OFFSET) == getSwDefaultTextFormat()) ? - getSwDefaultTextFormat() : nFormat), SfxItemType::SwTableBoxNumFormatType) + getSwDefaultTextFormat() : nFormat)) { } @@ -54,7 +54,7 @@ SwTableBoxNumFormat* SwTableBoxNumFormat::Clone( SfxItemPool* ) const } SwTableBoxFormula::SwTableBoxFormula( const OUString& rFormula ) - : SfxPoolItem( RES_BOXATR_FORMULA, SfxItemType::SwTableFormulaType ), + : SfxPoolItem( RES_BOXATR_FORMULA ), SwTableFormula( rFormula ), m_pDefinedIn( nullptr ) { @@ -156,12 +156,12 @@ void SwTableBoxFormula::Calc( SwTableCalcPara& rCalcPara, double& rValue ) } SwTableBoxValue::SwTableBoxValue() - : SfxPoolItem( RES_BOXATR_VALUE, SfxItemType::SwTableBoxValueType ), m_nValue( 0 ) + : SfxPoolItem( RES_BOXATR_VALUE ), m_nValue( 0 ) { } SwTableBoxValue::SwTableBoxValue( const double nVal ) - : SfxPoolItem( RES_BOXATR_VALUE, SfxItemType::SwTableBoxValueType ), m_nValue( nVal ) + : SfxPoolItem( RES_BOXATR_VALUE ), m_nValue( nVal ) { } diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx index 1ad109279a19..8f9abd96c775 100644 --- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx +++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star::uno; SwFormatWrapInfluenceOnObjPos::SwFormatWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition ) - : SfxPoolItem( RES_WRAP_INFLUENCE_ON_OBJPOS, SfxItemType::SwFormatWrapInfluenceOnOjPosType ), + : SfxPoolItem( RES_WRAP_INFLUENCE_ON_OBJPOS ), mnWrapInfluenceOnPosition( _nWrapInfluenceOnPosition ) { } diff --git a/sw/source/core/attr/formatflysplit.cxx b/sw/source/core/attr/formatflysplit.cxx index 76f8eb8ed451..6bcfd74390e1 100644 --- a/sw/source/core/attr/formatflysplit.cxx +++ b/sw/source/core/attr/formatflysplit.cxx @@ -22,7 +22,7 @@ #include SwFormatFlySplit::SwFormatFlySplit(bool bSplit) - : SfxBoolItem(RES_FLY_SPLIT, bSplit, SfxItemType::SwFormatFlySplitType) + : SfxBoolItem(RES_FLY_SPLIT, bSplit) { // Once this pool item is true, a floating table (text frame + table inside it) is meant to // split across multiple pages. diff --git a/sw/source/core/attr/formatwraptextatflystart.cxx b/sw/source/core/attr/formatwraptextatflystart.cxx index 898a24c97f5c..88a17d5ade33 100644 --- a/sw/source/core/attr/formatwraptextatflystart.cxx +++ b/sw/source/core/attr/formatwraptextatflystart.cxx @@ -22,7 +22,7 @@ #include SwFormatWrapTextAtFlyStart::SwFormatWrapTextAtFlyStart(bool bAtStart) - : SfxBoolItem(RES_WRAP_TEXT_AT_FLY_START, bAtStart, SfxItemType::SwFormatWrapTextAtFlyStartType) + : SfxBoolItem(RES_WRAP_TEXT_AT_FLY_START, bAtStart) { // Once this pool item is true, the text from the anchor text of the fly wraps an all pages, not // only on the last page of the fly chain. diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx index c75930ea76a5..bd3a14bf5c06 100644 --- a/sw/source/core/attr/hints.cxx +++ b/sw/source/core/attr/hints.cxx @@ -115,7 +115,7 @@ void SwAttrSetChg::ClearItem( sal_uInt16 nWhch ) #endif SwMsgPoolItem::SwMsgPoolItem( sal_uInt16 nWhch ) - : SfxPoolItem( nWhch, SfxItemType::SwMsgPoolItemType ) + : SfxPoolItem( nWhch ) { } diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx index e6b8b57847f1..959ee212e053 100644 --- a/sw/source/core/graphic/grfatr.cxx +++ b/sw/source/core/graphic/grfatr.cxx @@ -134,11 +134,11 @@ bool SwMirrorGrf::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } SwCropGrf::SwCropGrf() - : SvxGrfCrop( RES_GRFATR_CROPGRF, SfxItemType::SwCropGrfType ) + : SvxGrfCrop( RES_GRFATR_CROPGRF ) {} SwCropGrf::SwCropGrf(sal_Int32 nL, sal_Int32 nR, sal_Int32 nT, sal_Int32 nB ) - : SvxGrfCrop( nL, nR, nT, nB, RES_GRFATR_CROPGRF, SfxItemType::SwCropGrfType ) + : SvxGrfCrop( nL, nR, nT, nB, RES_GRFATR_CROPGRF ) {} SwCropGrf* SwCropGrf::Clone( SfxItemPool* ) const @@ -166,7 +166,7 @@ Degree10 SwRotationGrf::checkAndCorrectValue(Degree10 nValue) SwRotationGrf::SwRotationGrf( Degree10 nVal, const Size& rSz ) // tdf#115529 check and evtl. correct value -: SfxUInt16Item( RES_GRFATR_ROTATION, checkAndCorrectValue(nVal).get(), SfxItemType::SwRotationGrfType ), +: SfxUInt16Item( RES_GRFATR_ROTATION, checkAndCorrectValue(nVal).get() ), m_aUnrotatedSize( rSz ) { } diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 937b30d74e7e..c8c10a73661a 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -253,7 +253,7 @@ bool SwFormatFrameSize::HasMetrics() const { // Partially implemented inline in hxx SwFormatFrameSize::SwFormatFrameSize( SwFrameSize eSize, SwTwips nWidth, SwTwips nHeight ) - : SvxSizeItem( RES_FRM_SIZE, {nWidth, nHeight}, SfxItemType::SwFormatFrameSizeType ), + : SvxSizeItem( RES_FRM_SIZE, {nWidth, nHeight} ), m_eFrameHeightType( eSize ), m_eFrameWidthType( SwFrameSize::Fixed ) { @@ -493,7 +493,7 @@ void SwFormatFrameSize::dumpAsXml(xmlTextWriterPtr pWriter) const // Partially implemented inline in hxx SwFormatFillOrder::SwFormatFillOrder( SwFillOrder nFO ) - : SfxEnumItem( RES_FILL_ORDER, SfxItemType::SwFormatFillOrderType, nFO ) + : SfxEnumItem( RES_FILL_ORDER, nFO ) {} SwFormatFillOrder* SwFormatFillOrder::Clone( SfxItemPool* ) const @@ -508,21 +508,21 @@ sal_uInt16 SwFormatFillOrder::GetValueCount() const // Partially implemented inline in hxx SwFormatHeader::SwFormatHeader( SwFrameFormat *pHeaderFormat ) - : SfxPoolItem( RES_HEADER, SfxItemType::SwFormatHeaderType ), + : SfxPoolItem( RES_HEADER ), SwClient( pHeaderFormat ), m_bActive( pHeaderFormat ) { } SwFormatHeader::SwFormatHeader( const SwFormatHeader &rCpy ) - : SfxPoolItem( RES_HEADER, SfxItemType::SwFormatHeaderType ), + : SfxPoolItem( RES_HEADER ), SwClient( const_cast(static_cast(rCpy.GetRegisteredIn())) ), m_bActive( rCpy.IsActive() ) { } SwFormatHeader::SwFormatHeader( bool bOn ) - : SfxPoolItem( RES_HEADER, SfxItemType::SwFormatHeaderType ), + : SfxPoolItem( RES_HEADER ), SwClient( nullptr ), m_bActive( bOn ) { @@ -567,21 +567,21 @@ void SwFormatHeader::dumpAsXml(xmlTextWriterPtr pWriter) const // Partially implemented inline in hxx SwFormatFooter::SwFormatFooter( SwFrameFormat *pFooterFormat ) - : SfxPoolItem( RES_FOOTER, SfxItemType::SwFormatFooterType ), + : SfxPoolItem( RES_FOOTER ), SwClient( pFooterFormat ), m_bActive( pFooterFormat ) { } SwFormatFooter::SwFormatFooter( const SwFormatFooter &rCpy ) - : SfxPoolItem( RES_FOOTER, SfxItemType::SwFormatFooterType ), + : SfxPoolItem( RES_FOOTER ), SwClient( const_cast(static_cast(rCpy.GetRegisteredIn())) ), m_bActive( rCpy.IsActive() ) { } SwFormatFooter::SwFormatFooter( bool bOn ) - : SfxPoolItem( RES_FOOTER, SfxItemType::SwFormatFooterType ), + : SfxPoolItem( RES_FOOTER ), SwClient( nullptr ), m_bActive( bOn ) { @@ -626,14 +626,14 @@ void SwFormatFooter::dumpAsXml(xmlTextWriterPtr pWriter) const // Partially implemented inline in hxx SwFormatContent::SwFormatContent( const SwFormatContent &rCpy ) - : SfxPoolItem( RES_CNTNT, SfxItemType::SwFormatContentType ) + : SfxPoolItem( RES_CNTNT ) , m_oStartNode( rCpy.m_oStartNode ) { setNonShareable(); } SwFormatContent::SwFormatContent( const SwStartNode *pStartNd ) - : SfxPoolItem( RES_CNTNT, SfxItemType::SwFormatContentType ) + : SfxPoolItem( RES_CNTNT ) { setNonShareable(); if (pStartNd) @@ -680,7 +680,7 @@ void SwFormatContent::dumpAsXml(xmlTextWriterPtr pWriter) const // Partially implemented inline in hxx SwFormatPageDesc::SwFormatPageDesc( const SwFormatPageDesc &rCpy ) - : SfxPoolItem( RES_PAGEDESC, SfxItemType::SwFormatPageDescType ), + : SfxPoolItem( RES_PAGEDESC ), SwClient( const_cast(rCpy.GetPageDesc()) ), m_oNumOffset( rCpy.m_oNumOffset ), m_pDefinedIn( nullptr ) @@ -689,7 +689,7 @@ SwFormatPageDesc::SwFormatPageDesc( const SwFormatPageDesc &rCpy ) } SwFormatPageDesc::SwFormatPageDesc( const SwPageDesc *pDesc ) - : SfxPoolItem( RES_PAGEDESC, SfxItemType::SwFormatPageDescType ), + : SfxPoolItem( RES_PAGEDESC ), SwClient( const_cast(pDesc) ), m_pDefinedIn( nullptr ) { @@ -902,7 +902,7 @@ void SwColumn::dumpAsXml(xmlTextWriterPtr pWriter) const } SwFormatCol::SwFormatCol( const SwFormatCol& rCpy ) - : SfxPoolItem( RES_COL, SfxItemType::SwFormatColType ), + : SfxPoolItem( RES_COL ), m_eLineStyle( rCpy.m_eLineStyle ), m_nLineWidth( rCpy.m_nLineWidth), m_aLineColor( rCpy.m_aLineColor), @@ -944,7 +944,7 @@ SwFormatCol& SwFormatCol::operator=( const SwFormatCol& rCpy ) } SwFormatCol::SwFormatCol() - : SfxPoolItem( RES_COL, SfxItemType::SwFormatColType ) + : SfxPoolItem( RES_COL ) , m_eLineStyle( SvxBorderLineStyle::NONE) , m_nLineWidth(0), @@ -1332,7 +1332,7 @@ void SwFormatCol::dumpAsXml(xmlTextWriterPtr pWriter) const // Partially implemented inline in hxx SwFormatSurround::SwFormatSurround( css::text::WrapTextMode eFly ) : - SfxEnumItem( RES_SURROUND, SfxItemType::SwFormatSurroundType, eFly ) + SfxEnumItem( RES_SURROUND, eFly ) { m_bAnchorOnly = m_bContour = m_bOutside = false; } @@ -1453,7 +1453,7 @@ size_t SwFormatVertOrient::hashCode() const // Partially implemented inline in hxx SwFormatVertOrient::SwFormatVertOrient( SwTwips nY, sal_Int16 eVert, sal_Int16 eRel ) - : SfxPoolItem( RES_VERT_ORIENT, SfxItemType::SwFormatVertOrientType ), + : SfxPoolItem( RES_VERT_ORIENT ), m_nYPos( nY ), m_eOrient( eVert ), m_eRelation( eRel ) @@ -1561,7 +1561,7 @@ size_t SwFormatHoriOrient::hashCode() const // Partially implemented inline in hxx SwFormatHoriOrient::SwFormatHoriOrient( SwTwips nX, sal_Int16 eHori, sal_Int16 eRel, bool bPos ) - : SfxPoolItem( RES_HORI_ORIENT, SfxItemType::SwFormatHoriOrientType ), + : SfxPoolItem( RES_HORI_ORIENT ), m_nXPos( nX ), m_eOrient( eHori ), m_eRelation( eRel ), @@ -1661,7 +1661,7 @@ void SwFormatHoriOrient::dumpAsXml(xmlTextWriterPtr pWriter) const } SwFormatAnchor::SwFormatAnchor( RndStdIds nRnd, sal_uInt16 nPage ) - : SfxPoolItem( RES_ANCHOR, SfxItemType::SwFormatAnchorType ), + : SfxPoolItem( RES_ANCHOR ), m_eAnchorId( nRnd ), m_nPageNumber( nPage ), // OD 2004-05-05 #i28701# - get always new increased order number @@ -1678,7 +1678,7 @@ SwFormatAnchor::SwFormatAnchor( RndStdIds nRnd, sal_uInt16 nPage ) } SwFormatAnchor::SwFormatAnchor( const SwFormatAnchor &rCpy ) - : SfxPoolItem( RES_ANCHOR, SfxItemType::SwFormatAnchorType ) + : SfxPoolItem( RES_ANCHOR ) , m_oContentAnchor( rCpy.m_oContentAnchor ) , m_eAnchorId( rCpy.m_eAnchorId ) , m_nPageNumber( rCpy.m_nPageNumber ) @@ -1930,13 +1930,13 @@ void SwFormatAnchor::dumpAsXml(xmlTextWriterPtr pWriter) const // Partially implemented inline in hxx SwFormatURL::SwFormatURL() : - SfxPoolItem( RES_URL, SfxItemType::SwFormatURLType ), + SfxPoolItem( RES_URL ), m_bIsServerMap( false ) { } SwFormatURL::SwFormatURL( const SwFormatURL &rURL) : - SfxPoolItem( RES_URL, SfxItemType::SwFormatURLType ), + SfxPoolItem( RES_URL ), m_sTargetFrameName( rURL.GetTargetFrameName() ), m_sURL( rURL.GetURL() ), m_sName( rURL.GetName() ), @@ -2264,7 +2264,7 @@ bool SwFormatChain::operator==( const SfxPoolItem &rAttr ) const } SwFormatChain::SwFormatChain( const SwFormatChain &rCpy ) : - SfxPoolItem( RES_CHAIN, SfxItemType::SwFormatChainType ) + SfxPoolItem( RES_CHAIN ) { setNonShareable(); SetPrev( rCpy.GetPrev() ); @@ -2320,7 +2320,7 @@ bool SwFormatChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const } SwFormatLineNumber::SwFormatLineNumber() : - SfxPoolItem( RES_LINENUMBER, SfxItemType::SwFormatLineNumberType ) + SfxPoolItem( RES_LINENUMBER ) { m_nStartValue = 0; m_bCountLines = true; @@ -2390,7 +2390,7 @@ bool SwFormatLineNumber::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } SwTextGridItem::SwTextGridItem() - : SfxPoolItem( RES_TEXTGRID, SfxItemType::SwTextGridItemType ) + : SfxPoolItem( RES_TEXTGRID ) , m_aColor( COL_LIGHTGRAY ), m_nLines( 20 ) , m_nBaseHeight( 400 ), m_nRubyHeight( 200 ), m_eGridType( GRID_NONE ) , m_bRubyTextBelow( false ), m_bPrintGrid( true ), m_bDisplayGrid( true ) diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx index 84c0afcb00fa..52763819a844 100644 --- a/sw/source/core/para/paratr.cxx +++ b/sw/source/core/para/paratr.cxx @@ -37,7 +37,7 @@ SfxPoolItem* SwRegisterItem::CreateDefault() { return new SwRegisterItem; } SfxPoolItem* SwNumRuleItem::CreateDefault() { return new SwNumRuleItem; } SwFormatDrop::SwFormatDrop() - : SfxPoolItem( RES_PARATR_DROP, SfxItemType::SwFormatDropType ), + : SfxPoolItem( RES_PARATR_DROP ), SwClient( nullptr ), m_pDefinedIn( nullptr ), m_nDistance( 0 ), @@ -49,7 +49,7 @@ SwFormatDrop::SwFormatDrop() } SwFormatDrop::SwFormatDrop( const SwFormatDrop &rCpy ) - : SfxPoolItem( RES_PARATR_DROP, SfxItemType::SwFormatDropType ), + : SfxPoolItem( RES_PARATR_DROP ), SwClient( rCpy.GetRegisteredInNonConst() ), m_pDefinedIn( nullptr ), m_nDistance( rCpy.GetDistance() ), diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index 54ac15c6e0b5..947901c416af 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -91,7 +91,7 @@ void lcl_FillAuthPattern(SwFormTokens &rAuthTokens, sal_uInt16 nTypeId) /// pool default constructor SwTOXMark::SwTOXMark() - : SfxPoolItem(RES_TXTATR_TOXMARK, SfxItemType::SwTOXMarkType) + : SfxPoolItem(RES_TXTATR_TOXMARK) , m_pType(nullptr) , m_pTextAttr(nullptr) , m_nLevel(0) @@ -102,7 +102,7 @@ SwTOXMark::SwTOXMark() } SwTOXMark::SwTOXMark(const SwTOXType* pType) - : SfxPoolItem(RES_TXTATR_TOXMARK, SfxItemType::SwTOXMarkType) + : SfxPoolItem(RES_TXTATR_TOXMARK) , m_pType(pType) , m_pTextAttr(nullptr) , m_nLevel(0) @@ -114,7 +114,7 @@ SwTOXMark::SwTOXMark(const SwTOXType* pType) } SwTOXMark::SwTOXMark(const SwTOXMark& rCopy) - : SfxPoolItem(RES_TXTATR_TOXMARK, SfxItemType::SwTOXMarkType) + : SfxPoolItem(RES_TXTATR_TOXMARK) , SvtListener() , m_pType(rCopy.m_pType) , m_aPrimaryKey(rCopy.m_aPrimaryKey) diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index 09522e628815..356fbd5879a3 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -46,7 +46,7 @@ // constructor for default item in attribute-pool SwFormatField::SwFormatField( sal_uInt16 nWhich ) - : SfxPoolItem( nWhich, SfxItemType::SwFormatFieldType ) + : SfxPoolItem( nWhich ) , SfxBroadcaster() , mpTextField( nullptr ) { @@ -54,7 +54,7 @@ SwFormatField::SwFormatField( sal_uInt16 nWhich ) } SwFormatField::SwFormatField( const SwField &rField ) - : SfxPoolItem( RES_TXTATR_FIELD, SfxItemType::SwFormatFieldType ) + : SfxPoolItem( RES_TXTATR_FIELD ) , SfxBroadcaster() , mpField( rField.CopyField() ) , mpTextField( nullptr ) diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx index a548e2810610..5047314e926e 100644 --- a/sw/source/core/txtnode/atrflyin.cxx +++ b/sw/source/core/txtnode/atrflyin.cxx @@ -37,7 +37,7 @@ #include SwFormatFlyCnt::SwFormatFlyCnt( SwFrameFormat *pFrameFormat ) - : SfxPoolItem( RES_TXTATR_FLYCNT, SfxItemType::SwFormatFlyCntType ), + : SfxPoolItem( RES_TXTATR_FLYCNT ), m_pTextAttr( nullptr ), m_pFormat( pFrameFormat ) { diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx index ef2130fd1686..761564f0860b 100644 --- a/sw/source/core/txtnode/atrftn.cxx +++ b/sw/source/core/txtnode/atrftn.cxx @@ -124,7 +124,7 @@ namespace { } SwFormatFootnote::SwFormatFootnote( bool bEndNote ) - : SfxPoolItem( RES_TXTATR_FTN, SfxItemType::SwFormatFootnoteType ) + : SfxPoolItem( RES_TXTATR_FTN ) , m_pTextAttr(nullptr) , m_nNumber(0) , m_nNumberRLHidden(0) diff --git a/sw/source/core/txtnode/atrref.cxx b/sw/source/core/txtnode/atrref.cxx index 038374ae4097..46e4cf70c579 100644 --- a/sw/source/core/txtnode/atrref.cxx +++ b/sw/source/core/txtnode/atrref.cxx @@ -41,7 +41,7 @@ SwFormatRefMark::~SwFormatRefMark( ) } SwFormatRefMark::SwFormatRefMark( OUString aName ) - : SfxPoolItem(RES_TXTATR_REFMARK, SfxItemType::SwFormatRefMarkType) + : SfxPoolItem(RES_TXTATR_REFMARK) , m_pTextAttr(nullptr) , m_aRefName(std::move(aName)) { @@ -49,7 +49,7 @@ SwFormatRefMark::SwFormatRefMark( OUString aName ) } SwFormatRefMark::SwFormatRefMark( const SwFormatRefMark& rAttr ) - : SfxPoolItem(RES_TXTATR_REFMARK, SfxItemType::SwFormatRefMarkType) + : SfxPoolItem(RES_TXTATR_REFMARK) , m_pTextAttr(nullptr) , m_aRefName(rAttr.m_aRefName) { diff --git a/sw/source/core/txtnode/attrcontentcontrol.cxx b/sw/source/core/txtnode/attrcontentcontrol.cxx index c0920b382cef..28c03298ca46 100644 --- a/sw/source/core/txtnode/attrcontentcontrol.cxx +++ b/sw/source/core/txtnode/attrcontentcontrol.cxx @@ -47,7 +47,7 @@ SwFormatContentControl* SwFormatContentControl::CreatePoolDefault(sal_uInt16 nWh } SwFormatContentControl::SwFormatContentControl(sal_uInt16 nWhich) - : SfxPoolItem(nWhich, SfxItemType::SwFormatContentControlType) + : SfxPoolItem(nWhich) , m_pTextAttr(nullptr) { setNonShareable(); @@ -55,7 +55,7 @@ SwFormatContentControl::SwFormatContentControl(sal_uInt16 nWhich) SwFormatContentControl::SwFormatContentControl( const std::shared_ptr& pContentControl, sal_uInt16 nWhich) - : SfxPoolItem(nWhich, SfxItemType::SwFormatContentControlType) + : SfxPoolItem(nWhich) , m_pContentControl(pContentControl) , m_pTextAttr(nullptr) { diff --git a/sw/source/core/txtnode/attrlinebreak.cxx b/sw/source/core/txtnode/attrlinebreak.cxx index 33df722392eb..ad4ec308dc27 100644 --- a/sw/source/core/txtnode/attrlinebreak.cxx +++ b/sw/source/core/txtnode/attrlinebreak.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star; SwFormatLineBreak::SwFormatLineBreak(SwLineBreakClear eClear) - : SfxEnumItem(RES_TXTATR_LINEBREAK, SfxItemType::SwFormatLinebreakType, eClear) + : SfxEnumItem(RES_TXTATR_LINEBREAK, eClear) , sw::BroadcastingModify() , m_pTextAttr(nullptr) { diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index 82ae6caf4854..1968d2816802 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -60,7 +60,7 @@ using namespace ::com::sun::star; SfxPoolItem* SwFormatINetFormat::CreateDefault() { return new SwFormatINetFormat; } SwFormatCharFormat::SwFormatCharFormat( SwCharFormat *pFormat ) - : SfxPoolItem( RES_TXTATR_CHARFMT, SfxItemType::SwFormatCharFormatType ), + : SfxPoolItem( RES_TXTATR_CHARFMT ), SwClient(pFormat), m_pTextAttribute( nullptr ) { @@ -68,7 +68,7 @@ SwFormatCharFormat::SwFormatCharFormat( SwCharFormat *pFormat ) } SwFormatCharFormat::SwFormatCharFormat( const SwFormatCharFormat& rAttr ) - : SfxPoolItem( RES_TXTATR_CHARFMT, SfxItemType::SwFormatCharFormatType ), + : SfxPoolItem( RES_TXTATR_CHARFMT ), SwClient( rAttr.GetCharFormat() ), m_pTextAttribute( nullptr ) { @@ -136,7 +136,7 @@ void SwFormatCharFormat::dumpAsXml(xmlTextWriterPtr pWriter) const } SwFormatAutoFormat::SwFormatAutoFormat( sal_uInt16 nInitWhich ) - : SfxPoolItem( nInitWhich, SfxItemType::SwFormatAutoFormatType ) + : SfxPoolItem( nInitWhich ) { setNonShareable(); } @@ -177,7 +177,7 @@ void SwFormatAutoFormat::dumpAsXml(xmlTextWriterPtr pWriter) const } SwFormatINetFormat::SwFormatINetFormat() - : SfxPoolItem( RES_TXTATR_INETFMT, SfxItemType::SwFormatINetFormatType ) + : SfxPoolItem( RES_TXTATR_INETFMT ) , msURL() , msTargetFrame() , msINetFormatName() @@ -191,7 +191,7 @@ SwFormatINetFormat::SwFormatINetFormat() } SwFormatINetFormat::SwFormatINetFormat( OUString aURL, OUString aTarget ) - : SfxPoolItem( RES_TXTATR_INETFMT, SfxItemType::SwFormatINetFormatType ) + : SfxPoolItem( RES_TXTATR_INETFMT ) , msURL( std::move(aURL) ) , msTargetFrame( std::move(aTarget) ) , msINetFormatName() @@ -207,7 +207,7 @@ SwFormatINetFormat::SwFormatINetFormat( OUString aURL, OUString aTarget ) } SwFormatINetFormat::SwFormatINetFormat( const SwFormatINetFormat& rAttr ) - : SfxPoolItem( RES_TXTATR_INETFMT, SfxItemType::SwFormatINetFormatType ) + : SfxPoolItem( RES_TXTATR_INETFMT ) , sw::BroadcasterMixin() , msURL( rAttr.GetValue() ) , msTargetFrame( rAttr.msTargetFrame ) @@ -415,7 +415,7 @@ bool SwFormatINetFormat::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } SwFormatRuby::SwFormatRuby( OUString aRubyText ) - : SfxPoolItem( RES_TXTATR_CJK_RUBY, SfxItemType::SwFormatRubyType ), + : SfxPoolItem( RES_TXTATR_CJK_RUBY ), m_sRubyText( std::move(aRubyText) ), m_pTextAttr( nullptr ), m_nCharFormatId( 0 ), @@ -426,7 +426,7 @@ SwFormatRuby::SwFormatRuby( OUString aRubyText ) } SwFormatRuby::SwFormatRuby( const SwFormatRuby& rAttr ) - : SfxPoolItem( RES_TXTATR_CJK_RUBY, SfxItemType::SwFormatRubyType ), + : SfxPoolItem( RES_TXTATR_CJK_RUBY ), m_sRubyText( rAttr.m_sRubyText ), m_sCharFormatName( rAttr.m_sCharFormatName ), m_pTextAttr( nullptr ), @@ -575,7 +575,7 @@ SwFormatMeta * SwFormatMeta::CreatePoolDefault(const sal_uInt16 i_nWhich) } SwFormatMeta::SwFormatMeta(const sal_uInt16 i_nWhich) - : SfxPoolItem( i_nWhich, SfxItemType::SwFormatMetaType ) + : SfxPoolItem( i_nWhich ) , m_pMeta() , m_pTextAttr( nullptr ) { @@ -586,7 +586,7 @@ SwFormatMeta::SwFormatMeta(const sal_uInt16 i_nWhich) SwFormatMeta::SwFormatMeta( std::shared_ptr< ::sw::Meta > i_pMeta, const sal_uInt16 i_nWhich ) - : SfxPoolItem( i_nWhich, SfxItemType::SwFormatMetaType ) + : SfxPoolItem( i_nWhich ) , m_pMeta( std::move(i_pMeta) ) , m_pTextAttr( nullptr ) { diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index 1743b68e72b2..96a43613e1f1 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -847,7 +847,7 @@ void SwFltControlStack::Delete(const SwPaM &rPam) // methods of SwFltAnchor follow SwFltAnchor::SwFltAnchor(SwFrameFormat* pFormat) : - SfxPoolItem(RES_FLTR_ANCHOR, SfxItemType::SwFltAnchorType) + SfxPoolItem(RES_FLTR_ANCHOR) , m_pFrameFormat(pFormat) { m_pListener.reset(new SwFltAnchorListener(this)); @@ -855,7 +855,7 @@ SwFltAnchor::SwFltAnchor(SwFrameFormat* pFormat) : } SwFltAnchor::SwFltAnchor(const SwFltAnchor& rCpy) : - SfxPoolItem(RES_FLTR_ANCHOR, SfxItemType::SwFltAnchorType) + SfxPoolItem(RES_FLTR_ANCHOR) , m_pFrameFormat(rCpy.m_pFrameFormat) { m_pListener.reset(new SwFltAnchorListener(this)); @@ -922,7 +922,7 @@ SwFltRedline* SwFltRedline::Clone( SfxItemPool* ) const // methods of SwFltBookmark follow SwFltBookmark::SwFltBookmark( const OUString& rNa, OUString aVa, tools::Long nHand, const bool bIsTOCBookmark ) - : SfxPoolItem( RES_FLTR_BOOKMARK, SfxItemType::SwFltBookmarkType ) + : SfxPoolItem( RES_FLTR_BOOKMARK ) , mnHandle( nHand ) , maName( rNa ) , maVal(std::move( aVa )) @@ -954,7 +954,7 @@ SwFltBookmark* SwFltBookmark::Clone(SfxItemPool*) const } SwFltRDFMark::SwFltRDFMark() - : SfxPoolItem(RES_FLTR_RDFMARK, SfxItemType::SwFltRDFMarkType), + : SfxPoolItem(RES_FLTR_RDFMARK), m_nHandle(0) { } @@ -996,7 +996,7 @@ const std::vector< std::pair >& SwFltRDFMark::GetAttributes( // methods of SwFltTOX follow SwFltTOX::SwFltTOX(std::shared_ptr xBase) - : SfxPoolItem(RES_FLTR_TOX, SfxItemType::SwFltTOXType) + : SfxPoolItem(RES_FLTR_TOX) , m_xTOXBase(std::move(xBase)), m_bHadBreakItem( false ), m_bHadPageDescItem( false ) { diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index 3c65f59e5d6b..e53d5e42679c 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -169,6 +169,7 @@ class SW_DLLPUBLIC SwFltAnchor final : public SfxPoolItem std::unique_ptr m_pListener; public: + DECLARE_ITEM_TYPE_FUNCTION(SwFltAnchor) SwFltAnchor(SwFrameFormat* pFlyFormat); SwFltAnchor(const SwFltAnchor&); virtual ~SwFltAnchor() override; @@ -197,10 +198,11 @@ public: RedlineType m_eType; std::size_t m_nAutorNo; + DECLARE_ITEM_TYPE_FUNCTION(SwFltRedline) SwFltRedline(RedlineType eType_, std::size_t nAutorNo_, const DateTime& rStamp_) - : SfxPoolItem(RES_FLTR_REDLINE, SfxItemType::SwFltRedlineType) + : SfxPoolItem(RES_FLTR_REDLINE) , m_aStamp(rStamp_), m_eType(eType_), m_nAutorNo(nAutorNo_) @@ -222,6 +224,7 @@ private: bool mbIsTOCBookmark; public: + DECLARE_ITEM_TYPE_FUNCTION(SwFltBookmark) SwFltBookmark( const OUString& rNa, OUString aVa, tools::Long nHand, @@ -247,6 +250,7 @@ class SW_DLLPUBLIC SwFltRDFMark final : public SfxPoolItem std::vector< std::pair > m_aAttributes; public: + DECLARE_ITEM_TYPE_FUNCTION(SwFltRDFMark) SwFltRDFMark(); virtual bool operator==(const SfxPoolItem&) const override; @@ -264,6 +268,7 @@ class SW_DLLPUBLIC SwFltTOX final : public SfxPoolItem bool m_bHadBreakItem; // there was a break item BEFORE insertion of the TOX bool m_bHadPageDescItem; public: + DECLARE_ITEM_TYPE_FUNCTION(SwFltTOX) SwFltTOX(std::shared_ptr xBase); // "purely virtual methods" of SfxPoolItem virtual bool operator==(const SfxPoolItem&) const override; diff --git a/sw/source/uibase/chrdlg/ccoll.cxx b/sw/source/uibase/chrdlg/ccoll.cxx index 8f4d23647ddc..3bd7ab0b98d6 100644 --- a/sw/source/uibase/chrdlg/ccoll.cxx +++ b/sw/source/uibase/chrdlg/ccoll.cxx @@ -118,7 +118,7 @@ const CommandStruct SwCondCollItem::s_aCmds[] = // Item for the transport of the condition table SwCondCollItem::SwCondCollItem() : - SfxPoolItem(FN_COND_COLL, SfxItemType::SwCondCollItemType) + SfxPoolItem(FN_COND_COLL) { } diff --git a/sw/source/uibase/config/cfgitems.cxx b/sw/source/uibase/config/cfgitems.cxx index 33791054fe3a..42d5d830a29d 100644 --- a/sw/source/uibase/config/cfgitems.cxx +++ b/sw/source/uibase/config/cfgitems.cxx @@ -24,7 +24,7 @@ SwDocDisplayItem::SwDocDisplayItem() : - SfxPoolItem(FN_PARAM_DOCDISP, SfxItemType::SwDocDisplayItemType) + SfxPoolItem(FN_PARAM_DOCDISP) { m_bParagraphEnd = m_bTab = @@ -43,7 +43,7 @@ SwDocDisplayItem::SwDocDisplayItem() : // Item for the Settings dialog, page document view SwDocDisplayItem::SwDocDisplayItem(const SwViewOption& rVOpt ) : - SfxPoolItem( FN_PARAM_DOCDISP, SfxItemType::SwDocDisplayItemType ) + SfxPoolItem( FN_PARAM_DOCDISP ) { m_bParagraphEnd = rVOpt.IsParagraph(true); m_bTab = rVOpt.IsTab(true); @@ -104,7 +104,7 @@ void SwDocDisplayItem::FillViewOptions( SwViewOption& rVOpt) const } SwElemItem::SwElemItem() : - SfxPoolItem(FN_PARAM_ELEM, SfxItemType::SwElemItemType) + SfxPoolItem(FN_PARAM_ELEM) { m_bVertRuler = m_bVertRulerRight= @@ -126,7 +126,7 @@ SwElemItem::SwElemItem() : } SwElemItem::SwElemItem(const SwViewOption& rVOpt) : - SfxPoolItem( FN_PARAM_ELEM, SfxItemType::SwElemItemType ) + SfxPoolItem( FN_PARAM_ELEM ) { m_bVertRuler = rVOpt.IsViewVRuler(true); m_bVertRulerRight = rVOpt.IsVRulerRight(); @@ -204,13 +204,13 @@ void SwElemItem::FillViewOptions( SwViewOption& rVOpt) const // CTOR for empty Item SwAddPrinterItem::SwAddPrinterItem(): - SfxPoolItem(FN_PARAM_ADDPRINTER, SfxItemType::SwAddPrinterItemType) + SfxPoolItem(FN_PARAM_ADDPRINTER) { } // CTOR from SwPrintOptions SwAddPrinterItem::SwAddPrinterItem( const SwPrintData& rPrtData ) : - SfxPoolItem(FN_PARAM_ADDPRINTER, SfxItemType::SwAddPrinterItemType) + SfxPoolItem(FN_PARAM_ADDPRINTER) { SwPrintData::operator=(rPrtData); } @@ -231,14 +231,14 @@ bool SwAddPrinterItem::operator==( const SfxPoolItem& rAttr ) const // Item for Settings dialog, ShadowCursorPage SwShadowCursorItem::SwShadowCursorItem() - : SfxPoolItem( FN_PARAM_SHADOWCURSOR, SfxItemType::SwShadowCursorItemType ), + : SfxPoolItem( FN_PARAM_SHADOWCURSOR ), m_eMode( SwFillMode::Tab ) ,m_bOn( false ) { } SwShadowCursorItem::SwShadowCursorItem( const SwViewOption& rVOpt ) - : SfxPoolItem( FN_PARAM_SHADOWCURSOR, SfxItemType::SwShadowCursorItemType ), + : SfxPoolItem( FN_PARAM_SHADOWCURSOR ), m_eMode( rVOpt.GetShdwCursorFillMode() ) ,m_bOn( rVOpt.IsShadowCursor() ) @@ -264,13 +264,13 @@ void SwShadowCursorItem::FillViewOptions( SwViewOption& rVOpt ) const } SwFmtAidsAutoComplItem::SwFmtAidsAutoComplItem() - : SfxPoolItem(FN_PARAM_FMT_AIDS_AUTOCOMPL, SfxItemType::SwFmtAidsAutoComplItemType) + : SfxPoolItem(FN_PARAM_FMT_AIDS_AUTOCOMPL) , m_bEncloseWithCharactersOn(true) { } SwFmtAidsAutoComplItem::SwFmtAidsAutoComplItem(const SwViewOption& rVOpt) - : SfxPoolItem(FN_PARAM_FMT_AIDS_AUTOCOMPL, SfxItemType::SwFmtAidsAutoComplItemType) + : SfxPoolItem(FN_PARAM_FMT_AIDS_AUTOCOMPL) , m_bEncloseWithCharactersOn(rVOpt.IsEncloseWithCharactersOn()) { } diff --git a/sw/source/uibase/dialog/swwrtshitem.cxx b/sw/source/uibase/dialog/swwrtshitem.cxx index 833b9bfb3970..4c77b342e981 100644 --- a/sw/source/uibase/dialog/swwrtshitem.cxx +++ b/sw/source/uibase/dialog/swwrtshitem.cxx @@ -21,7 +21,7 @@ #include SwWrtShellItem::SwWrtShellItem( SwWrtShell* pSh ) - : SfxPoolItem( SID_WRT_SHELL, SfxItemType::SwWrtShellItemType ) + : SfxPoolItem( SID_WRT_SHELL ) , m_pWrtSh( pSh ) { diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx index d1ca1ab1ad23..48ed74c86635 100644 --- a/sw/source/uibase/envelp/envimg.cxx +++ b/sw/source/uibase/envelp/envimg.cxx @@ -88,7 +88,7 @@ OUString MakeSender() } SwEnvItem::SwEnvItem() : - SfxPoolItem(FN_ENVELOP, SfxItemType::SwEnvItemType) + SfxPoolItem(FN_ENVELOP) { m_bSend = true; m_aSendText = MakeSender(); diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx index 4fb5829bea24..50e0b13442cd 100644 --- a/sw/source/uibase/envelp/labimg.cxx +++ b/sw/source/uibase/envelp/labimg.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star::uno; SwLabItem::SwLabItem() : - SfxPoolItem(FN_LABEL, SfxItemType::SwLabItemType), + SfxPoolItem(FN_LABEL), m_lLeft (0), m_lUpper(0), m_nCols (1), diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx index 2619e6449e12..9102ac6757b6 100644 --- a/sw/source/uibase/inc/cfgitems.hxx +++ b/sw/source/uibase/inc/cfgitems.hxx @@ -60,6 +60,7 @@ class SW_DLLPUBLIC SwDocDisplayItem final : public SfxPoolItem sal_Int32 m_xDefaultAnchor; public: + DECLARE_ITEM_TYPE_FUNCTION(SwDocDisplayItem) SwDocDisplayItem(); SwDocDisplayItem( const SwViewOption& rVOpt ); @@ -96,6 +97,7 @@ class SW_DLLPUBLIC SwElemItem final : public SfxPoolItem friend class SwContentOptPage; public: + DECLARE_ITEM_TYPE_FUNCTION(SwElemItem) SwElemItem(); SwElemItem(const SwViewOption& rVOpt); @@ -122,6 +124,7 @@ class SW_DLLPUBLIC SwAddPrinterItem final : public SfxPoolItem, public SwPrintDa using SwPrintData::operator ==; public: + DECLARE_ITEM_TYPE_FUNCTION(SwAddPrinterItem) SwAddPrinterItem(); SwAddPrinterItem( const SwPrintData& rPrtData ); @@ -136,6 +139,7 @@ class SW_DLLPUBLIC SwShadowCursorItem final : public SfxPoolItem SwFillMode m_eMode; bool m_bOn; public: + DECLARE_ITEM_TYPE_FUNCTION(SwShadowCursorItem) SwShadowCursorItem(); SwShadowCursorItem( const SwViewOption& rVOpt ); @@ -159,6 +163,7 @@ class SW_DLLPUBLIC SwFmtAidsAutoComplItem final : public SfxPoolItem bool m_bEncloseWithCharactersOn; public: + DECLARE_ITEM_TYPE_FUNCTION(SwFmtAidsAutoComplItem) SwFmtAidsAutoComplItem(); SwFmtAidsAutoComplItem(const SwViewOption& rVOpt); @@ -190,7 +195,8 @@ class SW_DLLPUBLIC SwTestItem final : public SfxPoolItem bool m_bTest10:1; public: - SwTestItem() : SfxPoolItem(FN_PARAM_SWTEST, SfxItemType::SwTestItemType) {}; + DECLARE_ITEM_TYPE_FUNCTION(SwTestItem) + SwTestItem() : SfxPoolItem(FN_PARAM_SWTEST) {}; virtual SwTestItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sw/source/uibase/inc/envimg.hxx b/sw/source/uibase/inc/envimg.hxx index 15c2560b9b00..0aa565d99c0d 100644 --- a/sw/source/uibase/inc/envimg.hxx +++ b/sw/source/uibase/inc/envimg.hxx @@ -53,6 +53,7 @@ public: sal_Int32 m_nShiftRight; // shift to right (twips) sal_Int32 m_nShiftDown; // shift down (twips) + DECLARE_ITEM_TYPE_FUNCTION(SwEnvItem) SwEnvItem(); static SfxPoolItem* CreateDefault(); diff --git a/sw/source/uibase/inc/labimg.hxx b/sw/source/uibase/inc/labimg.hxx index 5e5c428bd70f..1b27f4efbfeb 100644 --- a/sw/source/uibase/inc/labimg.hxx +++ b/sw/source/uibase/inc/labimg.hxx @@ -31,6 +31,7 @@ class SW_DLLPUBLIC SwLabItem final : public SfxPoolItem public: + DECLARE_ITEM_TYPE_FUNCTION(SwLabItem) SwLabItem(); SwLabItem& operator =(const SwLabItem& rItem); diff --git a/sw/source/uibase/inc/swwrtshitem.hxx b/sw/source/uibase/inc/swwrtshitem.hxx index ab8f0f769069..479bf35753a4 100644 --- a/sw/source/uibase/inc/swwrtshitem.hxx +++ b/sw/source/uibase/inc/swwrtshitem.hxx @@ -28,6 +28,7 @@ class SW_DLLPUBLIC SwWrtShellItem final : public SfxPoolItem SwWrtShell* m_pWrtSh; public: + DECLARE_ITEM_TYPE_FUNCTION(SwWrtShellItem) SwWrtShellItem( SwWrtShell* pWrtSh ); virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx index ded71553858f..445cc70c4ee7 100644 --- a/sw/source/uibase/inc/uiitems.hxx +++ b/sw/source/uibase/inc/uiitems.hxx @@ -35,6 +35,7 @@ class SW_DLLPUBLIC SwPageFootnoteInfoItem final : public SfxPoolItem public: + DECLARE_ITEM_TYPE_FUNCTION(SwPageFootnoteInfoItem) SwPageFootnoteInfoItem(SwPageFootnoteInfo const & rInfo); virtual ~SwPageFootnoteInfoItem() override; @@ -63,6 +64,7 @@ class SW_DLLPUBLIC SwPtrItem final : public SfxPoolItem void* m_pMisc; public: + DECLARE_ITEM_TYPE_FUNCTION(SwPtrItem) SwPtrItem( const sal_uInt16 nId, void* pPtr); virtual SwPtrItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -76,6 +78,7 @@ class SW_DLLPUBLIC SwUINumRuleItem final : public SfxPoolItem std::unique_ptr m_pRule; public: + DECLARE_ITEM_TYPE_FUNCTION(SwUINumRuleItem) SwUINumRuleItem( const SwNumRule& rRule ); SwUINumRuleItem( const SwUINumRuleItem& rItem ); virtual ~SwUINumRuleItem() override; @@ -95,6 +98,7 @@ class SwPaMItem final : public SfxPoolItem SwPaM* m_pPaM; public: + DECLARE_ITEM_TYPE_FUNCTION(SwPaMItem) SwPaMItem( const sal_uInt16 nId, SwPaM* pPaM); virtual SwPaMItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx index 7aafbfdfce16..15865ff2cb57 100644 --- a/sw/source/uibase/utlui/uiitems.cxx +++ b/sw/source/uibase/utlui/uiitems.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; SwPageFootnoteInfoItem::SwPageFootnoteInfoItem( SwPageFootnoteInfo const & rInfo) : - SfxPoolItem( FN_PARAM_FTN_INFO, SfxItemType::SwPageFootnoteInfoItemType ), + SfxPoolItem( FN_PARAM_FTN_INFO ), m_aFootnoteInfo(rInfo) { } @@ -191,7 +191,7 @@ bool SwPageFootnoteInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId) } SwPtrItem::SwPtrItem( const sal_uInt16 nId, void* pPtr ) : - SfxPoolItem( nId, SfxItemType::SwPtrItemType ), + SfxPoolItem( nId ), m_pMisc(pPtr) { } @@ -212,7 +212,7 @@ bool SwPtrItem::operator==( const SfxPoolItem& rAttr ) const // SwUINumRuleItem for the NumTabPages of the FormatNumRule/Styleists SwUINumRuleItem::SwUINumRuleItem( const SwNumRule& rRul ) - : SfxPoolItem( FN_PARAM_ACT_NUMBER, SfxItemType::SwUINumRuleItemType ) + : SfxPoolItem( FN_PARAM_ACT_NUMBER ) , m_pRule( new SwNumRule( rRul ) ) { } @@ -259,7 +259,7 @@ bool SwUINumRuleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) } SwPaMItem::SwPaMItem( const sal_uInt16 nId, SwPaM* pPaM ) : - SfxPoolItem( nId, SfxItemType::SwPaMItemType ), + SfxPoolItem( nId ), m_pPaM(pPaM) { }