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 /extensions | |
| parent | 3e475e574ee7ac8753bf50732f62bea5d36791a5 (diff) | |
remove NUMBERFORMAT_ constants
.. in favour of just using the underlying constants from
css::util::NumberFormat
Change-Id: I0c6b128b66c91b268f5ae300f9c17c7792df5e99
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/standardcontrol.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/propctrlr/usercontrol.cxx | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index cb542967eef0..bb789216efac 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -261,7 +261,7 @@ namespace pcr getTypedControlWindow()->SetFormatter( getTypedControlWindow()->StandardFormatter() ); SvNumberFormatter* pFormatter = getTypedControlWindow()->GetFormatter(); - sal_uLong nStandardDateTimeFormat = pFormatter->GetStandardFormat( NUMBERFORMAT_DATETIME, eSysLanguage ); + sal_uLong nStandardDateTimeFormat = pFormatter->GetStandardFormat( css::util::NumberFormat::DATETIME, eSysLanguage ); getTypedControlWindow()->SetFormatKey( nStandardDateTimeFormat ); } diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index 783e43c84a49..0c42e18dee02 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -118,17 +118,17 @@ namespace pcr double OFormatSampleControl::getPreviewValue( const SvNumberformat& i_rEntry ) { double nValue = 1234.56789; - switch ( i_rEntry.GetType() & ~NUMBERFORMAT_DEFINED ) + switch ( i_rEntry.GetType() & ~css::util::NumberFormat::DEFINED ) { - case NUMBERFORMAT_DATE: + case css::util::NumberFormat::DATE: { Date aCurrentDate( Date::SYSTEM ); static ::com::sun::star::util::Date STANDARD_DB_DATE(30,12,1899); nValue = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDate(static_cast<sal_Int32>(aCurrentDate.GetDate())),STANDARD_DB_DATE); } break; - case NUMBERFORMAT_TIME: - case NUMBERFORMAT_DATETIME: + case css::util::NumberFormat::TIME: + case css::util::NumberFormat::DATETIME: { tools::Time aCurrentTime( tools::Time::SYSTEM ); nValue = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toTime(aCurrentTime.GetTime())); @@ -225,18 +225,18 @@ namespace pcr DBG_ASSERT( pEntry, "OFormattedNumericControl::SetFormatDescription: invalid format key!" ); if ( pEntry ) { - switch (pEntry->GetType() & ~NUMBERFORMAT_DEFINED) + switch (pEntry->GetType() & ~css::util::NumberFormat::DEFINED) { - case NUMBERFORMAT_NUMBER: - case NUMBERFORMAT_CURRENCY: - case NUMBERFORMAT_SCIENTIFIC: - case NUMBERFORMAT_FRACTION: - case NUMBERFORMAT_PERCENT: + case css::util::NumberFormat::NUMBER: + case css::util::NumberFormat::CURRENCY: + case css::util::NumberFormat::SCIENTIFIC: + case css::util::NumberFormat::FRACTION: + case css::util::NumberFormat::PERCENT: m_nLastDecimalDigits = getTypedControlWindow()->GetDecimalDigits(); break; - case NUMBERFORMAT_DATETIME: - case NUMBERFORMAT_DATE: - case NUMBERFORMAT_TIME: + case css::util::NumberFormat::DATETIME: + case css::util::NumberFormat::DATE: + case css::util::NumberFormat::TIME: m_nLastDecimalDigits = 7; break; default: |