From 50ac0f503b763d08aef4a193c38e64b70220bfba Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 8 May 2016 09:21:17 +0200 Subject: convert FONT_EMPHASIS_MARK to scoped enum Change-Id: I137c78b337e57d3442db08334128e79d186b278f Reviewed-on: https://gerrit.libreoffice.org/24753 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- editeng/source/editeng/editdoc.cxx | 2 +- editeng/source/editeng/eerdll.cxx | 2 +- editeng/source/editeng/impedit4.cxx | 6 ++--- editeng/source/items/textitem.cxx | 50 +++++++++++++++++++----------------- editeng/source/outliner/outliner.cxx | 2 +- editeng/source/rtf/rtfitem.cxx | 6 ++--- 6 files changed, 35 insertions(+), 33 deletions(-) (limited to 'editeng') diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 38d749b581fe..c7b202733b74 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -2081,7 +2081,7 @@ void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent, S if ( bSearchInParent || ( rSet.GetItemState( EE_CHAR_WLM ) == SfxItemState::SET ) ) rFont.SetWordLineMode( static_cast(rSet.Get( EE_CHAR_WLM )).GetValue() ); if ( bSearchInParent || ( rSet.GetItemState( EE_CHAR_EMPHASISMARK ) == SfxItemState::SET ) ) - rFont.SetEmphasisMark( static_cast(rSet.Get( EE_CHAR_EMPHASISMARK )).GetValue() ); + rFont.SetEmphasisMark( static_cast(rSet.Get( EE_CHAR_EMPHASISMARK )).GetEmphasisMark() ); if ( bSearchInParent || ( rSet.GetItemState( EE_CHAR_RELIEF ) == SfxItemState::SET ) ) rFont.SetRelief( (FontRelief)static_cast(rSet.Get( EE_CHAR_RELIEF )).GetValue() ); diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx index 1be1ce37516c..b444d6c0ac0a 100644 --- a/editeng/source/editeng/eerdll.cxx +++ b/editeng/source/editeng/eerdll.cxx @@ -150,7 +150,7 @@ SfxPoolItem** GlobalEditData::GetDefItems() ppDefItems[40] = new SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CTL ); ppDefItems[41] = new SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CJK ); ppDefItems[42] = new SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CTL ); - ppDefItems[43] = new SvxEmphasisMarkItem( EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK ); + ppDefItems[43] = new SvxEmphasisMarkItem( FontEmphasisMark::NONE, EE_CHAR_EMPHASISMARK ); ppDefItems[44] = new SvxCharReliefItem( RELIEF_NONE, EE_CHAR_RELIEF ); ppDefItems[45] = new SfxVoidItem( EE_CHAR_RUBI_DUMMY ); ppDefItems[46] = new SvXMLAttrContainerItem( EE_CHAR_XMLATTRIBS ); diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index fc7744a956f0..07ad13a8bde3 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -921,10 +921,10 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, break; case EE_CHAR_EMPHASISMARK: { - sal_uInt16 nMark = static_cast(rItem).GetValue(); - if ( nMark == EMPHASISMARK_NONE ) + FontEmphasisMark nMark = static_cast(rItem).GetEmphasisMark(); + if ( nMark == FontEmphasisMark::NONE ) rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ACCNONE ); - else if ( nMark == EMPHASISMARK_SIDE_DOTS ) + else if ( nMark == (FontEmphasisMark::Accent | FontEmphasisMark::PosAbove) ) rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ACCCOMMA ); else rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ACCDOT ); diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index ec4c7beabc3b..68e6abebc5d3 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -127,7 +127,7 @@ SfxPoolItem* SvxNoLinebreakItem::CreateDefault() {return new SvxNoLinebreakItem( 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* SvxEmphasisMarkItem::CreateDefault() {return new SvxEmphasisMarkItem(FontEmphasisMark::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);} @@ -2611,7 +2611,7 @@ bool SvxBlinkItem::GetPresentation SvxEmphasisMarkItem::SvxEmphasisMarkItem( const FontEmphasisMark nValue, const sal_uInt16 nId ) - : SfxUInt16Item( nId, nValue ) + : SfxUInt16Item( nId, (sal_uInt16)nValue ) { } @@ -2647,12 +2647,12 @@ bool SvxEmphasisMarkItem::GetPresentation const IntlWrapper * /*pIntl*/ ) const { - sal_uInt16 nVal = GetValue(); + FontEmphasisMark nVal = GetEmphasisMark(); rText = EE_RESSTR( RID_SVXITEMS_EMPHASIS_BEGIN_STYLE + - ( EMPHASISMARK_STYLE & nVal )); - sal_uInt16 nId = ( EMPHASISMARK_POS_ABOVE & nVal ) + (sal_uInt16)(FontEmphasisMark)( nVal & FontEmphasisMark::Style )); + sal_uInt16 nId = ( FontEmphasisMark::PosAbove & nVal ) ? RID_SVXITEMS_EMPHASIS_ABOVE_POS - : ( EMPHASISMARK_POS_BELOW & nVal ) + : ( FontEmphasisMark::PosBelow & nVal ) ? RID_SVXITEMS_EMPHASIS_BELOW_POS : 0; if( nId ) @@ -2668,17 +2668,18 @@ bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) cons { case MID_EMPHASIS: { - sal_Int16 nValue = GetValue(); + FontEmphasisMark nValue = GetEmphasisMark(); sal_Int16 nRet = 0; - switch(nValue & EMPHASISMARK_STYLE) + switch(nValue & FontEmphasisMark::Style) { - case EMPHASISMARK_NONE : nRet = FontEmphasis::NONE; break; - case EMPHASISMARK_DOT : nRet = FontEmphasis::DOT_ABOVE; break; - case EMPHASISMARK_CIRCLE : nRet = FontEmphasis::CIRCLE_ABOVE; break; - case EMPHASISMARK_DISC : nRet = FontEmphasis::DISK_ABOVE; break; - case EMPHASISMARK_ACCENT : nRet = FontEmphasis::ACCENT_ABOVE; break; + case FontEmphasisMark::NONE : nRet = FontEmphasis::NONE; break; + case FontEmphasisMark::Dot : nRet = FontEmphasis::DOT_ABOVE; break; + case FontEmphasisMark::Circle : nRet = FontEmphasis::CIRCLE_ABOVE; break; + case FontEmphasisMark::Disc : nRet = FontEmphasis::DISK_ABOVE; break; + case FontEmphasisMark::Accent : nRet = FontEmphasis::ACCENT_ABOVE; break; + default: break; } - if(nRet && nValue & EMPHASISMARK_POS_BELOW) + if(nRet && nValue & FontEmphasisMark::PosBelow) nRet += 10; rVal <<= nRet; } @@ -2697,20 +2698,21 @@ bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Int32 nValue = -1; rVal >>= nValue; + FontEmphasisMark nMark; switch(nValue) { - case FontEmphasis::NONE : nValue = EMPHASISMARK_NONE; break; - case FontEmphasis::DOT_ABOVE : nValue = EMPHASISMARK_DOT|EMPHASISMARK_POS_ABOVE; break; - case FontEmphasis::CIRCLE_ABOVE: nValue = EMPHASISMARK_CIRCLE|EMPHASISMARK_POS_ABOVE; break; - case FontEmphasis::DISK_ABOVE : nValue = EMPHASISMARK_DISC|EMPHASISMARK_POS_ABOVE; break; - case FontEmphasis::ACCENT_ABOVE: nValue = EMPHASISMARK_ACCENT|EMPHASISMARK_POS_ABOVE; break; - case FontEmphasis::DOT_BELOW : nValue = EMPHASISMARK_DOT|EMPHASISMARK_POS_BELOW; break; - case FontEmphasis::CIRCLE_BELOW: nValue = EMPHASISMARK_CIRCLE|EMPHASISMARK_POS_BELOW; break; - case FontEmphasis::DISK_BELOW : nValue = EMPHASISMARK_DISC|EMPHASISMARK_POS_BELOW; break; - case FontEmphasis::ACCENT_BELOW: nValue = EMPHASISMARK_ACCENT|EMPHASISMARK_POS_BELOW; break; + case FontEmphasis::NONE : nMark = FontEmphasisMark::NONE; break; + case FontEmphasis::DOT_ABOVE : nMark = FontEmphasisMark::Dot|FontEmphasisMark::PosAbove; break; + case FontEmphasis::CIRCLE_ABOVE: nMark = FontEmphasisMark::Circle|FontEmphasisMark::PosAbove; break; + case FontEmphasis::DISK_ABOVE : nMark = FontEmphasisMark::Disc|FontEmphasisMark::PosAbove; break; + case FontEmphasis::ACCENT_ABOVE: nMark = FontEmphasisMark::Accent|FontEmphasisMark::PosAbove; break; + case FontEmphasis::DOT_BELOW : nMark = FontEmphasisMark::Dot|FontEmphasisMark::PosBelow; break; + case FontEmphasis::CIRCLE_BELOW: nMark = FontEmphasisMark::Circle|FontEmphasisMark::PosBelow; break; + case FontEmphasis::DISK_BELOW : nMark = FontEmphasisMark::Disc|FontEmphasisMark::PosBelow; break; + case FontEmphasis::ACCENT_BELOW: nMark = FontEmphasisMark::Accent|FontEmphasisMark::PosBelow; break; default: return false; } - SetValue( (sal_Int16)nValue ); + SetValue( (sal_Int16)nMark ); } break; } diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index c39f8d610321..12ae4165f32f 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -853,7 +853,7 @@ vcl::Font Outliner::ImpCalcBulletFont( sal_Int32 nPara ) const aBulletFont.SetUnderline( LINESTYLE_NONE ); aBulletFont.SetOverline( LINESTYLE_NONE ); aBulletFont.SetStrikeout( STRIKEOUT_NONE ); - aBulletFont.SetEmphasisMark( EMPHASISMARK_NONE ); + aBulletFont.SetEmphasisMark( FontEmphasisMark::NONE ); aBulletFont.SetRelief( RELIEF_NONE ); } diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index 510eba5b6d74..3298878baf20 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -1005,14 +1005,14 @@ ATTR_SETOVERLINE: case RTF_ACCNONE: - eEmphasis = EMPHASISMARK_NONE; + eEmphasis = FontEmphasisMark::NONE; goto ATTR_SETEMPHASIS; case RTF_ACCDOT: - eEmphasis = EMPHASISMARK_DOTS_ABOVE; + eEmphasis = (FontEmphasisMark::Dot | FontEmphasisMark::PosAbove); goto ATTR_SETEMPHASIS; case RTF_ACCCOMMA: - eEmphasis = EMPHASISMARK_SIDE_DOTS; + eEmphasis = (FontEmphasisMark::Accent | FontEmphasisMark::PosAbove); ATTR_SETEMPHASIS: if( aPlainMap.nEmphasis ) { -- cgit