diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-17 21:01:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-18 15:13:51 +0100 |
| commit | 06e2005ed83567452783003e3113ad6a92190c2d (patch) | |
| tree | bb3a92154bb0bbaeda1e6d548f467229206dd49d /svl | |
| parent | 8e01e881451333eadb8e23f619e2b4014de1442a (diff) | |
convert LocaleDataWrapper to OUString
Change-Id: Icb5f5adf9139d1c0f0e86d8128ea6742ce20b138
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/numbers/zforfind.cxx | 4 | ||||
| -rw-r--r-- | svl/source/numbers/zforscan.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index 5a21693a7f90..6fa22c953bee 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -726,13 +726,13 @@ bool ImpSvNumberInputScan::GetTimeAmPm( const String& rString, xub_StrLen& nPos if ( StringContains( pChr->uppercase( pLoc->getTimeAM() ), rString, nPos ) ) { nAmPm = 1; - nPos = nPos + pLoc->getTimeAM().Len(); + nPos = nPos + pLoc->getTimeAM().getLength(); return true; } else if ( StringContains( pChr->uppercase( pLoc->getTimePM() ), rString, nPos ) ) { nAmPm = -1; - nPos = nPos + pLoc->getTimePM().Len(); + nPos = nPos + pLoc->getTimePM().getLength(); return true; } } diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index c883242f7a1d..0dfe952936f4 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -1224,7 +1224,7 @@ xub_StrLen ImpSvNumberformatScan::ScanType() eNewType = NUMBERFORMAT_TEXT; break; default: - if ( sStrArray[i] == pLoc->getTime100SecSep() ) + if (pLoc->getTime100SecSep().equals(sStrArray[i])) bDecSep = true; // for SS,0 eNewType = NUMBERFORMAT_UNDEFINED; break; @@ -1273,7 +1273,7 @@ xub_StrLen ImpSvNumberformatScan::ScanType() { if (nCurrPos != STRING_NOTFOUND) eScannedType = NUMBERFORMAT_UNDEFINED; - else if ( sStrArray[i] != pLoc->getTimeSep() ) + else if (!pLoc->getTimeSep().equals(sStrArray[i])) return nPos; } } @@ -1292,8 +1292,8 @@ xub_StrLen ImpSvNumberformatScan::ScanType() { if (nCurrPos != STRING_NOTFOUND) eScannedType = NUMBERFORMAT_UNDEFINED; - else if ( sStrArray[i] != pFormatter->GetDateSep() - && sStrArray[i] != pLoc->getTimeSep() ) + else if ( pFormatter->GetDateSep() != sStrArray[i] + && !pLoc->getTimeSep().equals(sStrArray[i]) ) return nPos; } } |