diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-24 14:15:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-03-25 08:56:14 +0200 |
| commit | 6ef4d92869114179fc7802e2a2b5be665f248029 (patch) | |
| tree | d8758beaeb2a9d9789892e1d0969bc3b947db0ab /editeng | |
| parent | c7a50d072f0f9a19e7975c09eeff7a11bdea1370 (diff) | |
convert VALID_ constants to enum class
Change-Id: Id63d0e0dcf550b4d4f9cf3a2800aeb40f9f9bbce
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/items/frmitems.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index fae0be78ac8a..f6e2315c4f02 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -2709,7 +2709,7 @@ SfxPoolItem* SvxBoxInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const void SvxBoxInfoItem::ResetFlags() { - nValidFlags = 0x7F; // all valid except Disable + nValidFlags = static_cast<SvxBoxInfoItemValidFlags>(0x7F); // all valid except Disable } bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const @@ -2734,8 +2734,7 @@ bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const if ( IsMinDist() ) nVal |= 0x04; aSeq[2] = ::com::sun::star::uno::makeAny( nVal ); - nVal = nValidFlags; - aSeq[3] = ::com::sun::star::uno::makeAny( nVal ); + aSeq[3] = ::com::sun::star::uno::makeAny( static_cast<sal_Int16>(nValidFlags) ); aSeq[4] = ::com::sun::star::uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100(GetDefDist()) : GetDefDist()) ); rVal = ::com::sun::star::uno::makeAny( aSeq ); return true; @@ -2759,8 +2758,7 @@ bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const break; case MID_VALIDFLAGS: bIntMember = true; - nVal = nValidFlags; - rVal <<= nVal; + rVal <<= static_cast<sal_Int16>(nValidFlags); break; case MID_DISTANCE: bIntMember = true; @@ -2806,7 +2804,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) else return false; if ( aSeq[3] >>= nFlags ) - nValidFlags = (sal_uInt8)nFlags; + nValidFlags = static_cast<SvxBoxInfoItemValidFlags>(nFlags); else return false; if (( aSeq[4] >>= nVal ) && ( nVal >= 0 )) @@ -2919,7 +2917,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) sal_Int16 nFlags = sal_Int16(); bRet = (rVal >>= nFlags); if ( bRet ) - nValidFlags = (sal_uInt8)nFlags; + nValidFlags = static_cast<SvxBoxInfoItemValidFlags>(nFlags); break; } case MID_DISTANCE: |