diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-15 11:32:16 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-16 14:44:19 +0200 |
commit | f66661c166244f9828e7a383539aa763507e45ef (patch) | |
tree | 834d3e86eae8ee1bd0f5ff79f9bf63c2005beec3 /editeng | |
parent | convert SvxTimeType to scoped enum (diff) | |
download | core-f66661c166244f9828e7a383539aa763507e45ef.tar.gz core-f66661c166244f9828e7a383539aa763507e45ef.zip |
convert SvxTimeFormat to scoped enum
and make the numerators look more like our internal formatting codes
Change-Id: I3b3d448cec913e72c7ffb6cc3e7754241af36d93
Reviewed-on: https://gerrit.libreoffice.org/42345
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 | 35 | ||||
-rw-r--r-- | editeng/source/uno/unofield.cxx | 9 |
2 files changed, 23 insertions, 21 deletions
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index dab1ad10c484..50061b0d4bef 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -89,7 +89,8 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe sal_Int32 nNumFmt = -1; xPropSet->getPropertyValue(UNO_TC_PROP_NUMFORMAT) >>= nNumFmt; - if (nNumFmt >= SVXTIMEFORMAT_APPDEFAULT && nNumFmt <= SVXTIMEFORMAT_AM_HMSH) + if (static_cast<SvxTimeFormat>(nNumFmt) >= SvxTimeFormat::AppDefault && + static_cast<SvxTimeFormat>(nNumFmt) <= SvxTimeFormat::HH12_MM_SS_00_AMPM) pData->SetFormat(static_cast<SvxTimeFormat>(nNumFmt)); return pData; @@ -595,7 +596,7 @@ SvxExtTimeField::SvxExtTimeField() : m_nFixTime( tools::Time(tools::Time::SYSTEM).GetTime() ) { eType = SvxTimeType::Var; - eFormat = SVXTIMEFORMAT_STANDARD; + eFormat = SvxTimeFormat::Standard; } @@ -639,13 +640,13 @@ OUString SvxExtTimeField::GetFormatted( tools::Time const & aTime, SvxTimeFormat { switch( eFormat ) { - case SVXTIMEFORMAT_SYSTEM : - OSL_FAIL( "SVXTIMEFORMAT_SYSTEM: not implemented" ); - eFormat = SVXTIMEFORMAT_STANDARD; + case SvxTimeFormat::System : + OSL_FAIL( "SvxTimeFormat::System: not implemented" ); + eFormat = SvxTimeFormat::Standard; break; - case SVXTIMEFORMAT_APPDEFAULT : - OSL_FAIL( "SVXTIMEFORMAT_APPDEFAULT: not implemented" ); - eFormat = SVXTIMEFORMAT_STANDARD; + case SvxTimeFormat::AppDefault : + OSL_FAIL( "SvxTimeFormat::AppDefault: not implemented" ); + eFormat = SvxTimeFormat::Standard; break; default: ;//prevent warning } @@ -654,10 +655,10 @@ OUString SvxExtTimeField::GetFormatted( tools::Time const & aTime, SvxTimeFormat switch( eFormat ) { - case SVXTIMEFORMAT_12_HM: + case SvxTimeFormat::HH12_MM: nFormatKey = rFormatter.GetFormatIndex( NF_TIME_HHMMAMPM, eLang ); break; - case SVXTIMEFORMAT_12_HMSH: + case SvxTimeFormat::HH12_MM_SS_00: { // no builtin format available, try to insert or reuse OUString aFormatCode( "HH:MM:SS.00 AM/PM" ); @@ -665,26 +666,26 @@ OUString SvxExtTimeField::GetFormatted( tools::Time const & aTime, SvxTimeFormat short nType; rFormatter.PutandConvertEntry( aFormatCode, nCheckPos, nType, nFormatKey, LANGUAGE_ENGLISH_US, eLang ); - DBG_ASSERT( nCheckPos == 0, "SVXTIMEFORMAT_12_HMSH: could not insert format code" ); + DBG_ASSERT( nCheckPos == 0, "SvxTimeFormat::HH12_MM_SS_00: could not insert format code" ); if ( nCheckPos ) { nFormatKey = rFormatter.GetFormatIndex( NF_TIME_HH_MMSS00, eLang ); } break; } - case SVXTIMEFORMAT_24_HM: + case SvxTimeFormat::HH24_MM: nFormatKey = rFormatter.GetFormatIndex( NF_TIME_HHMM, eLang ); break; - case SVXTIMEFORMAT_24_HMSH: + case SvxTimeFormat::HH24_MM_SS_00: nFormatKey = rFormatter.GetFormatIndex( NF_TIME_HH_MMSS00, eLang ); break; - case SVXTIMEFORMAT_12_HMS: + case SvxTimeFormat::HH12_MM_SS: nFormatKey = rFormatter.GetFormatIndex( NF_TIME_HHMMSSAMPM, eLang ); break; - case SVXTIMEFORMAT_24_HMS: + case SvxTimeFormat::HH24_MM_SS: nFormatKey = rFormatter.GetFormatIndex( NF_TIME_HHMMSS, eLang ); break; - case SVXTIMEFORMAT_STANDARD: + case SvxTimeFormat::Standard: default: nFormatKey = rFormatter.GetStandardFormat( css::util::NumberFormat::TIME, eLang ); } @@ -937,7 +938,7 @@ OUString SvxDateTimeField::GetFormatted( SvxTimeFormat eTimeFormat = (SvxTimeFormat)((eFormat >> 4) & 0x0f); - if(eTimeFormat) + if(eTimeFormat != SvxTimeFormat::AppDefault) { OUStringBuffer aBuf(aRet); diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index e97c3d3c0e0e..194781fc9a95 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -259,7 +259,7 @@ SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) throw() case text::textfield::Type::TIME: mpImpl->mbBoolean2 = false; mpImpl->mbBoolean1 = false; - mpImpl->mnInt32 = SVXTIMEFORMAT_STANDARD; + mpImpl->mnInt32 = static_cast<sal_Int32>(SvxTimeFormat::Standard); break; case text::textfield::Type::URL: @@ -327,14 +327,14 @@ SvxUnoTextField::SvxUnoTextField( uno::Reference< text::XTextRange > const & xAn case text::textfield::Type::TIME: mpImpl->mbBoolean2 = false; mpImpl->mbBoolean1 = false; - mpImpl->mnInt32 = SVXTIMEFORMAT_STANDARD; + mpImpl->mnInt32 = static_cast<sal_Int32>(SvxTimeFormat::Standard); break; case text::textfield::Type::EXTENDED_TIME: mpImpl->mbBoolean2 = false; mpImpl->maDateTime = getTime( static_cast<const SvxExtTimeField*>(pData)->GetFixTime() ); mpImpl->mbBoolean1 = static_cast<const SvxExtTimeField*>(pData)->GetType() == SvxTimeType::Fix; - mpImpl->mnInt32 = static_cast<const SvxExtTimeField*>(pData)->GetFormat(); + mpImpl->mnInt32 = static_cast<sal_Int32>(static_cast<const SvxExtTimeField*>(pData)->GetFormat()); break; case text::textfield::Type::URL: @@ -402,7 +402,8 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() tools::Time aTime( setTime( mpImpl->maDateTime ) ); pData = new SvxExtTimeField( aTime, mpImpl->mbBoolean1?SvxTimeType::Fix:SvxTimeType::Var ); - if( mpImpl->mnInt32 >= SVXTIMEFORMAT_APPDEFAULT && mpImpl->mnInt32 <= SVXTIMEFORMAT_AM_HMSH ) + if( static_cast<SvxTimeFormat>(mpImpl->mnInt32) >= SvxTimeFormat::AppDefault && + static_cast<SvxTimeFormat>(mpImpl->mnInt32) <= SvxTimeFormat::HH12_MM_SS_00_AMPM ) static_cast<SvxExtTimeField*>(pData)->SetFormat( (SvxTimeFormat)mpImpl->mnInt32 ); } else |