diff options
author | Oliver Specht <oliver.specht@cib.de> | 2015-11-07 14:43:19 +0100 |
---|---|---|
committer | Oliver Specht <oliver.specht@cib.de> | 2015-11-11 10:49:30 +0000 |
commit | fa91dd31f39a24329d288d4e1cda28db3a16af0d (patch) | |
tree | 603d7c206ac0ec1f1a08cc9f3bf8835bd8d2fb2f /editeng/source | |
parent | c21ddcdb30b8dd7be56176e00bc2d4780cb342e1 (diff) |
5th step to remove tools/rtti.hxx
tools/rtti.hxx removed
completed the interface of some Sdr.* Items
and removed pseudo items
Change-Id: I0cdcd01494be35b97a27d5985aa908affa96048a
Reviewed-on: https://gerrit.libreoffice.org/19837
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'editeng/source')
-rw-r--r-- | editeng/source/items/bulitem.cxx | 1 | ||||
-rw-r--r-- | editeng/source/items/charhiddenitem.cxx | 3 | ||||
-rw-r--r-- | editeng/source/items/flditem.cxx | 33 | ||||
-rw-r--r-- | editeng/source/items/frmitems.cxx | 32 | ||||
-rw-r--r-- | editeng/source/items/justifyitem.cxx | 5 | ||||
-rw-r--r-- | editeng/source/items/optitems.cxx | 2 | ||||
-rw-r--r-- | editeng/source/items/paraitem.cxx | 27 | ||||
-rw-r--r-- | editeng/source/items/textitem.cxx | 69 | ||||
-rw-r--r-- | editeng/source/items/writingmodeitem.cxx | 3 | ||||
-rw-r--r-- | editeng/source/items/xmlcnitm.cxx | 1 |
10 files changed, 85 insertions, 91 deletions
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 0b803705354d..2791bf44293c 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -30,7 +30,6 @@ -TYPEINIT1(SvxBulletItem,SfxPoolItem); diff --git a/editeng/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx index 32bc856b6a4d..70a3a17a5b9e 100644 --- a/editeng/source/items/charhiddenitem.cxx +++ b/editeng/source/items/charhiddenitem.cxx @@ -21,7 +21,8 @@ #include <editeng/editrids.hrc> #include <editeng/eerdll.hxx> -TYPEINIT1_FACTORY(SvxCharHiddenItem, SfxBoolItem, new SvxCharHiddenItem(false, 0)); + +SfxPoolItem* SvxCharHiddenItem::CreateDefault() { return new SvxCharHiddenItem(false, 0);} SvxCharHiddenItem::SvxCharHiddenItem( const bool bHidden, const sal_uInt16 nId ) : SfxBoolItem( nId, bHidden ) diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 6018d635b7b9..4e252ac616d9 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -220,7 +220,6 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe return nullptr; } -TYPEINIT1( SvxFieldItem, SfxPoolItem ); SV_IMPL_PERSIST1( SvxFieldData, SvPersistBase ); @@ -247,7 +246,7 @@ SvxFieldData* SvxFieldData::Clone() const bool SvxFieldData::operator==( const SvxFieldData& rFld ) const { - DBG_ASSERT( Type() == rFld.Type(), "==: Different Types" ); + DBG_ASSERT( typeid(*this) == typeid(rFld), "==: Different Types" ); (void)rFld; return true; // Basic class is always the same. } @@ -362,7 +361,7 @@ bool SvxFieldItem::operator==( const SfxPoolItem& rItem ) const return true; if( pField == nullptr || pOtherFld == nullptr ) return false; - return ( pField->Type() == pOtherFld->Type() ) + return ( typeid(*pField) == typeid(*pOtherFld) ) && ( *pField == *pOtherFld ); } @@ -401,7 +400,7 @@ SvxFieldData* SvxDateField::Clone() const bool SvxDateField::operator==( const SvxFieldData& rOther ) const { - if ( rOther.Type() != Type() ) + if ( typeid(rOther) != typeid(*this) ) return false; const SvxDateField& rOtherFld = static_cast<const SvxDateField&>(rOther); @@ -539,7 +538,7 @@ SvxFieldData* SvxURLField::Clone() const bool SvxURLField::operator==( const SvxFieldData& rOther ) const { - if ( rOther.Type() != Type() ) + if ( typeid(rOther) != typeid(*this) ) return false; const SvxURLField& rOtherFld = static_cast<const SvxURLField&>(rOther); @@ -628,7 +627,7 @@ SvxFieldData* SvxPageTitleField::Clone() const bool SvxPageTitleField::operator==( const SvxFieldData& rCmp ) const { - return ( rCmp.Type() == TYPE(SvxPageTitleField) ); + return ( dynamic_cast< const SvxPageTitleField *>(&rCmp) != nullptr ); } void SvxPageTitleField::Load( SvPersistStream & /*rStm*/ ) @@ -661,7 +660,7 @@ SvxFieldData* SvxPageField::Clone() const bool SvxPageField::operator==( const SvxFieldData& rCmp ) const { - return ( rCmp.Type() == TYPE(SvxPageField) ); + return ( dynamic_cast< const SvxPageField *>(&rCmp) != nullptr ); } void SvxPageField::Load( SvPersistStream & /*rStm*/ ) @@ -689,7 +688,7 @@ SvxFieldData* SvxPagesField::Clone() const bool SvxPagesField::operator==( const SvxFieldData& rCmp ) const { - return ( rCmp.Type() == TYPE(SvxPagesField) ); + return ( dynamic_cast< const SvxPagesField *>(&rCmp) != nullptr); } void SvxPagesField::Load( SvPersistStream & /*rStm*/ ) @@ -711,7 +710,7 @@ SvxFieldData* SvxTimeField::Clone() const bool SvxTimeField::operator==( const SvxFieldData& rCmp ) const { - return ( rCmp.Type() == TYPE(SvxTimeField) ); + return ( dynamic_cast< const SvxTimeField *>(&rCmp) != nullptr); } void SvxTimeField::Load( SvPersistStream & /*rStm*/ ) @@ -738,7 +737,7 @@ SvxFieldData* SvxFileField::Clone() const bool SvxFileField::operator==( const SvxFieldData& rCmp ) const { - return ( rCmp.Type() == TYPE(SvxFileField) ); + return ( dynamic_cast< const SvxFileField *>(&rCmp) != nullptr ); } void SvxFileField::Load( SvPersistStream & /*rStm*/ ) @@ -768,7 +767,7 @@ SvxFieldData* SvxTableField::Clone() const bool SvxTableField::operator==( const SvxFieldData& rCmp ) const { - if (rCmp.Type() != TYPE(SvxTableField)) + if (dynamic_cast< const SvxTableField *>(&rCmp) != nullptr) return false; return mnTab == static_cast<const SvxTableField&>(rCmp).mnTab; @@ -817,7 +816,7 @@ SvxFieldData* SvxExtTimeField::Clone() const bool SvxExtTimeField::operator==( const SvxFieldData& rOther ) const { - if ( rOther.Type() != Type() ) + if ( typeid(rOther) != typeid(*this) ) return false; const SvxExtTimeField& rOtherFld = static_cast<const SvxExtTimeField&>(rOther); @@ -961,7 +960,7 @@ SvxFieldData* SvxExtFileField::Clone() const bool SvxExtFileField::operator==( const SvxFieldData& rOther ) const { - if ( rOther.Type() != Type() ) + if ( typeid(rOther) != typeid(*this) ) return false; const SvxExtFileField& rOtherFld = static_cast<const SvxExtFileField&>(rOther); @@ -1113,7 +1112,7 @@ SvxFieldData* SvxAuthorField::Clone() const bool SvxAuthorField::operator==( const SvxFieldData& rOther ) const { - if ( rOther.Type() != Type() ) + if ( typeid(rOther) != typeid(*this) ) return false; const SvxAuthorField& rOtherFld = static_cast<const SvxAuthorField&>(rOther); @@ -1214,7 +1213,7 @@ SvxFieldData* SvxHeaderField::Clone() const bool SvxHeaderField::operator==( const SvxFieldData& rCmp ) const { - return ( rCmp.Type() == TYPE(SvxHeaderField) ); + return ( dynamic_cast< const SvxHeaderField *>(&rCmp) != nullptr ); } void SvxHeaderField::Load( SvPersistStream & /*rStm*/ ) @@ -1237,7 +1236,7 @@ SvxFieldData* SvxFooterField::Clone() const bool SvxFooterField::operator==( const SvxFieldData& rCmp ) const { - return ( rCmp.Type() == TYPE(SvxFooterField) ); + return ( dynamic_cast< const SvxFooterField *>(&rCmp) != nullptr ); } void SvxFooterField::Load( SvPersistStream & /*rStm*/ ) @@ -1259,7 +1258,7 @@ SvxFieldData* SvxDateTimeField::Clone() const bool SvxDateTimeField::operator==( const SvxFieldData& rCmp ) const { - return ( rCmp.Type() == TYPE(SvxDateTimeField) ); + return ( dynamic_cast< const SvxDateTimeField *>(&rCmp) != nullptr ); } void SvxDateTimeField::Load( SvPersistStream & /*rStm*/ ) diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 575bf495066b..7de23be1b6d7 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -138,21 +138,23 @@ namespace } } -TYPEINIT1_FACTORY(SvxPaperBinItem, SfxByteItem, new SvxPaperBinItem(0)); -TYPEINIT1_FACTORY(SvxSizeItem, SfxPoolItem, new SvxSizeItem(0)); -TYPEINIT1_FACTORY(SvxLRSpaceItem, SfxPoolItem, new SvxLRSpaceItem(0)); -TYPEINIT1_FACTORY(SvxULSpaceItem, SfxPoolItem, new SvxULSpaceItem(0)); -TYPEINIT1_FACTORY(SvxPrintItem, SfxBoolItem, new SvxPrintItem(0)); -TYPEINIT1_FACTORY(SvxOpaqueItem, SfxBoolItem, new SvxOpaqueItem(0)); -TYPEINIT1_FACTORY(SvxProtectItem, SfxPoolItem, new SvxProtectItem(0)); -TYPEINIT1_FACTORY(SvxBrushItem, SfxPoolItem, new SvxBrushItem(0)); -TYPEINIT1_FACTORY(SvxShadowItem, SfxPoolItem, new SvxShadowItem(0)); -TYPEINIT1_FACTORY(SvxBoxItem, SfxPoolItem, new SvxBoxItem(0)); -TYPEINIT1_FACTORY(SvxBoxInfoItem, SfxPoolItem, new SvxBoxInfoItem(0)); -TYPEINIT1_FACTORY(SvxFormatBreakItem, SfxEnumItem, new SvxFormatBreakItem(SVX_BREAK_NONE, 0)); -TYPEINIT1_FACTORY(SvxFormatKeepItem, SfxBoolItem, new SvxFormatKeepItem(false, 0)); -TYPEINIT1_FACTORY(SvxLineItem, SfxPoolItem, new SvxLineItem(0)); -TYPEINIT1_FACTORY(SvxFrameDirectionItem, SfxUInt16Item, new SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, 0)); + +SfxPoolItem* SvxPaperBinItem::CreateDefault() { return new SvxPaperBinItem(0);} +SfxPoolItem* SvxSizeItem::CreateDefault() { return new SvxSizeItem(0);} +SfxPoolItem* SvxLRSpaceItem::CreateDefault() { return new SvxLRSpaceItem(0);} +SfxPoolItem* SvxULSpaceItem::CreateDefault() { return new SvxULSpaceItem(0);} +SfxPoolItem* SvxPrintItem::CreateDefault() { return new SvxPrintItem(0);} +SfxPoolItem* SvxOpaqueItem::CreateDefault() { return new SvxOpaqueItem(0);} +SfxPoolItem* SvxProtectItem::CreateDefault() { return new SvxProtectItem(0);} +SfxPoolItem* SvxBrushItem::CreateDefault() { return new SvxBrushItem(0);} +SfxPoolItem* SvxShadowItem::CreateDefault() { return new SvxShadowItem(0);} +SfxPoolItem* SvxBoxItem::CreateDefault() { return new SvxBoxItem(0);} +SfxPoolItem* SvxBoxInfoItem::CreateDefault() { return new SvxBoxInfoItem(0);} +SfxPoolItem* SvxFormatBreakItem::CreateDefault() { return new SvxFormatBreakItem(SVX_BREAK_NONE, 0);} +SfxPoolItem* SvxFormatKeepItem::CreateDefault() { return new SvxFormatKeepItem(false, 0);} +SfxPoolItem* SvxLineItem::CreateDefault() { return new SvxLineItem(0);} +SfxPoolItem* SvxFrameDirectionItem::CreateDefault() { return new SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, 0);} + // class SvxPaperBinItem ------------------------------------------------ diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx index c8806bd61760..32d50c745723 100644 --- a/editeng/source/items/justifyitem.cxx +++ b/editeng/source/items/justifyitem.cxx @@ -31,8 +31,9 @@ #include <com/sun/star/style/VerticalAlignment.hpp> -TYPEINIT1_FACTORY( SvxHorJustifyItem, SfxEnumItem, new SvxHorJustifyItem(SVX_HOR_JUSTIFY_STANDARD, 0) ); -TYPEINIT1_FACTORY( SvxVerJustifyItem, SfxEnumItem, new SvxVerJustifyItem(SVX_VER_JUSTIFY_STANDARD, 0) ); + +SfxPoolItem* SvxHorJustifyItem::CreateDefault() { return new SvxHorJustifyItem(SVX_HOR_JUSTIFY_STANDARD, 0) ;} +SfxPoolItem* SvxVerJustifyItem::CreateDefault() { return new SvxVerJustifyItem(SVX_VER_JUSTIFY_STANDARD, 0) ;} using namespace ::com::sun::star; diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx index a11c7984e5c5..54521c2cabc7 100644 --- a/editeng/source/items/optitems.cxx +++ b/editeng/source/items/optitems.cxx @@ -30,8 +30,6 @@ using namespace ::com::sun::star::linguistic2; // STATIC DATA ----------------------------------------------------------- -TYPEINIT1(SfxSpellCheckItem, SfxPoolItem); -TYPEINIT1(SfxHyphenRegionItem, SfxPoolItem); // class SfxSpellCheckItem ----------------------------------------------- diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 3c95e3de90d7..061bf02c9eba 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -24,7 +24,6 @@ #include <comphelper/processfactory.hxx> #include <unotools/syslocale.hxx> #include <comphelper/types.hxx> -#include <tools/rtti.hxx> #include <tools/mapunit.hxx> #include <svl/itempool.hxx> #include <svl/memberid.hrc> @@ -53,20 +52,20 @@ using namespace ::com::sun::star; -TYPEINIT1_FACTORY(SvxLineSpacingItem, SfxPoolItem , new SvxLineSpacingItem(LINE_SPACE_DEFAULT_HEIGHT, 0)); -TYPEINIT1_FACTORY(SvxAdjustItem, SfxPoolItem, new SvxAdjustItem(SVX_ADJUST_LEFT, 0)); -TYPEINIT1_FACTORY(SvxWidowsItem, SfxByteItem, new SvxWidowsItem(0, 0)); -TYPEINIT1_FACTORY(SvxOrphansItem, SfxByteItem, new SvxOrphansItem(0, 0)); -TYPEINIT1_FACTORY(SvxHyphenZoneItem, SfxPoolItem, new SvxHyphenZoneItem(false, 0)); -TYPEINIT1_FACTORY(SvxTabStopItem, SfxPoolItem, new SvxTabStopItem(0)); -TYPEINIT1_FACTORY(SvxFormatSplitItem, SfxBoolItem, new SvxFormatSplitItem(false, 0)); -TYPEINIT1_FACTORY(SvxPageModelItem, SfxStringItem, new SvxPageModelItem(0)); -TYPEINIT1_FACTORY(SvxScriptSpaceItem, SfxBoolItem, new SvxScriptSpaceItem(false, 0)); -TYPEINIT1_FACTORY(SvxHangingPunctuationItem, SfxBoolItem, new SvxHangingPunctuationItem(false, 0)); -TYPEINIT1_FACTORY(SvxForbiddenRuleItem, SfxBoolItem, new SvxForbiddenRuleItem(false, 0)); -TYPEINIT1_FACTORY(SvxParaVertAlignItem, SfxUInt16Item, new SvxParaVertAlignItem(0, 0)); -TYPEINIT1_FACTORY(SvxParaGridItem, SfxBoolItem, new SvxParaGridItem(true, 0)); +SfxPoolItem* SvxLineSpacingItem::CreateDefault() { return new SvxLineSpacingItem(LINE_SPACE_DEFAULT_HEIGHT, 0);} +SfxPoolItem* SvxAdjustItem::CreateDefault() { return new SvxAdjustItem(SVX_ADJUST_LEFT, 0);} +SfxPoolItem* SvxWidowsItem::CreateDefault() { return new SvxWidowsItem(0, 0);} +SfxPoolItem* SvxOrphansItem::CreateDefault() { return new SvxOrphansItem(0, 0);} +SfxPoolItem* SvxHyphenZoneItem::CreateDefault() { return new SvxHyphenZoneItem(false, 0);} +SfxPoolItem* SvxTabStopItem::CreateDefault() { return new SvxTabStopItem(0);} +SfxPoolItem* SvxFormatSplitItem::CreateDefault() { return new SvxFormatSplitItem(false, 0);} +SfxPoolItem* SvxPageModelItem::CreateDefault() { return new SvxPageModelItem(0);} +SfxPoolItem* SvxScriptSpaceItem::CreateDefault() { return new SvxScriptSpaceItem(false, 0);} +SfxPoolItem* SvxHangingPunctuationItem::CreateDefault() { return new SvxHangingPunctuationItem(false, 0);} +SfxPoolItem* SvxForbiddenRuleItem::CreateDefault() { return new SvxForbiddenRuleItem(false, 0);} +SfxPoolItem* SvxParaVertAlignItem::CreateDefault() { return new SvxParaVertAlignItem(0, 0);} +SfxPoolItem* SvxParaGridItem::CreateDefault() { return new SvxParaGridItem(true, 0);} SvxLineSpacingItem::SvxLineSpacingItem( sal_uInt16 nHeight, const sal_uInt16 nId ) diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index ad06c25257bb..69a6ca799af2 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -105,43 +105,38 @@ bool SvxFontItem::bEnableStoreUnicodeNames = false; // STATIC DATA ----------------------------------------------------------- - -TYPEINIT1(SvxFontListItem, SfxPoolItem); -TYPEINIT1_FACTORY(SvxFontItem, SfxPoolItem, new SvxFontItem(0)); -TYPEINIT1_FACTORY(SvxPostureItem, SfxEnumItem, new SvxPostureItem(ITALIC_NONE, 0)); -TYPEINIT1_FACTORY(SvxWeightItem, SfxEnumItem, new SvxWeightItem(WEIGHT_NORMAL, 0)); -TYPEINIT1_FACTORY(SvxFontHeightItem, SfxPoolItem, new SvxFontHeightItem(240, 100, 0)); -TYPEINIT1_FACTORY(SvxFontWidthItem, SfxPoolItem, new SvxFontWidthItem(0, 100, 0)); -TYPEINIT1_FACTORY(SvxTextLineItem, SfxEnumItem, new SvxTextLineItem(UNDERLINE_NONE, 0)); -TYPEINIT1_FACTORY(SvxUnderlineItem, SfxEnumItem, new SvxUnderlineItem(UNDERLINE_NONE, 0)); -TYPEINIT1_FACTORY(SvxOverlineItem, SfxEnumItem, new SvxOverlineItem(UNDERLINE_NONE, 0)); -TYPEINIT1_FACTORY(SvxCrossedOutItem, SfxEnumItem, new SvxCrossedOutItem(STRIKEOUT_NONE, 0)); -TYPEINIT1_FACTORY(SvxShadowedItem, SfxBoolItem, new SvxShadowedItem(false, 0)); -TYPEINIT1_FACTORY(SvxAutoKernItem, SfxBoolItem, new SvxAutoKernItem(false, 0)); -TYPEINIT1_FACTORY(SvxWordLineModeItem, SfxBoolItem, new SvxWordLineModeItem(false, 0)); -TYPEINIT1_FACTORY(SvxContourItem, SfxBoolItem, new SvxContourItem(false, 0)); -TYPEINIT1_FACTORY(SvxPropSizeItem, SfxUInt16Item, new SvxPropSizeItem(100, 0)); -TYPEINIT1_FACTORY(SvxColorItem, SfxPoolItem, new SvxColorItem(0)); -// XXX: Should 2nd argument of next line SfxColorItem or SfxPoolItem? -TYPEINIT1_FACTORY(SvxBackgroundColorItem, SvxColorItem, new SvxBackgroundColorItem(0)); -TYPEINIT1_FACTORY(SvxCharSetColorItem, SvxColorItem, new SvxCharSetColorItem(0)); -TYPEINIT1_FACTORY(SvxKerningItem, SfxInt16Item, new SvxKerningItem(0, 0)); -TYPEINIT1_FACTORY(SvxCaseMapItem, SfxEnumItem, new SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, 0)); -TYPEINIT1_FACTORY(SvxEscapementItem, SfxPoolItem, new SvxEscapementItem(0)); -TYPEINIT1_FACTORY(SvxLanguageItem, SfxEnumItem, new SvxLanguageItem(LANGUAGE_GERMAN, 0)); -TYPEINIT1_FACTORY(SvxNoLinebreakItem, SfxBoolItem, new SvxNoLinebreakItem(true, 0)); -TYPEINIT1_FACTORY(SvxNoHyphenItem, SfxBoolItem, new SvxNoHyphenItem(true, 0)); -TYPEINIT1_FACTORY(SvxLineColorItem, SvxColorItem, new SvxLineColorItem(0)); -TYPEINIT1_FACTORY(SvxBlinkItem, SfxBoolItem, new SvxBlinkItem(false, 0)); -TYPEINIT1_FACTORY(SvxEmphasisMarkItem, SfxUInt16Item, new SvxEmphasisMarkItem(EMPHASISMARK_NONE, 0)); -TYPEINIT1_FACTORY(SvxTwoLinesItem, SfxPoolItem, new SvxTwoLinesItem(true, 0, 0, 0)); -TYPEINIT1_FACTORY(SvxScriptTypeItem, SfxUInt16Item, new SvxScriptTypeItem); -TYPEINIT1_FACTORY(SvxCharRotateItem, SfxUInt16Item, new SvxCharRotateItem(0, false, 0)); -TYPEINIT1_FACTORY(SvxCharScaleWidthItem, SfxUInt16Item, new SvxCharScaleWidthItem(100, 0)); -TYPEINIT1_FACTORY(SvxCharReliefItem, SfxEnumItem, new SvxCharReliefItem(RELIEF_NONE, 0)); -TYPEINIT1_FACTORY(SvxRsidItem, SfxUInt32Item, new SvxRsidItem(0, 0)); - -TYPEINIT1(SvxScriptSetItem, SfxSetItem ); +SfxPoolItem* SvxFontItem::CreateDefault() {return new SvxFontItem(0);} +SfxPoolItem* SvxPostureItem::CreateDefault() { return new SvxPostureItem(ITALIC_NONE, 0);} +SfxPoolItem* SvxWeightItem::CreateDefault() {return new SvxWeightItem(WEIGHT_NORMAL, 0);} +SfxPoolItem* SvxFontHeightItem::CreateDefault() {return new SvxFontHeightItem(240, 100, 0);} +SfxPoolItem* SvxFontWidthItem::CreateDefault() {return new SvxFontWidthItem(0, 100, 0);} +SfxPoolItem* SvxTextLineItem::CreateDefault() {return new SvxTextLineItem(UNDERLINE_NONE, 0);} +SfxPoolItem* SvxUnderlineItem::CreateDefault() {return new SvxUnderlineItem(UNDERLINE_NONE, 0);} +SfxPoolItem* SvxOverlineItem::CreateDefault() {return new SvxOverlineItem(UNDERLINE_NONE, 0);} +SfxPoolItem* SvxCrossedOutItem::CreateDefault() {return new SvxCrossedOutItem(STRIKEOUT_NONE, 0);} +SfxPoolItem* SvxShadowedItem::CreateDefault() {return new SvxShadowedItem(false, 0);} +SfxPoolItem* SvxAutoKernItem::CreateDefault() {return new SvxAutoKernItem(false, 0);} +SfxPoolItem* SvxWordLineModeItem::CreateDefault() {return new SvxWordLineModeItem(false, 0);} +SfxPoolItem* SvxContourItem::CreateDefault() {return new SvxContourItem(false, 0);} +SfxPoolItem* SvxPropSizeItem::CreateDefault() {return new SvxPropSizeItem(100, 0);} +SfxPoolItem* SvxColorItem::CreateDefault() {return new SvxColorItem(0);} +SfxPoolItem* SvxBackgroundColorItem::CreateDefault() {return new SvxBackgroundColorItem(0);} +SfxPoolItem* SvxCharSetColorItem::CreateDefault() {return new SvxCharSetColorItem(0);} +SfxPoolItem* SvxKerningItem::CreateDefault() {return new SvxKerningItem(0, 0);} +SfxPoolItem* SvxCaseMapItem::CreateDefault() {return new SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, 0);} +SfxPoolItem* SvxEscapementItem::CreateDefault() {return new SvxEscapementItem(0);} +SfxPoolItem* SvxLanguageItem::CreateDefault() {return new SvxLanguageItem(LANGUAGE_GERMAN, 0);} +SfxPoolItem* SvxNoLinebreakItem::CreateDefault() {return new SvxNoLinebreakItem(true, 0);} +SfxPoolItem* SvxNoHyphenItem::CreateDefault() {return new SvxNoHyphenItem(true, 0);} +SfxPoolItem* SvxLineColorItem::CreateDefault() {return new SvxLineColorItem(0);} +SfxPoolItem* SvxBlinkItem::CreateDefault() {return new SvxBlinkItem(false, 0);} +SfxPoolItem* SvxEmphasisMarkItem::CreateDefault() {return new SvxEmphasisMarkItem(EMPHASISMARK_NONE, 0);} +SfxPoolItem* SvxTwoLinesItem::CreateDefault() {return new SvxTwoLinesItem(true, 0, 0, 0);} +SfxPoolItem* SvxScriptTypeItem::CreateDefault() {return new SvxScriptTypeItem();} +SfxPoolItem* SvxCharRotateItem::CreateDefault() {return new SvxCharRotateItem(0, false, 0);} +SfxPoolItem* SvxCharScaleWidthItem::CreateDefault() {return new SvxCharScaleWidthItem(100, 0);} +SfxPoolItem* SvxCharReliefItem::CreateDefault() {return new SvxCharReliefItem(RELIEF_NONE, 0);} +SfxPoolItem* SvxRsidItem::CreateDefault() {return new SvxRsidItem(0, 0);} // class SvxFontListItem ------------------------------------------------- diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index 50449a0b34cf..a5c271326f23 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -25,7 +25,8 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; -TYPEINIT1_FACTORY(SvxWritingModeItem, SfxUInt16Item, new SvxWritingModeItem(css::text::WritingMode_LR_TB, 0)); + +SfxPoolItem* SvxWritingModeItem::CreateDefault() { return new SvxWritingModeItem(css::text::WritingMode_LR_TB, 0);} SvxWritingModeItem::SvxWritingModeItem( WritingMode eValue, sal_uInt16 _nWhich ) : SfxUInt16Item( _nWhich, (sal_uInt16)eValue ) diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index 6906e5ed2648..1b100b55dde7 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::xml; -TYPEINIT1(SvXMLAttrContainerItem, SfxPoolItem); SvXMLAttrContainerItem::SvXMLAttrContainerItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich ) |