diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-06 09:23:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-09 08:34:40 +0000 |
| commit | 6c80a8fe89fadf9a2c7260a09c037a09462f53d1 (patch) | |
| tree | d36da9ee2a5fdc579d2a57ff6ba02deaddfa785a /vcl/source/control/field2.cxx | |
| parent | e1fc599eb764186e5d511ace9785463eebbc7028 (diff) | |
new loplugin: oncevar
Change-Id: If57390510dde4d166be3141b9f658a7453755d3f
Reviewed-on: https://gerrit.libreoffice.org/19815
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source/control/field2.cxx')
| -rw-r--r-- | vcl/source/control/field2.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index ddcd40c8f5ef..0c2644994e93 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -2125,15 +2125,13 @@ static bool ImplTimeGetValue( const OUString& rStr, tools::Time& rTime, return false; OUString aUpperCaseStr = aStr.toString().toAsciiUpperCase(); - OUString aAM(rLocaleDataWrapper.getTimeAM().toAsciiUpperCase()); - OUString aPM(rLocaleDataWrapper.getTimePM().toAsciiUpperCase()); - OUString aAM2("AM"); // aAM is localized - OUString aPM2("PM"); // aPM is localized + OUString aAMlocalised(rLocaleDataWrapper.getTimeAM().toAsciiUpperCase()); + OUString aPMlocalised(rLocaleDataWrapper.getTimePM().toAsciiUpperCase()); - if ( (nHour < 12) && ( ( aUpperCaseStr.indexOf( aPM ) >= 0 ) || ( aUpperCaseStr.indexOf( aPM2 ) >= 0 ) ) ) + if ( (nHour < 12) && ( ( aUpperCaseStr.indexOf( "PM" ) >= 0 ) || ( aUpperCaseStr.indexOf( aPMlocalised ) >= 0 ) ) ) nHour += 12; - if ( (nHour == 12) && ( ( aUpperCaseStr.indexOf( aAM ) >= 0 ) || ( aUpperCaseStr.indexOf( aAM2 ) >= 0 ) ) ) + if ( (nHour == 12) && ( ( aUpperCaseStr.indexOf( "AM" ) >= 0 ) || ( aUpperCaseStr.indexOf( aAMlocalised ) >= 0 ) ) ) nHour = 0; aTime = tools::Time( (sal_uInt16)nHour, (sal_uInt16)nMinute, (sal_uInt16)nSecond, |