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 /basic | |
| parent | 3e475e574ee7ac8753bf50732f62bea5d36791a5 (diff) | |
remove NUMBERFORMAT_ constants
.. in favour of just using the underlying constants from
css::util::NumberFormat
Change-Id: I0c6b128b66c91b268f5ae300f9c17c7792df5e99
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/runtime/methods.cxx | 8 | ||||
| -rw-r--r-- | basic/source/runtime/runtime.cxx | 2 | ||||
| -rw-r--r-- | basic/source/sbx/sbxdate.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index a86a74383ee6..713611c245d4 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -2159,9 +2159,9 @@ RTLFUNC(DateValue) nType = aFormatter.GetType( nIndex ); } - if(bSuccess && (nType==NUMBERFORMAT_DATE || nType==NUMBERFORMAT_DATETIME)) + if(bSuccess && (nType==css::util::NumberFormat::DATE || nType==css::util::NumberFormat::DATETIME)) { - if ( nType == NUMBERFORMAT_DATETIME ) + if ( nType == css::util::NumberFormat::DATETIME ) { // cut time if ( fResult > 0.0 ) @@ -2212,9 +2212,9 @@ RTLFUNC(TimeValue) bool bSuccess = pFormatter->IsNumberFormat( rPar.Get(1)->GetOUString(), nIndex, fResult ); short nType = pFormatter->GetType(nIndex); - if(bSuccess && (nType==NUMBERFORMAT_TIME||nType==NUMBERFORMAT_DATETIME)) + if(bSuccess && (nType==css::util::NumberFormat::TIME||nType==css::util::NumberFormat::DATETIME)) { - if ( nType == NUMBERFORMAT_DATETIME ) + if ( nType == css::util::NumberFormat::DATETIME ) { // cut days fResult = fmod( fResult, 1 ); diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 21d1cb809d99..0334521a0f7d 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -417,7 +417,7 @@ void SbiInstance::PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter, rpNumberFormatter = new SvNumberFormatter( comphelper::getProcessComponentContext(), eLangType ); sal_Int32 nCheckPos = 0; short nType; - rnStdTimeIdx = rpNumberFormatter->GetStandardFormat( NUMBERFORMAT_TIME, eLangType ); + rnStdTimeIdx = rpNumberFormatter->GetStandardFormat( css::util::NumberFormat::TIME, eLangType ); // the formatter's standard templates have only got a two-digit date // -> registering an own format diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx index 5f0bcca909fc..7b5df4957353 100644 --- a/basic/source/sbx/sbxdate.cxx +++ b/basic/source/sbx/sbxdate.cxx @@ -134,8 +134,8 @@ double ImpGetDate( const SbxValues* p ) if ( bSuccess ) { short nType_ = pFormatter->GetType( nIndex ); - if(!(nType_ & ( NUMBERFORMAT_DATETIME | NUMBERFORMAT_DATE | - NUMBERFORMAT_TIME | NUMBERFORMAT_DEFINED ))) + if(!(nType_ & ( css::util::NumberFormat::DATETIME | css::util::NumberFormat::DATE | + css::util::NumberFormat::TIME | css::util::NumberFormat::DEFINED ))) { bSuccess = false; } |