diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2017-12-03 21:46:37 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-12-19 22:08:26 +0100 |
| commit | 00bc5a097313fbd003675267be961ad3a152ba42 (patch) | |
| tree | de9b9e6981d3c2f262b9391335a067d4898185b6 /sw/source/core/fields | |
| parent | b74da08e556b7b001943f0288a61da53791d4dcf (diff) | |
wrap scoped enum around css::util::NumberFormat
Change-Id: Icab5ded8bccdb95f79b3fa35ea164f47919c68fa
Reviewed-on: https://gerrit.libreoffice.org/46339
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sw/source/core/fields')
| -rw-r--r-- | sw/source/core/fields/cellfml.cxx | 8 | ||||
| -rw-r--r-- | sw/source/core/fields/fldbas.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx index 6582cd77e2de..f4a30868686b 100644 --- a/sw/source/core/fields/cellfml.cxx +++ b/sw/source/core/fields/cellfml.cxx @@ -217,16 +217,16 @@ double SwTableBox::GetValue( SwTableCalcPara& rCalcPara ) const SvNumberFormatter* pNumFormatr = pDoc->GetNumberFormatter(); - const sal_Int16 nFormatType = pNumFormatr->GetType( nFormatIndex ); - if( nFormatType == css::util::NumberFormat::TEXT ) + const SvNumFormatType nFormatType = pNumFormatr->GetType( nFormatIndex ); + if( nFormatType == SvNumFormatType::TEXT ) nFormatIndex = 0; // JP 22.04.98: Bug 49659 - special treatment for percentages else if( !sText.isEmpty() && - css::util::NumberFormat::PERCENT == nFormatType) + SvNumFormatType::PERCENT == nFormatType) { sal_uInt32 nTmpFormat = 0; if( pDoc->IsNumberFormat( sText, nTmpFormat, aNum ) && - css::util::NumberFormat::NUMBER == pNumFormatr->GetType( nTmpFormat )) + SvNumFormatType::NUMBER == pNumFormatr->GetType( nTmpFormat )) sText += "%"; } diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index 6febf519af6a..7726467f7336 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -477,7 +477,7 @@ OUString SwValueFieldType::ExpandValue( const double& rVal, if( nFormat < SV_COUNTRY_LANGUAGE_OFFSET && LANGUAGE_SYSTEM != nFormatLng ) { - short nType = css::util::NumberFormat::DEFINED; + SvNumFormatType nType = SvNumFormatType::DEFINED; sal_Int32 nDummy; const SvNumberformat* pEntry = pFormatter->GetEntry(nFormat); @@ -594,7 +594,7 @@ sal_uInt32 SwValueField::GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt if (nNewFormat == nFormat) { // probably user-defined format - short nType = css::util::NumberFormat::DEFINED; + SvNumFormatType nType = SvNumFormatType::DEFINED; sal_Int32 nDummy; OUString sFormat(pEntry->GetFormatstring()); @@ -637,7 +637,7 @@ void SwValueField::SetLanguage( LanguageType nLng ) if( nNewFormat == GetFormat() ) { // probably user-defined format - short nType = css::util::NumberFormat::DEFINED; + SvNumFormatType nType = SvNumFormatType::DEFINED; sal_Int32 nDummy; OUString sFormat( pEntry->GetFormatstring() ); pFormatter->PutandConvertEntry( sFormat, nDummy, nType, |