summaryrefslogtreecommitdiff
path: root/editeng/source
diff options
context:
space:
mode:
Diffstat (limited to 'editeng/source')
-rw-r--r--editeng/source/items/bulitem.cxx2
-rw-r--r--editeng/source/items/charhiddenitem.cxx2
-rw-r--r--editeng/source/items/flditem.cxx4
-rw-r--r--editeng/source/items/frmitems.cxx55
-rw-r--r--editeng/source/items/justifyitem.cxx10
-rw-r--r--editeng/source/items/numitem.cxx8
-rw-r--r--editeng/source/items/optitems.cxx2
-rw-r--r--editeng/source/items/paraitem.cxx24
-rw-r--r--editeng/source/items/textitem.cxx94
-rw-r--r--editeng/source/items/writingmodeitem.cxx2
-rw-r--r--editeng/source/items/xmlcnitm.cxx2
11 files changed, 104 insertions, 101 deletions
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 769179748b40..b4d46f9b1d3b 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -22,7 +22,7 @@
#include <editeng/bulletitem.hxx>
SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich )
- : SfxPoolItem(_nWhich)
+ : SfxPoolItem(_nWhich, SfxItemType::SvxBulletItemType)
, 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 ec2a0af3c703..77487bb7b50d 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 )
+ SfxBoolItem( nId, bHidden, SfxItemType::SvxCharHiddenItemType )
{
}
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index b501d40ba968..2cc1a0d40543 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -276,13 +276,13 @@ MetaAction* SvxFieldData::createEndComment()
SvxFieldItem::SvxFieldItem( std::unique_ptr<SvxFieldData> pField, const sal_uInt16 nId ) :
- SfxPoolItem( nId )
+ SfxPoolItem( nId, SfxItemType::SvxFieldItemType )
, mpField( std::move(pField) )
{
}
SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ) :
- SfxPoolItem( nId )
+ SfxPoolItem( nId, SfxItemType::SvxFieldItemType )
, mpField( rField.Clone() )
{
}
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 94b7704303ba..2f84816bf4fb 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -140,7 +140,7 @@ bool SvxPaperBinItem::GetPresentation
SvxSizeItem::SvxSizeItem( const sal_uInt16 nId, const Size& rSize ) :
- SfxPoolItem( nId ),
+ SfxPoolItem( nId, SfxItemType::SvxSizeItemType ),
m_aSize( rSize )
{
@@ -223,7 +223,7 @@ bool SvxSizeItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
SvxSizeItem::SvxSizeItem( const sal_uInt16 nId ) :
- SfxPoolItem( nId )
+ SfxPoolItem( nId, SfxItemType::SvxSizeItemType )
{
}
@@ -288,7 +288,7 @@ bool SvxSizeItem::HasMetrics() const
SvxLRSpaceItem::SvxLRSpaceItem(const sal_uInt16 nId)
- : SfxPoolItem(nId)
+ : SfxPoolItem(nId, SfxItemType::SvxLRSpaceItemType)
, nFirstLineOffset(0)
, nLeftMargin(0)
, nRightMargin(0)
@@ -307,7 +307,7 @@ SvxLRSpaceItem::SvxLRSpaceItem(const sal_uInt16 nId)
SvxLRSpaceItem::SvxLRSpaceItem( const tools::Long nLeft, const tools::Long nRight,
const short nOfset,
const sal_uInt16 nId )
- : SfxPoolItem(nId)
+ : SfxPoolItem(nId, SfxItemType::SvxLRSpaceItemType)
, nFirstLineOffset(nOfset)
, nLeftMargin(nLeft)
, nRightMargin(nRight)
@@ -573,12 +573,12 @@ tools::Long SvxLRSpaceItem::GetTextLeft() const
}
SvxLeftMarginItem::SvxLeftMarginItem(const sal_uInt16 nId)
- : SfxPoolItem(nId)
+ : SfxPoolItem(nId, SfxItemType::SvxLeftMarginItemType)
{
}
SvxLeftMarginItem::SvxLeftMarginItem(const tools::Long nLeft, const sal_uInt16 nId)
- : SfxPoolItem(nId)
+ : SfxPoolItem(nId, SfxItemType::SvxLeftMarginItemType)
, m_nLeftMargin(nLeft)
{
}
@@ -741,12 +741,12 @@ boost::property_tree::ptree SvxLeftMarginItem::dumpAsJSON() const
}
SvxTextLeftMarginItem::SvxTextLeftMarginItem(const sal_uInt16 nId)
- : SfxPoolItem(nId)
+ : SfxPoolItem(nId, SfxItemType::SvxTextLeftMarginItemType)
{
}
SvxTextLeftMarginItem::SvxTextLeftMarginItem(const tools::Long nLeft, const sal_uInt16 nId)
- : SfxPoolItem(nId)
+ : SfxPoolItem(nId, SfxItemType::SvxTextLeftMarginItemType)
, m_nTextLeftMargin(nLeft)
{
}
@@ -918,12 +918,12 @@ boost::property_tree::ptree SvxTextLeftMarginItem::dumpAsJSON() const
}
SvxFirstLineIndentItem::SvxFirstLineIndentItem(const sal_uInt16 nId)
- : SfxPoolItem(nId)
+ : SfxPoolItem(nId, SfxItemType::SvxFirstLineIndentItemType)
{
}
SvxFirstLineIndentItem::SvxFirstLineIndentItem(const short nFirst, const sal_uInt16 nId)
- : SfxPoolItem(nId)
+ : SfxPoolItem(nId, SfxItemType::SvxFirstLineIndentItemType)
, m_nFirstLineOffset(nFirst)
{
}
@@ -1096,12 +1096,12 @@ boost::property_tree::ptree SvxFirstLineIndentItem::dumpAsJSON() const
}
SvxRightMarginItem::SvxRightMarginItem(const sal_uInt16 nId)
- : SfxPoolItem(nId)
+ : SfxPoolItem(nId, SfxItemType::SvxRightMarginItemType)
{
}
SvxRightMarginItem::SvxRightMarginItem(const tools::Long nRight, const sal_uInt16 nId)
- : SfxPoolItem(nId)
+ : SfxPoolItem(nId, SfxItemType::SvxRightMarginItemType)
, m_nRightMargin(nRight)
{
}
@@ -1274,7 +1274,7 @@ boost::property_tree::ptree SvxRightMarginItem::dumpAsJSON() const
}
SvxGutterLeftMarginItem::SvxGutterLeftMarginItem(const sal_uInt16 nId)
- : SfxPoolItem(nId)
+ : SfxPoolItem(nId, SfxItemType::SvxGutterLeftMarginItemType)
{
}
@@ -1383,7 +1383,7 @@ boost::property_tree::ptree SvxGutterLeftMarginItem::dumpAsJSON() const
}
SvxGutterRightMarginItem::SvxGutterRightMarginItem(const sal_uInt16 nId)
- : SfxPoolItem(nId)
+ : SfxPoolItem(nId, SfxItemType::SvxGutterRightMarginItemType)
{
}
@@ -1662,7 +1662,7 @@ boost::property_tree::ptree SvxLRSpaceItem::dumpAsJSON() const
SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nId )
- : SfxPoolItem(nId)
+ : SfxPoolItem(nId, SfxItemType::SvxULSpaceItemType)
, nUpper(0)
, nLower(0)
, bContext(false)
@@ -1674,7 +1674,7 @@ SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nId )
SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow,
const sal_uInt16 nId )
- : SfxPoolItem(nId)
+ : SfxPoolItem(nId, SfxItemType::SvxULSpaceItemType)
, nUpper(nUp)
, nLower(nLow)
, bContext(false)
@@ -2035,7 +2035,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 ),
+ SfxEnumItemInterface( nId, SfxItemType::SvxShadowItemType ),
aShadowColor(COL_GRAY),
nWidth ( nW ),
eLocation ( eLoc )
@@ -2308,7 +2308,7 @@ SvxBoxItem::SvxBoxItem(const SvxBoxItem& rCopy)
SvxBoxItem::SvxBoxItem(const sal_uInt16 nId)
- : SfxPoolItem(nId)
+ : SfxPoolItem(nId, SfxItemType::SvxBoxItemType)
{
}
@@ -3256,14 +3256,13 @@ bool SvxBoxItem::HasBorder( bool bTreatPaddingAsBorder ) const
// class SvxBoxInfoItem --------------------------------------------------
SvxBoxInfoItem::SvxBoxInfoItem(const sal_uInt16 nId)
- : SfxPoolItem(nId)
+ : SfxPoolItem(nId, SfxItemType::SvxBoxInfoItemType)
, mbDistance(false)
, mbMinimumDistance(false)
{
ResetFlags();
}
-
SvxBoxInfoItem::SvxBoxInfoItem( const SvxBoxInfoItem& rCopy )
: SfxPoolItem(rCopy)
, mpHorizontalLine(rCopy.mpHorizontalLine ? new SvxBorderLine(*rCopy.mpHorizontalLine) : nullptr)
@@ -3847,7 +3846,7 @@ void SvxFormatKeepItem::dumpAsXml(xmlTextWriterPtr pWriter) const
}
SvxLineItem::SvxLineItem( const sal_uInt16 nId ) :
- SfxPoolItem ( nId )
+ SfxPoolItem ( nId, SfxItemType::SvxLineItemType )
{
}
@@ -3979,7 +3978,7 @@ void SvxLineItem::SetLine( const SvxBorderLine* pNew )
}
SvxBrushItem::SvxBrushItem(sal_uInt16 _nWhich)
- : SfxPoolItem(_nWhich)
+ : SfxPoolItem(_nWhich, SfxItemType::SvxBrushItemType)
, aColor(COL_TRANSPARENT)
, aFilterColor(COL_TRANSPARENT)
, nShadingValue(ShadingPattern::CLEAR)
@@ -3990,7 +3989,7 @@ SvxBrushItem::SvxBrushItem(sal_uInt16 _nWhich)
}
SvxBrushItem::SvxBrushItem(const Color& rColor, sal_uInt16 _nWhich)
- : SfxPoolItem(_nWhich)
+ : SfxPoolItem(_nWhich, SfxItemType::SvxBrushItemType)
, aColor(rColor)
, aFilterColor(COL_TRANSPARENT)
, nShadingValue(ShadingPattern::CLEAR)
@@ -4001,7 +4000,7 @@ SvxBrushItem::SvxBrushItem(const Color& rColor, sal_uInt16 _nWhich)
}
SvxBrushItem::SvxBrushItem(Color const& rColor, model::ComplexColor const& rComplexColor, sal_uInt16 nWhich)
- : SfxPoolItem(nWhich)
+ : SfxPoolItem(nWhich, SfxItemType::SvxBrushItemType)
, aColor(rColor)
, maComplexColor(rComplexColor)
, aFilterColor(COL_TRANSPARENT)
@@ -4013,7 +4012,7 @@ SvxBrushItem::SvxBrushItem(Color const& rColor, model::ComplexColor const& rComp
}
SvxBrushItem::SvxBrushItem(const Graphic& rGraphic, SvxGraphicPosition ePos, sal_uInt16 _nWhich)
- : SfxPoolItem(_nWhich)
+ : SfxPoolItem(_nWhich, SfxItemType::SvxBrushItemType)
, aColor(COL_TRANSPARENT)
, aFilterColor(COL_TRANSPARENT)
, nShadingValue(ShadingPattern::CLEAR)
@@ -4026,7 +4025,7 @@ SvxBrushItem::SvxBrushItem(const Graphic& rGraphic, SvxGraphicPosition ePos, sal
}
SvxBrushItem::SvxBrushItem(const GraphicObject& rGraphicObj, SvxGraphicPosition ePos, sal_uInt16 _nWhich)
- : SfxPoolItem(_nWhich)
+ : SfxPoolItem(_nWhich, SfxItemType::SvxBrushItemType)
, aColor(COL_TRANSPARENT)
, aFilterColor(COL_TRANSPARENT)
, nShadingValue(ShadingPattern::CLEAR)
@@ -4040,7 +4039,7 @@ SvxBrushItem::SvxBrushItem(const GraphicObject& rGraphicObj, SvxGraphicPosition
SvxBrushItem::SvxBrushItem(OUString aLink, OUString aFilter,
SvxGraphicPosition ePos, sal_uInt16 _nWhich)
- : SfxPoolItem(_nWhich)
+ : SfxPoolItem(_nWhich, SfxItemType::SvxBrushItemType)
, aColor(COL_TRANSPARENT)
, aFilterColor(COL_TRANSPARENT)
, nShadingValue(ShadingPattern::CLEAR)
@@ -4572,7 +4571,7 @@ void SvxBrushItem::dumpAsXml(xmlTextWriterPtr pWriter) const
SvxFrameDirectionItem::SvxFrameDirectionItem( SvxFrameDirection nValue ,
sal_uInt16 _nWhich )
- : SfxEnumItem<SvxFrameDirection>( _nWhich, nValue )
+ : SfxEnumItem<SvxFrameDirection>( _nWhich, SfxItemType::SvxFrameDirectionItemType, nValue )
{
}
diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx
index 7fe699cb2c36..5b496e233a87 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, SvxCellHorJustify::Standard )
+ SfxEnumItem( nId, SfxItemType::SvxHorJustifyItemType, SvxCellHorJustify::Standard )
{
}
SvxHorJustifyItem::SvxHorJustifyItem( const SvxCellHorJustify eJustify,
const sal_uInt16 nId ) :
- SfxEnumItem( nId, eJustify )
+ SfxEnumItem( nId, SfxItemType::SvxHorJustifyItemType, eJustify )
{
}
@@ -173,13 +173,13 @@ sal_uInt16 SvxHorJustifyItem::GetValueCount() const
SvxVerJustifyItem::SvxVerJustifyItem( const sal_uInt16 nId ) :
- SfxEnumItem( nId, SvxCellVerJustify::Standard )
+ SfxEnumItem( nId, SfxItemType::SvxVerJustifyItemType, SvxCellVerJustify::Standard )
{
}
SvxVerJustifyItem::SvxVerJustifyItem( const SvxCellVerJustify eJustify,
const sal_uInt16 nId ) :
- SfxEnumItem( nId, eJustify )
+ SfxEnumItem( nId, SfxItemType::SvxVerJustifyItemType, eJustify )
{
}
@@ -298,7 +298,7 @@ sal_uInt16 SvxVerJustifyItem::GetValueCount() const
SvxJustifyMethodItem::SvxJustifyMethodItem( const SvxCellJustifyMethod eJustify,
const sal_uInt16 nId ) :
- SfxEnumItem( nId, eJustify )
+ SfxEnumItem( nId, SfxItemType::SvxJustifyMethodItemType, eJustify )
{
}
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 983eff2779e2..6d7693e4b9a7 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -1061,25 +1061,25 @@ void SvxNumRule::UnLinkGraphics()
}
SvxNumBulletItem::SvxNumBulletItem(SvxNumRule const & rRule) :
- SfxPoolItem(SID_ATTR_NUMBERING_RULE),
+ SfxPoolItem(SID_ATTR_NUMBERING_RULE, SfxItemType::SvxNumBulletItemType),
maNumRule(rRule)
{
}
SvxNumBulletItem::SvxNumBulletItem(SvxNumRule && rRule) :
- SfxPoolItem(SID_ATTR_NUMBERING_RULE),
+ SfxPoolItem(SID_ATTR_NUMBERING_RULE, SfxItemType::SvxNumBulletItemType),
maNumRule(std::move(rRule))
{
}
SvxNumBulletItem::SvxNumBulletItem(SvxNumRule const & rRule, sal_uInt16 _nWhich ) :
- SfxPoolItem(_nWhich),
+ SfxPoolItem(_nWhich, SfxItemType::SvxNumBulletItemType),
maNumRule(rRule)
{
}
SvxNumBulletItem::SvxNumBulletItem(SvxNumRule && rRule, sal_uInt16 _nWhich ) :
- SfxPoolItem(_nWhich),
+ SfxPoolItem(_nWhich, SfxItemType::SvxNumBulletItemType),
maNumRule(std::move(rRule))
{
}
diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx
index 254da79d91c1..40d521d48a1e 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 )
+ SfxPoolItem( nId, SfxItemType::SfxRegionItemType )
{
nMinLead = nMinTrail = 0;
}
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index e10c323bcdf6..5415ed368cff 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -77,7 +77,7 @@ enum class SvxSpecialLineSpace
}
SvxLineSpacingItem::SvxLineSpacingItem( sal_uInt16 nHeight, const sal_uInt16 nId )
- : SfxEnumItemInterface( nId )
+ : SfxEnumItemInterface( nId, SfxItemType::SvxLineSpacingItemType )
{
nPropLineSpace = 100;
nInterLineSpace = 0;
@@ -339,7 +339,7 @@ void SvxLineSpacingItem::SetEnumValue( sal_uInt16 nVal )
// class SvxAdjustItem ---------------------------------------------------
SvxAdjustItem::SvxAdjustItem(const SvxAdjust eAdjst, const sal_uInt16 nId )
- : SfxEnumItemInterface( nId ),
+ : SfxEnumItemInterface( nId, SfxItemType::SvxAdjustItemType ),
bOneBlock( false ), bLastCenter( false ), bLastBlock( false )
{
SetAdjust( eAdjst );
@@ -463,7 +463,7 @@ void SvxAdjustItem::SetEnumValue( sal_uInt16 nVal )
// class SvxWidowsItem ---------------------------------------------------
SvxWidowsItem::SvxWidowsItem(const sal_uInt8 nL, const sal_uInt16 nId ) :
- SfxByteItem( nId, nL )
+ SfxByteItem( nId, nL, SfxItemType::SvxWidowsItemType )
{
}
@@ -507,7 +507,7 @@ bool SvxWidowsItem::GetPresentation
// class SvxOrphansItem --------------------------------------------------
SvxOrphansItem::SvxOrphansItem(const sal_uInt8 nL, const sal_uInt16 nId ) :
- SfxByteItem( nId, nL )
+ SfxByteItem( nId, nL, SfxItemType::SvxOrphansItemType )
{
}
@@ -551,7 +551,7 @@ bool SvxOrphansItem::GetPresentation
// class SvxHyphenZoneItem -----------------------------------------------
SvxHyphenZoneItem::SvxHyphenZoneItem( const bool bHyph, const sal_uInt16 nId ) :
- SfxPoolItem( nId ),
+ SfxPoolItem( nId, SfxItemType::SvxHyphenZoneItem ),
bHyphen(bHyph),
bPageEnd(true),
bNoCapsHyphenation(false),
@@ -781,7 +781,7 @@ void SvxTabStop::dumpAsXml(xmlTextWriterPtr pWriter) const
// class SvxTabStopItem --------------------------------------------------
SvxTabStopItem::SvxTabStopItem( sal_uInt16 _nWhich ) :
- SfxPoolItem( _nWhich )
+ SfxPoolItem( _nWhich, SfxItemType::SvxTabStopItemType )
{
const sal_uInt16 nTabs = SVX_TAB_DEFCOUNT, nDist = SVX_TAB_DEFDIST;
const SvxTabAdjust eAdjst= SvxTabAdjust::Default;
@@ -798,7 +798,7 @@ SvxTabStopItem::SvxTabStopItem( const sal_uInt16 nTabs,
const sal_uInt16 nDist,
const SvxTabAdjust eAdjst,
sal_uInt16 _nWhich ) :
- SfxPoolItem( _nWhich )
+ SfxPoolItem( _nWhich, SfxItemType::SvxTabStopItemType )
{
for ( sal_uInt16 i = 0; i < nTabs; ++i )
{
@@ -1172,7 +1172,7 @@ bool SvxPageModelItem::GetPresentation
SvxScriptSpaceItem::SvxScriptSpaceItem( bool bOn, const sal_uInt16 nId )
- : SfxBoolItem( nId, bOn )
+ : SfxBoolItem( nId, bOn, SfxItemType::SvxScriptSpaceItemType )
{
}
@@ -1195,7 +1195,7 @@ bool SvxScriptSpaceItem::GetPresentation(
SvxHangingPunctuationItem::SvxHangingPunctuationItem(
bool bOn, const sal_uInt16 nId )
- : SfxBoolItem( nId, bOn )
+ : SfxBoolItem( nId, bOn, SfxItemType::SvxHangingPunctuationItemType )
{
}
@@ -1218,7 +1218,7 @@ bool SvxHangingPunctuationItem::GetPresentation(
SvxForbiddenRuleItem::SvxForbiddenRuleItem(
bool bOn, const sal_uInt16 nId )
- : SfxBoolItem( nId, bOn )
+ : SfxBoolItem( nId, bOn, SfxItemType::SvxForbiddenRuleItemType )
{
}
@@ -1244,7 +1244,7 @@ bool SvxForbiddenRuleItem::GetPresentation(
SvxParaVertAlignItem::SvxParaVertAlignItem( Align nValue,
TypedWhichId<SvxParaVertAlignItem> nW )
- : SfxUInt16Item( nW, static_cast<sal_uInt16>(nValue) )
+ : SfxUInt16Item( nW, static_cast<sal_uInt16>(nValue), SfxItemType::SvxParaVertAlignItemType )
{
}
@@ -1292,7 +1292,7 @@ bool SvxParaVertAlignItem::PutValue( const css::uno::Any& rVal,
}
SvxParaGridItem::SvxParaGridItem( bool bOn, const sal_uInt16 nId )
- : SfxBoolItem( nId, bOn )
+ : SfxBoolItem( nId, bOn, SfxItemType::SvxParaGridItemType )
{
}
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index e242566bd36f..6d6439c4a060 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 ),
+ SfxPoolItem( nId, SfxItemType::SvxFontListItemType ),
pFontList( pFontLst )
{
if ( pFontList )
@@ -159,30 +159,33 @@ bool SvxFontListItem::GetPresentation
// class SvxFontItem -----------------------------------------------------
-SvxFontItem::SvxFontItem( const sal_uInt16 nId ) :
- SfxPoolItem( nId )
+SvxFontItem::SvxFontItem(
+ const sal_uInt16 nId)
+: SfxPoolItem( nId, SfxItemType::SvxFontItemType )
+, aFamilyName()
+, aStyleName()
+, eFamily(FAMILY_SWISS)
+, ePitch(PITCH_VARIABLE)
+, eTextEncoding(RTL_TEXTENCODING_DONTKNOW)
{
- eFamily = FAMILY_SWISS;
- ePitch = PITCH_VARIABLE;
- eTextEncoding = RTL_TEXTENCODING_DONTKNOW;
}
-
-SvxFontItem::SvxFontItem( const FontFamily eFam, OUString aName,
- OUString aStName, const FontPitch eFontPitch,
- const rtl_TextEncoding eFontTextEncoding, const sal_uInt16 nId ) :
-
- SfxPoolItem( nId ),
-
- aFamilyName(std::move(aName)),
- aStyleName(std::move(aStName))
+SvxFontItem::SvxFontItem(
+ const FontFamily eFam,
+ OUString aName,
+ OUString aStName,
+ const FontPitch eFontPitch,
+ const rtl_TextEncoding eFontTextEncoding,
+ const sal_uInt16 nId)
+: SfxPoolItem( nId, SfxItemType::SvxFontItemType )
+, aFamilyName(std::move(aName))
+, aStyleName(std::move(aStName))
+, eFamily(eFam)
+, ePitch(eFontPitch)
+, eTextEncoding(eFontTextEncoding)
{
- eFamily = eFam;
- ePitch = eFontPitch;
- eTextEncoding = eFontTextEncoding;
}
-
bool SvxFontItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
@@ -329,7 +332,7 @@ void SvxFontItem::dumpAsXml(xmlTextWriterPtr pWriter) const
// class SvxPostureItem --------------------------------------------------
SvxPostureItem::SvxPostureItem( const FontItalic ePosture, const sal_uInt16 nId ) :
- SfxEnumItem( nId, ePosture )
+ SfxEnumItem( nId, SfxItemType::SvxPostureItemType, ePosture )
{
}
@@ -442,7 +445,7 @@ void SvxPostureItem::dumpAsXml(xmlTextWriterPtr pWriter) const
// class SvxWeightItem ---------------------------------------------------
SvxWeightItem::SvxWeightItem( const FontWeight eWght, const sal_uInt16 nId ) :
- SfxEnumItem( nId, eWght )
+ SfxEnumItem( nId, SfxItemType::SvxWeightItemType, eWght )
{
}
@@ -565,7 +568,7 @@ void SvxWeightItem::dumpAsXml(xmlTextWriterPtr pWriter) const
SvxFontHeightItem::SvxFontHeightItem( const sal_uInt32 nSz,
const sal_uInt16 nPrp,
const sal_uInt16 nId ) :
- SfxPoolItem( nId )
+ SfxPoolItem( nId, SfxItemType::SvxFontHeightItemType )
{
SetHeight( nSz,nPrp ); // calculate in percentage
}
@@ -899,7 +902,7 @@ void SvxFontHeightItem::dumpAsXml(xmlTextWriterPtr pWriter) const
// class SvxTextLineItem ------------------------------------------------
SvxTextLineItem::SvxTextLineItem( const FontLineStyle eSt, const sal_uInt16 nId )
- : SfxEnumItem(nId, eSt)
+ : SfxEnumItem(nId, SfxItemType::SvxTextLineItemType,eSt)
, maColor(COL_TRANSPARENT)
{
}
@@ -1124,7 +1127,7 @@ OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
// class SvxCrossedOutItem -----------------------------------------------
SvxCrossedOutItem::SvxCrossedOutItem( const FontStrikeout eSt, const sal_uInt16 nId )
- : SfxEnumItem( nId, eSt )
+ : SfxEnumItem( nId, SfxItemType::SvxCrossedOutItemType, eSt )
{
}
@@ -1223,7 +1226,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 )
+ SfxBoolItem( nId, bShadowed, SfxItemType::SvxShadowedItemType )
{
}
@@ -1251,7 +1254,7 @@ bool SvxShadowedItem::GetPresentation
// class SvxAutoKernItem -------------------------------------------------
SvxAutoKernItem::SvxAutoKernItem( const bool bAutoKern, const sal_uInt16 nId ) :
- SfxBoolItem( nId, bAutoKern )
+ SfxBoolItem( nId, bAutoKern, SfxItemType::SvxAutoKernItemType )
{
}
@@ -1280,7 +1283,7 @@ bool SvxAutoKernItem::GetPresentation
SvxWordLineModeItem::SvxWordLineModeItem( const bool bWordLineMode,
const sal_uInt16 nId ) :
- SfxBoolItem( nId, bWordLineMode )
+ SfxBoolItem( nId, bWordLineMode, SfxItemType::SvxWordLineItemType )
{
}
@@ -1308,7 +1311,7 @@ bool SvxWordLineModeItem::GetPresentation
// class SvxContourItem --------------------------------------------------
SvxContourItem::SvxContourItem( const bool bContoured, const sal_uInt16 nId ) :
- SfxBoolItem( nId, bContoured )
+ SfxBoolItem( nId, bContoured, SfxItemType::SvxContourItemType )
{
}
@@ -1335,19 +1338,19 @@ bool SvxContourItem::GetPresentation
// class SvxColorItem ----------------------------------------------------
SvxColorItem::SvxColorItem( const sal_uInt16 nId ) :
- SfxPoolItem(nId),
+ SfxPoolItem(nId, SfxItemType::SvxColorItemType),
mColor( COL_BLACK )
{
}
SvxColorItem::SvxColorItem( const Color& rCol, const sal_uInt16 nId ) :
- SfxPoolItem( nId ),
+ SfxPoolItem( nId, SfxItemType::SvxColorItemType ),
mColor( rCol )
{
}
SvxColorItem::SvxColorItem(Color const& rColor, model::ComplexColor const& rComplexColor, const sal_uInt16 nId)
- : SfxPoolItem(nId)
+ : SfxPoolItem(nId, SfxItemType::SvxColorItemType)
, mColor(rColor)
, maComplexColor(rComplexColor)
{
@@ -1597,7 +1600,7 @@ void SvxColorItem::dumpAsXml(xmlTextWriterPtr pWriter) const
// class SvxKerningItem --------------------------------------------------
SvxKerningItem::SvxKerningItem( const short nKern, const sal_uInt16 nId ) :
- SfxInt16Item( nId, nKern )
+ SfxInt16Item( nId, nKern, SfxItemType::SvxKerningItemType )
{
}
@@ -1676,7 +1679,7 @@ bool SvxKerningItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId)
// class SvxCaseMapItem --------------------------------------------------
SvxCaseMapItem::SvxCaseMapItem( const SvxCaseMap eMap, const sal_uInt16 nId ) :
- SfxEnumItem( nId, eMap )
+ SfxEnumItem( nId, SfxItemType::SvxCaseMapItemType, eMap )
{
}
@@ -1756,7 +1759,7 @@ bool SvxCaseMapItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
// class SvxEscapementItem -----------------------------------------------
SvxEscapementItem::SvxEscapementItem( const sal_uInt16 nId ) :
- SfxEnumItemInterface( nId ),
+ SfxEnumItemInterface( nId, SfxItemType::SvxEscapementItemType ),
nEsc ( 0 ),
nProp ( 100 )
@@ -1766,7 +1769,7 @@ SvxEscapementItem::SvxEscapementItem( const sal_uInt16 nId ) :
SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape,
const sal_uInt16 nId ) :
- SfxEnumItemInterface( nId ),
+ SfxEnumItemInterface( nId, SfxItemType::SvxEscapementItemType ),
nProp( 100 )
{
SetEscapement( eEscape );
@@ -1778,7 +1781,7 @@ SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape,
SvxEscapementItem::SvxEscapementItem( const short _nEsc,
const sal_uInt8 _nProp,
const sal_uInt16 nId ) :
- SfxEnumItemInterface( nId ),
+ SfxEnumItemInterface( nId, SfxItemType::SvxEscapementItemType ),
nEsc ( _nEsc ),
nProp ( _nProp )
{
@@ -1918,7 +1921,7 @@ bool SvxEscapementItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
// class SvxLanguageItem -------------------------------------------------
SvxLanguageItem::SvxLanguageItem( const LanguageType eLang, const sal_uInt16 nId )
- : SvxLanguageItem_Base( nId , eLang )
+ : SvxLanguageItem_Base( nId , SfxItemType::SvxLanguageItemType, eLang )
{
}
@@ -1995,7 +1998,7 @@ bool SvxLanguageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
// class SvxNoHyphenItem -------------------------------------------------
SvxNoHyphenItem::SvxNoHyphenItem( const sal_uInt16 nId ) :
- SfxBoolItem( nId , true )
+ SfxBoolItem( nId , true, SfxItemType::SvxNoHyphenItemType )
{
}
@@ -2026,7 +2029,7 @@ bool SvxNoHyphenItem::GetPresentation
SvxBlinkItem::SvxBlinkItem( const bool bBlink, const sal_uInt16 nId ) :
- SfxBoolItem( nId, bBlink )
+ SfxBoolItem( nId, bBlink, SfxItemType::SvxBlinkItemType )
{
}
@@ -2055,7 +2058,7 @@ bool SvxBlinkItem::GetPresentation
SvxEmphasisMarkItem::SvxEmphasisMarkItem( const FontEmphasisMark nValue,
TypedWhichId<SvxEmphasisMarkItem> nId )
- : SfxUInt16Item( nId, static_cast<sal_uInt16>(nValue) )
+ : SfxUInt16Item( nId, static_cast<sal_uInt16>(nValue), SfxItemType::SvxEmphasisMarkItemType )
{
}
@@ -2158,7 +2161,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 ),
+ : SfxPoolItem( nW, SfxItemType::SvxTwoLinesItemType ),
cStartBracket( nStartBracket ), cEndBracket( nEndBracket ), bOn( bFlag )
{
}
@@ -2266,7 +2269,7 @@ bool SvxTwoLinesItem::GetPresentation( SfxItemPresentation /*ePres*/,
*************************************************************************/
SvxTextRotateItem::SvxTextRotateItem(Degree10 nValue, TypedWhichId<SvxTextRotateItem> nW)
- : SfxUInt16Item(nW, nValue.get())
+ : SfxUInt16Item(nW, nValue.get(), SfxItemType::SvxTextRotateItemType)
{
}
@@ -2434,7 +2437,7 @@ void SvxCharRotateItem::dumpAsXml(xmlTextWriterPtr pWriter) const
SvxCharScaleWidthItem::SvxCharScaleWidthItem( sal_uInt16 nValue,
TypedWhichId<SvxCharScaleWidthItem> nW )
- : SfxUInt16Item( nW, nValue )
+ : SfxUInt16Item( nW, nValue, SfxItemType::SvxCharScaleWidthItem )
{
}
@@ -2488,7 +2491,7 @@ bool SvxCharScaleWidthItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/
SvxCharReliefItem::SvxCharReliefItem( FontRelief eValue,
const sal_uInt16 nId )
- : SfxEnumItem( nId, eValue )
+ : SfxEnumItem( nId, SfxItemType::SvxCharReliefItemType, eValue )
{
}
@@ -2574,7 +2577,8 @@ bool SvxCharReliefItem::QueryValue( css::uno::Any& rVal,
SvxScriptSetItem::SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool )
: SfxSetItem( nSlotId, SfxItemSet( rPool,
- svl::Items<SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONT> ))
+ svl::Items<SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONT> ),
+ SfxItemType::SvxScriptSetItemType )
{
sal_uInt16 nLatin, nAsian, nComplex;
GetWhichIds( nLatin, nAsian, nComplex );
diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx
index 35dbddabab2d..d1d8cb6e065a 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<SvxWritingModeItem> _nWhich )
- : SfxUInt16Item( _nWhich, static_cast<sal_uInt16>(eValue) )
+ : SfxUInt16Item( _nWhich, static_cast<sal_uInt16>(eValue), SfxItemType::SvxWritingModeItemType )
{
}
diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
index 7507ed2afdd0..76aaa4f85105 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star::xml;
SvXMLAttrContainerItem::SvXMLAttrContainerItem( sal_uInt16 _nWhich ) :
- SfxPoolItem( _nWhich )
+ SfxPoolItem( _nWhich, SfxItemType::SvXMLAttrContainerItemType )
{
}
generated by cgit (git 2.34.1) at 2024-07-03 14:09:10 +0000