diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-15 09:50:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-15 10:38:11 +0200 |
| commit | 4da85bf822dcce7da6c2243b408652af8eb55b71 (patch) | |
| tree | aeaed312f544704447e3255b55c2be6e42f92ca2 /editeng | |
| parent | 7151bbfca25d92dff1f0968c4baaae60d724c060 (diff) | |
convert SvxAuthorFormat to scoped enum
Change-Id: I5553ea640a4483c98ec5f5240594e30a72c968f8
Reviewed-on: https://gerrit.libreoffice.org/42311
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/flditem.cxx | 13 | ||||
| -rw-r--r-- | editeng/source/uno/unofield.cxx | 9 |
2 files changed, 12 insertions, 10 deletions
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index b16c0da747b6..05146abce0e4 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -185,9 +185,10 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe { if (!bFullName) { - pData->SetFormat(SVXAUTHORFORMAT_SHORTNAME); + pData->SetFormat(SvxAuthorFormat::ShortName); } - else if (nFmt >= SVXAUTHORFORMAT_FULLNAME && nFmt <= SVXAUTHORFORMAT_SHORTNAME) + else if (static_cast<SvxAuthorFormat>(nFmt) >= SvxAuthorFormat::FullName && + static_cast<SvxAuthorFormat>(nFmt) <= SvxAuthorFormat::ShortName) { pData->SetFormat(static_cast<SvxAuthorFormat>(nFmt)); } @@ -860,18 +861,18 @@ OUString SvxAuthorField::GetFormatted() const switch( eFormat ) { - case SVXAUTHORFORMAT_FULLNAME: + case SvxAuthorFormat::FullName: aString = aFirstName + " " + aName; break; - case SVXAUTHORFORMAT_NAME: + case SvxAuthorFormat::LastName: aString = aName; break; - case SVXAUTHORFORMAT_FIRSTNAME: + case SvxAuthorFormat::FirstName: aString = aFirstName; break; - case SVXAUTHORFORMAT_SHORTNAME: + case SvxAuthorFormat::ShortName: aString = aShortName; break; } diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index e6357f0e4969..985dbddb3306 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -272,7 +272,7 @@ SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) throw() break; case text::textfield::Type::AUTHOR: - mpImpl->mnInt16 = SVXAUTHORFORMAT_FULLNAME; + mpImpl->mnInt16 = static_cast<sal_uInt16>(SvxAuthorFormat::FullName); mpImpl->mbBoolean1 = false; mpImpl->mbBoolean2 = true; break; @@ -357,7 +357,7 @@ SvxUnoTextField::SvxUnoTextField( uno::Reference< text::XTextRange > const & xAn mpImpl->mnInt16 = sal::static_int_cast< sal_Int16 >( static_cast<const SvxAuthorField*>(pData)->GetFormat()); mpImpl->mbBoolean1 = static_cast<const SvxAuthorField*>(pData)->GetType() == SVXAUTHORTYPE_FIX; - mpImpl->mbBoolean2 = static_cast<const SvxAuthorField*>(pData)->GetFormat() != SVXAUTHORFORMAT_SHORTNAME; + mpImpl->mbBoolean2 = static_cast<const SvxAuthorField*>(pData)->GetFormat() != SvxAuthorFormat::ShortName; break; case text::textfield::Type::MEASURE: @@ -478,9 +478,10 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() if( !mpImpl->mbBoolean2 ) { - static_cast<SvxAuthorField*>(pData)->SetFormat( SVXAUTHORFORMAT_SHORTNAME ); + static_cast<SvxAuthorField*>(pData)->SetFormat( SvxAuthorFormat::ShortName ); } - else if( mpImpl->mnInt16 >= SVXAUTHORFORMAT_FULLNAME && mpImpl->mnInt16 <= SVXAUTHORFORMAT_SHORTNAME ) + else if( static_cast<SvxAuthorFormat>(mpImpl->mnInt16) >= SvxAuthorFormat::FullName && + static_cast<SvxAuthorFormat>(mpImpl->mnInt16) <= SvxAuthorFormat::ShortName ) { static_cast<SvxAuthorField*>(pData)->SetFormat( (SvxAuthorFormat) mpImpl->mnInt16 ); } |