diff options
author | Noel Grandin <noel@peralex.com> | 2016-09-21 10:37:51 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-21 09:24:55 +0000 |
commit | 51c6e9153de507f37d1474b31f557265cb304c06 (patch) | |
tree | 6d02d302fbee51a934c9fb8235cf4b410fde5d53 /editeng | |
parent | 25e4708c1f49986f3f082beb2e940aa2d7fb4d81 (diff) |
convert SfxItemPresentation to scoped enum
Change-Id: Ibf605706a9f804ab509ac4f92f5f88fcf3daebc1
Reviewed-on: https://gerrit.libreoffice.org/29131
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/items/frmitems.cxx | 26 | ||||
-rw-r--r-- | editeng/source/items/paraitem.cxx | 22 | ||||
-rw-r--r-- | editeng/source/items/textitem.cxx | 4 |
3 files changed, 26 insertions, 26 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index ed7906d57bf5..7c259021a75a 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -191,11 +191,11 @@ bool SvxPaperBinItem::GetPresentation { switch ( ePres ) { - case SFX_ITEM_PRESENTATION_NAMELESS: + case SfxItemPresentation::Nameless: rText = OUString::number( GetValue() ); return true; - case SFX_ITEM_PRESENTATION_COMPLETE: + case SfxItemPresentation::Complete: { sal_uInt8 nValue = GetValue(); @@ -330,13 +330,13 @@ bool SvxSizeItem::GetPresentation OUString cpDelimTmp(cpDelim); switch ( ePres ) { - case SFX_ITEM_PRESENTATION_NAMELESS: + case SfxItemPresentation::Nameless: rText = GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl ) + cpDelimTmp + GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl ); return true; - case SFX_ITEM_PRESENTATION_COMPLETE: + case SfxItemPresentation::Complete: rText = EE_RESSTR(RID_SVXITEMS_SIZE_WIDTH) + GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl ) + " " + EE_RESSTR(GetMetricId(ePresUnit)) + @@ -603,7 +603,7 @@ bool SvxLRSpaceItem::GetPresentation { switch ( ePres ) { - case SFX_ITEM_PRESENTATION_NAMELESS: + case SfxItemPresentation::Nameless: { if ( 100 != nPropLeftMargin ) { @@ -633,7 +633,7 @@ bool SvxLRSpaceItem::GetPresentation eCoreUnit, ePresUnit, pIntl ); return true; } - case SFX_ITEM_PRESENTATION_COMPLETE: + case SfxItemPresentation::Complete: { rText = EE_RESSTR(RID_SVXITEMS_LRSPACE_LEFT); if ( 100 != nPropLeftMargin ) @@ -981,7 +981,7 @@ bool SvxULSpaceItem::GetPresentation { switch ( ePres ) { - case SFX_ITEM_PRESENTATION_NAMELESS: + case SfxItemPresentation::Nameless: { if ( 100 != nPropUpper ) { @@ -1000,7 +1000,7 @@ bool SvxULSpaceItem::GetPresentation rText += GetMetricText( (long)nLower, eCoreUnit, ePresUnit, pIntl ); return true; } - case SFX_ITEM_PRESENTATION_COMPLETE: + case SfxItemPresentation::Complete: { rText = EE_RESSTR(RID_SVXITEMS_ULSPACE_UPPER); if ( 100 != nPropUpper ) @@ -1464,7 +1464,7 @@ bool SvxShadowItem::GetPresentation { switch ( ePres ) { - case SFX_ITEM_PRESENTATION_NAMELESS: + case SfxItemPresentation::Nameless: { rText = ::GetColorString( aShadowColor ) + OUString(cpDelim); sal_uInt16 nId = RID_SVXITEMS_TRANSPARENT_FALSE; @@ -1479,7 +1479,7 @@ bool SvxShadowItem::GetPresentation EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation); return true; } - case SFX_ITEM_PRESENTATION_COMPLETE: + case SfxItemPresentation::Complete: { rText = EE_RESSTR(RID_SVXITEMS_SHADOW_COMPLETE) + ::GetColorString( aShadowColor ) + @@ -2066,7 +2066,7 @@ bool SvxBoxItem::GetPresentation OUString cpDelimTmp = OUString(cpDelim); switch ( ePres ) { - case SFX_ITEM_PRESENTATION_NAMELESS: + case SfxItemPresentation::Nameless: { rText.clear(); @@ -2106,7 +2106,7 @@ bool SvxBoxItem::GetPresentation } return true; } - case SFX_ITEM_PRESENTATION_COMPLETE: + case SfxItemPresentation::Complete: { if( !(pTop || pBottom || pLeft || pRight) ) { @@ -3162,7 +3162,7 @@ bool SvxLineItem::GetPresentation if ( pLine ) rText = pLine->GetValueString( eCoreUnit, ePresUnit, pIntl, - (SFX_ITEM_PRESENTATION_COMPLETE == ePres) ); + (SfxItemPresentation::Complete == ePres) ); return true; } diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 3ce42df30ac6..6a12381dc164 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -422,8 +422,8 @@ bool SvxAdjustItem::GetPresentation { switch ( ePres ) { - case SFX_ITEM_PRESENTATION_NAMELESS: - case SFX_ITEM_PRESENTATION_COMPLETE: + case SfxItemPresentation::Nameless: + case SfxItemPresentation::Complete: rText = GetValueTextByPos( (sal_uInt16)GetAdjust() ); return true; default: ;//prevent warning @@ -537,13 +537,13 @@ bool SvxWidowsItem::GetPresentation { switch ( ePres ) { - case SFX_ITEM_PRESENTATION_NAMELESS: + case SfxItemPresentation::Nameless: { rText = EE_RESSTR(RID_SVXITEMS_LINES); break; } - case SFX_ITEM_PRESENTATION_COMPLETE: + case SfxItemPresentation::Complete: { rText = EE_RESSTR(RID_SVXITEMS_WIDOWS_COMPLETE) + " " + EE_RESSTR(RID_SVXITEMS_LINES); break; @@ -598,13 +598,13 @@ bool SvxOrphansItem::GetPresentation { switch ( ePres ) { - case SFX_ITEM_PRESENTATION_NAMELESS: + case SfxItemPresentation::Nameless: { rText = EE_RESSTR(RID_SVXITEMS_LINES); break; } - case SFX_ITEM_PRESENTATION_COMPLETE: + case SfxItemPresentation::Complete: { rText = EE_RESSTR(RID_SVXITEMS_ORPHANS_COMPLETE) + " " + EE_RESSTR(RID_SVXITEMS_LINES); break; @@ -711,7 +711,7 @@ bool SvxHyphenZoneItem::GetPresentation OUString cpDelimTmp(cpDelim); switch ( ePres ) { - case SFX_ITEM_PRESENTATION_NAMELESS: + case SfxItemPresentation::Nameless: { sal_uInt16 nId = RID_SVXITEMS_HYPHEN_FALSE; @@ -728,7 +728,7 @@ bool SvxHyphenZoneItem::GetPresentation OUString::number( nMaxHyphens ); return true; } - case SFX_ITEM_PRESENTATION_COMPLETE: + case SfxItemPresentation::Complete: { sal_uInt16 nId = RID_SVXITEMS_HYPHEN_FALSE; @@ -1045,7 +1045,7 @@ bool SvxTabStopItem::GetPresentation rText += ","; rText += GetMetricText( ((*this)[i]).GetTabPos(), eCoreUnit, ePresUnit, pIntl ); - if ( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) + if ( SfxItemPresentation::Complete == ePres ) { rText += " " + EE_RESSTR(GetMetricId(ePresUnit)); } @@ -1256,12 +1256,12 @@ bool SvxPageModelItem::GetPresentation switch ( ePres ) { - case SFX_ITEM_PRESENTATION_NAMELESS: + case SfxItemPresentation::Nameless: if ( bSet ) rText = GetValue(); return true; - case SFX_ITEM_PRESENTATION_COMPLETE: + case SfxItemPresentation::Complete: if ( bSet ) { rText = EE_RESSTR(RID_SVXITEMS_PAGEMODEL_COMPLETE) + GetValue(); diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 9c1c339e323a..410b83a872c4 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -2032,11 +2032,11 @@ bool SvxKerningItem::GetPresentation { switch ( ePres ) { - case SFX_ITEM_PRESENTATION_NAMELESS: + case SfxItemPresentation::Nameless: rText = GetMetricText( (long)GetValue(), eCoreUnit, MAP_POINT, pIntl ) + " " + EE_RESSTR(GetMetricId(MAP_POINT)); return true; - case SFX_ITEM_PRESENTATION_COMPLETE: + case SfxItemPresentation::Complete: { rText = EE_RESSTR(RID_SVXITEMS_KERNING_COMPLETE); sal_uInt16 nId = 0; |