diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-29 12:43:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-30 06:36:08 +0000 |
| commit | a6dacbe1d7d17283c20c75d3c97f72a0f876a716 (patch) | |
| tree | 9050aa70a1c7d6e8737d57d972d3946c8b2e960a /vcl | |
| parent | 98d09839353325afefea2dad549b1f9adf10aea1 (diff) | |
Convert TimeFormat to scoped enum
Change-Id: Ia40c70493a61886c76e515c3b2953243025c2438
Reviewed-on: https://gerrit.libreoffice.org/25602
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/field2.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index b3e7c8fb0534..1f17e7569168 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -2199,7 +2199,7 @@ bool TimeFormatter::ImplTimeReformat( const OUString& rStr, OUString& rOutStr ) else { rOutStr = ImplGetLocaleDataWrapper().getTime( aTempTime, bSecond, b100Sec ); - if ( GetTimeFormat() == HOUR_12 ) + if ( GetTimeFormat() == TimeFormat::Hour12 ) { if ( aTempTime.GetHour() > 12 ) { @@ -2299,7 +2299,7 @@ void TimeFormatter::ImplInit() { meFormat = TimeFieldFormat::F_NONE; mbDuration = false; - mnTimeFormat = HOUR_24; // Should become a ExtTimeFieldFormat in next implementation, merge with mbDuration and meFormat + mnTimeFormat = TimeFormat::Hour24; // Should become a ExtTimeFieldFormat in next implementation, merge with mbDuration and meFormat } TimeFormatter::TimeFormatter() : @@ -2337,7 +2337,7 @@ void TimeFormatter::SetMax( const tools::Time& rNewMax ) void TimeFormatter::SetTimeFormat( TimeFormatter::TimeFormat eNewFormat ) { - mnTimeFormat = sal::static_int_cast<sal_uInt16>(eNewFormat); + mnTimeFormat = eNewFormat; } @@ -2427,7 +2427,7 @@ void TimeFormatter::ImplSetUserTime( const tools::Time& rNewTime, Selection* pNe else { aStr = ImplGetLocaleDataWrapper().getTime( aNewTime, bSec, b100Sec ); - if ( GetTimeFormat() == HOUR_12 ) + if ( GetTimeFormat() == TimeFormat::Hour12 ) { if ( aNewTime.GetHour() > 12 ) { @@ -2599,28 +2599,28 @@ void TimeField::SetExtFormat( ExtTimeFieldFormat eFormat ) { case EXTTIMEF_24H_SHORT: { - SetTimeFormat( HOUR_24 ); + SetTimeFormat( TimeFormat::Hour24 ); SetDuration( false ); SetFormat( TimeFieldFormat::F_NONE ); } break; case EXTTIMEF_24H_LONG: { - SetTimeFormat( HOUR_24 ); + SetTimeFormat( TimeFormat::Hour24 ); SetDuration( false ); SetFormat( TimeFieldFormat::F_SEC ); } break; case EXTTIMEF_12H_SHORT: { - SetTimeFormat( HOUR_12 ); + SetTimeFormat( TimeFormat::Hour12 ); SetDuration( false ); SetFormat( TimeFieldFormat::F_NONE ); } break; case EXTTIMEF_12H_LONG: { - SetTimeFormat( HOUR_12 ); + SetTimeFormat( TimeFormat::Hour12 ); SetDuration( false ); SetFormat( TimeFieldFormat::F_SEC ); } |