diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-29 20:23:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-30 06:41:53 +0000 |
| commit | 990082f37c31380d9fedd62c5dac1b5bff4c9636 (patch) | |
| tree | 8f567bbc9814fd8a5b610529d82610422da59910 /editeng/source/items | |
| parent | 446d0887ff5421822e0296e20cbb36f08f1e6445 (diff) | |
Convert FontRelief to scoped enum
Change-Id: I545c83d742db27f1a004b66e5eb1ef768f62e011
Reviewed-on: https://gerrit.libreoffice.org/25626
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'editeng/source/items')
| -rw-r--r-- | editeng/source/items/textitem.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 23243aa85d56..72172a67b35e 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -132,7 +132,7 @@ SfxPoolItem* SvxTwoLinesItem::CreateDefault() {return new SvxTwoLinesItem(true, 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* SvxCharReliefItem::CreateDefault() {return new SvxCharReliefItem(FontRelief::NONE, 0);} SfxPoolItem* SvxRsidItem::CreateDefault() {return new SvxRsidItem(0, 0);} @@ -3110,8 +3110,8 @@ SfxPoolItem* SvxCharReliefItem::Create(SvStream & rStrm, sal_uInt16) const SvStream& SvxCharReliefItem::Store(SvStream & rStrm, sal_uInt16 /*nIVer*/) const { - sal_uInt16 nVal = GetValue(); - rStrm.WriteUInt16( nVal ); + FontRelief nVal = GetValue(); + rStrm.WriteUInt16( (sal_uInt16)nVal ); return rStrm; } @@ -3140,7 +3140,7 @@ bool SvxCharReliefItem::GetPresentation OUString& rText, const IntlWrapper * /*pIntl*/ ) const { - rText = GetValueTextByPos( GetValue() ); + rText = GetValueTextByPos( (sal_uInt16)GetValue() ); return true; } @@ -3155,8 +3155,8 @@ bool SvxCharReliefItem::PutValue( const css::uno::Any& rVal, { sal_Int16 nVal = -1; rVal >>= nVal; - if(nVal >= 0 && nVal <= RELIEF_ENGRAVED) - SetValue( (sal_uInt16)nVal ); + if(nVal >= 0 && nVal <= (sal_Int16)FontRelief::Engraved) + SetValue( (FontRelief)nVal ); else bRet = false; } |