diff options
author | Noel Grandin <noel@peralex.com> | 2015-02-25 09:49:59 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-02-25 10:34:27 +0200 |
commit | 2f928b2d0982af44b3d45f1d3c8919c0b0655b4f (patch) | |
tree | 36468544d70101f2fc3a49a59b2f9d40df10e61f /svtools | |
parent | 3e475e574ee7ac8753bf50732f62bea5d36791a5 (diff) |
remove NUMBERFORMAT_ constants
.. in favour of just using the underlying constants from
css::util::NumberFormat
Change-Id: I0c6b128b66c91b268f5ae300f9c17c7792df5e99
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/control/fmtfield.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index 37533abc9a51..a3dec60d20a6 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -576,7 +576,7 @@ void FormattedField::SetFormatter(SvNumberFormatter* pFormatter, bool bResetForm // get the Office's locale and translate LanguageType eSysLanguage = SvtSysLocale().GetLanguageTag().getLanguageType( false); // get the standard numeric format for this language - m_nFormatKey = m_pFormatter->GetStandardFormat( NUMBERFORMAT_NUMBER, eSysLanguage ); + m_nFormatKey = m_pFormatter->GetStandardFormat( css::util::NumberFormat::NUMBER, eSysLanguage ); } else m_nFormatKey = 0; @@ -928,17 +928,17 @@ bool FormattedField::ImplGetValue(double& dNewVal) nFormatKey = 0; // special treatment for percentage formatting - if (ImplGetFormatter()->GetType(m_nFormatKey) == NUMBERFORMAT_PERCENT) + if (ImplGetFormatter()->GetType(m_nFormatKey) == css::util::NumberFormat::PERCENT) { // the language of our format LanguageType eLanguage = m_pFormatter->GetEntry(m_nFormatKey)->GetLanguage(); // the default number format for this language - sal_uLong nStandardNumericFormat = m_pFormatter->GetStandardFormat(NUMBERFORMAT_NUMBER, eLanguage); + sal_uLong nStandardNumericFormat = m_pFormatter->GetStandardFormat(css::util::NumberFormat::NUMBER, eLanguage); sal_uInt32 nTempFormat = nStandardNumericFormat; double dTemp; if (m_pFormatter->IsNumberFormat(sText, nTempFormat, dTemp) && - NUMBERFORMAT_NUMBER == m_pFormatter->GetType(nTempFormat)) + css::util::NumberFormat::NUMBER == m_pFormatter->GetType(nTempFormat)) // the string is equivalent to a number formatted one (has no % sign) -> append it sText += "%"; // (with this, a input of '3' becomes '3%', which then by the formatter is translated |