diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-15 10:40:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-16 14:43:25 +0200 |
| commit | 2ba9f793c7e80a3bed9aceb3281d55ddc7957f85 (patch) | |
| tree | 239f53bb2234516baf41b482293fca06fceff4e3 /editeng | |
| parent | 70e552065339f1f7ab14f991f3e840b5461e609e (diff) | |
convert SvxTimeType to scoped enum
Change-Id: Ic5ca8c50ccd74837cd0521a13e1f5eaa8e326ff3
Reviewed-on: https://gerrit.libreoffice.org/42344
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/accessibility/AccessibleEditableTextPara.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/items/flditem.cxx | 6 | ||||
| -rw-r--r-- | editeng/source/uno/unofield.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 073547645c08..7357d0681f5a 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -890,9 +890,9 @@ namespace const SvxExtTimeField* pTimeField = static_cast< const SvxExtTimeField* >(ree.pFieldItem->GetField()); if (pTimeField) { - if (pTimeField->GetType() == SVXTIMETYPE_FIX) + if (pTimeField->GetType() == SvxTimeType::Fix) strFldType = "time (fixed)"; - else if (pTimeField->GetType() == SVXTIMETYPE_VAR) + else if (pTimeField->GetType() == SvxTimeType::Var) strFldType = "time (variable)"; } break; diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index d6d2bda1a29b..dab1ad10c484 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -85,7 +85,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe bool bIsFixed = false; xPropSet->getPropertyValue(UNO_TC_PROP_IS_FIXED) >>= bIsFixed; - SvxExtTimeField* pData = new SvxExtTimeField(aTime, bIsFixed ? SVXTIMETYPE_FIX : SVXTIMETYPE_VAR); + SvxExtTimeField* pData = new SvxExtTimeField(aTime, bIsFixed ? SvxTimeType::Fix : SvxTimeType::Var); sal_Int32 nNumFmt = -1; xPropSet->getPropertyValue(UNO_TC_PROP_NUMFORMAT) >>= nNumFmt; @@ -594,7 +594,7 @@ SV_IMPL_PERSIST1( SvxExtTimeField ); SvxExtTimeField::SvxExtTimeField() : m_nFixTime( tools::Time(tools::Time::SYSTEM).GetTime() ) { - eType = SVXTIMETYPE_VAR; + eType = SvxTimeType::Var; eFormat = SVXTIMEFORMAT_STANDARD; } @@ -628,7 +628,7 @@ bool SvxExtTimeField::operator==( const SvxFieldData& rOther ) const OUString SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const { tools::Time aTime( tools::Time::EMPTY ); - if ( eType == SVXTIMETYPE_FIX ) + if ( eType == SvxTimeType::Fix ) aTime.SetTime(m_nFixTime); else aTime = tools::Time( tools::Time::SYSTEM ); // current time diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index 5642daf850e8..e97c3d3c0e0e 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -333,7 +333,7 @@ SvxUnoTextField::SvxUnoTextField( uno::Reference< text::XTextRange > const & xAn 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->mbBoolean1 = static_cast<const SvxExtTimeField*>(pData)->GetType() == SvxTimeType::Fix; mpImpl->mnInt32 = static_cast<const SvxExtTimeField*>(pData)->GetFormat(); break; @@ -400,7 +400,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() if( mnServiceId != text::textfield::Type::TIME && mnServiceId != text::textfield::Type::DATE ) { tools::Time aTime( setTime( mpImpl->maDateTime ) ); - pData = new SvxExtTimeField( aTime, mpImpl->mbBoolean1?SVXTIMETYPE_FIX:SVXTIMETYPE_VAR ); + pData = new SvxExtTimeField( aTime, mpImpl->mbBoolean1?SvxTimeType::Fix:SvxTimeType::Var ); if( mpImpl->mnInt32 >= SVXTIMEFORMAT_APPDEFAULT && mpImpl->mnInt32 <= SVXTIMEFORMAT_AM_HMSH ) static_cast<SvxExtTimeField*>(pData)->SetFormat( (SvxTimeFormat)mpImpl->mnInt32 ); |