Kaydet (Commit) 03041e0f authored tarafından Michael Stahl's avatar Michael Stahl

tdf#112817 editeng,svx: fix SvxUnderlineItem/SvxOverlineItem SDI

This was asserting because the superclass SvxTextLineItem
was instantiated instead of the specific subclasses.

Change-Id: If26847b8fa96dbf00062ba8372fe58e58c786782
üst 97fdf8a0
......@@ -105,6 +105,8 @@ SfxPoolItem* SvxPostureItem::CreateDefault() { return new SvxPostureItem(ITALIC_
SfxPoolItem* SvxWeightItem::CreateDefault() {return new SvxWeightItem(WEIGHT_NORMAL, 0);}
SfxPoolItem* SvxFontHeightItem::CreateDefault() {return new SvxFontHeightItem(240, 100, 0);}
SfxPoolItem* SvxTextLineItem::CreateDefault() {return new SvxTextLineItem(LINESTYLE_NONE, 0);}
SfxPoolItem* SvxUnderlineItem::CreateDefault() {return new SvxUnderlineItem(LINESTYLE_NONE, 0);}
SfxPoolItem* SvxOverlineItem::CreateDefault() {return new SvxOverlineItem(LINESTYLE_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);}
......@@ -1234,6 +1236,7 @@ bool SvxTextLineItem::operator==( const SfxPoolItem& rItem ) const
// class SvxUnderlineItem ------------------------------------------------
SvxUnderlineItem::SvxUnderlineItem( const FontLineStyle eSt, const sal_uInt16 nId )
: SvxTextLineItem( eSt, nId )
{
......
......@@ -85,6 +85,8 @@ public:
class EDITENG_DLLPUBLIC SvxUnderlineItem : public SvxTextLineItem
{
public:
static SfxPoolItem* CreateDefault();
SvxUnderlineItem( const FontLineStyle eSt,
const sal_uInt16 nId );
......@@ -100,6 +102,8 @@ public:
class EDITENG_DLLPUBLIC SvxOverlineItem : public SvxTextLineItem
{
public:
static SfxPoolItem* CreateDefault();
SvxOverlineItem( const FontLineStyle eSt,
const sal_uInt16 nId );
......
......@@ -8561,7 +8561,7 @@ SfxVoidItem TwainTransfer SID_TWAIN_TRANSFER
]
SvxTextLineItem Underline SID_ATTR_CHAR_UNDERLINE
SvxUnderlineItem Underline SID_ATTR_CHAR_UNDERLINE
[
AutoUpdate = TRUE,
......@@ -8580,7 +8580,7 @@ SvxTextLineItem Underline SID_ATTR_CHAR_UNDERLINE
]
SvxTextLineItem Overline SID_ATTR_CHAR_OVERLINE
SvxOverlineItem Overline SID_ATTR_CHAR_OVERLINE
[
AutoUpdate = TRUE,
......
......@@ -225,7 +225,8 @@ struct SvxTextLine
BOOL HasColor MID_TL_HASCOLOR;
INT32 Color MID_TL_COLOR;
};
item SvxTextLine SvxTextLineItem;
item SvxTextLine SvxUnderlineItem;
item SvxTextLine SvxOverlineItem;
struct SvxBrush
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment