diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-15 09:29:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-15 10:21:09 +0200 |
| commit | fda59e9768bc8643ea36bda1539f22928b7946cf (patch) | |
| tree | ff61e5bbb98a29771c6276bdfa3147aef497c9a7 /editeng/source | |
| parent | 1fb44aaf6cfc13ab63e5ffcee976378deeac025e (diff) | |
convert SdrMeasureFieldKind to scoped enum
Change-Id: I8896d46623843d3fe341c057d7ee0376a99f4741
Reviewed-on: https://gerrit.libreoffice.org/42310
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng/source')
| -rw-r--r-- | editeng/source/items/flditem.cxx | 6 | ||||
| -rw-r--r-- | editeng/source/uno/unofield.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 138a10e557a0..b16c0da747b6 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -197,11 +197,11 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe } case text::textfield::Type::MEASURE: { - SdrMeasureFieldKind eKind = SDRMEASUREFIELD_VALUE; + SdrMeasureFieldKind eKind = SdrMeasureFieldKind::Value; sal_Int16 nTmp = -1; xPropSet->getPropertyValue(UNO_TC_PROP_MEASURE_KIND) >>= nTmp; - if (nTmp == static_cast<sal_Int16>(SDRMEASUREFIELD_UNIT) || - nTmp == static_cast<sal_Int16>(SDRMEASUREFIELD_ROTA90BLANCS)) + if (nTmp == static_cast<sal_Int16>(SdrMeasureFieldKind::Unit) || + nTmp == static_cast<sal_Int16>(SdrMeasureFieldKind::Rotate90Blanks)) eKind = static_cast<SdrMeasureFieldKind>(nTmp); return new SdrMeasureField(eKind); diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index b6d6da1dfb79..e6357f0e4969 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -278,7 +278,7 @@ SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) throw() break; case text::textfield::Type::MEASURE: - mpImpl->mnInt16 = SDRMEASUREFIELD_VALUE; + mpImpl->mnInt16 = static_cast<sal_uInt16>(SdrMeasureFieldKind::Value); break; default: @@ -490,8 +490,8 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() case text::textfield::Type::MEASURE: { - SdrMeasureFieldKind eKind = SDRMEASUREFIELD_VALUE; - if( mpImpl->mnInt16 == (sal_Int16)SDRMEASUREFIELD_UNIT || mpImpl->mnInt16 == (sal_Int16)SDRMEASUREFIELD_ROTA90BLANCS ) + SdrMeasureFieldKind eKind = SdrMeasureFieldKind::Value; + if( mpImpl->mnInt16 == (sal_Int16)SdrMeasureFieldKind::Unit || mpImpl->mnInt16 == (sal_Int16)SdrMeasureFieldKind::Rotate90Blanks ) eKind = (SdrMeasureFieldKind) mpImpl->mnInt16; pData = new SdrMeasureField( eKind); break; |