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 /chart2 | |
| parent | 3e475e574ee7ac8753bf50732f62bea5d36791a5 (diff) | |
remove NUMBERFORMAT_ constants
.. in favour of just using the underlying constants from
css::util::NumberFormat
Change-Id: I0c6b128b66c91b268f5ae300f9c17c7792df5e99
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/dialogs/tp_Scale.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 6b22257cfb08..bb92e78c095d 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -393,11 +393,11 @@ int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) bool bDateAxis = chart2::AxisType::DATE == m_nAxisType; sal_uInt32 nMinMaxOriginFmt = m_pFmtFldMax->GetFormatKey(); - if ((pNumFormatter->GetType(nMinMaxOriginFmt) &~ NUMBERFORMAT_DEFINED) == NUMBERFORMAT_TEXT) + if ((pNumFormatter->GetType(nMinMaxOriginFmt) & ~css::util::NumberFormat::DEFINED) == css::util::NumberFormat::TEXT) nMinMaxOriginFmt = 0; // numberformat_text cause numbers to fail being numbers... Shouldn't happen, but can. sal_uInt32 nStepFmt = m_pFmtFldStepMain->GetFormatKey(); - if ((pNumFormatter->GetType(nStepFmt) &~NUMBERFORMAT_DEFINED) == NUMBERFORMAT_TEXT) + if ((pNumFormatter->GetType(nStepFmt) & ~css::util::NumberFormat::DEFINED) == css::util::NumberFormat::TEXT) nStepFmt = 0; Control* pControl = NULL; @@ -536,7 +536,7 @@ void ScaleTabPage::SetNumFormat() if( pNumFormatter ) { short eType = pNumFormatter->GetType( nFmt ); - if( eType == NUMBERFORMAT_DATE ) + if( eType == css::util::NumberFormat::DATE ) { // for intervals use standard format for dates (so you can enter a number of days) const SvNumberformat* pFormat = pNumFormatter->GetEntry( nFmt ); @@ -545,23 +545,23 @@ void ScaleTabPage::SetNumFormat() else nFmt = pNumFormatter->GetStandardIndex(); } - else if( eType == NUMBERFORMAT_DATETIME ) + else if( eType == css::util::NumberFormat::DATETIME ) { // for intervals use time format for date times const SvNumberformat* pFormat = pNumFormatter->GetEntry( nFmt ); if( pFormat ) - nFmt = pNumFormatter->GetStandardFormat( NUMBERFORMAT_TIME, pFormat->GetLanguage() ); + nFmt = pNumFormatter->GetStandardFormat( css::util::NumberFormat::TIME, pFormat->GetLanguage() ); else - nFmt = pNumFormatter->GetStandardFormat( NUMBERFORMAT_TIME ); + nFmt = pNumFormatter->GetStandardFormat( css::util::NumberFormat::TIME ); } - if( chart2::AxisType::DATE == m_nAxisType && ( eType != NUMBERFORMAT_DATE && eType != NUMBERFORMAT_DATETIME) ) + if( chart2::AxisType::DATE == m_nAxisType && ( eType != css::util::NumberFormat::DATE && eType != css::util::NumberFormat::DATETIME) ) { const SvNumberformat* pFormat = pNumFormatter->GetEntry( nFmt ); if( pFormat ) - nFmt = pNumFormatter->GetStandardFormat( NUMBERFORMAT_DATE, pFormat->GetLanguage() ); + nFmt = pNumFormatter->GetStandardFormat( css::util::NumberFormat::DATE, pFormat->GetLanguage() ); else - nFmt = pNumFormatter->GetStandardFormat( NUMBERFORMAT_DATE ); + nFmt = pNumFormatter->GetStandardFormat( css::util::NumberFormat::DATE ); m_pFmtFldMax->SetFormatKey( nFmt ); m_pFmtFldMin->SetFormatKey( nFmt ); |