diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-03-30 09:36:06 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-30 12:21:40 +0000 |
commit | da56de9ac4824eb365af20b351719395e725be39 (patch) | |
tree | f19ad159f5e12b9e62b2ee50f39016819b7a7c5c /svl | |
parent | 8d1a56c206e5c2ed6c331049198bb8ebc6176171 (diff) |
remove type decorations on char literals
they are only needed where type deduction fails.
left them in defines for now.
Change-Id: I7f002dd6bc7acc083c73b6c64076de6dd28d0b09
Reviewed-on: https://gerrit.libreoffice.org/35893
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svl')
-rw-r--r-- | svl/source/misc/inettype.cxx | 8 | ||||
-rw-r--r-- | svl/source/numbers/zforfind.cxx | 12 | ||||
-rw-r--r-- | svl/source/numbers/zforlist.cxx | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx index f62b31f06b55..34d2ba238e86 100644 --- a/svl/source/misc/inettype.cxx +++ b/svl/source/misc/inettype.cxx @@ -638,7 +638,7 @@ INetContentType INetContentTypes::GetContentTypeFromURL(OUString const & rURL) if (!aToken.isEmpty()) { if (aToken.equalsIgnoreAsciiCase(INETTYPE_URL_PROT_FILE)) - if (rURL[ rURL.getLength() - 1 ] == (sal_Unicode)'/') // folder + if (rURL[ rURL.getLength() - 1 ] == '/') // folder if (rURL.getLength() > RTL_CONSTASCII_LENGTH("file:///")) if (WildCard("*/{*}/").Matches(rURL)) // special folder eTypeID = CONTENT_TYPE_X_CNT_FSYSSPECIALFOLDER; @@ -725,15 +725,15 @@ bool INetContentTypes::GetExtensionFromURL(OUString const & rURL, while (i >= 0) { nSlashPos = i; - i = rURL.indexOf((sal_Unicode)'/', i + 1); + i = rURL.indexOf('/', i + 1); } if (nSlashPos != 0) { - sal_Int32 nLastDotPos = i = rURL.indexOf((sal_Unicode)'.', nSlashPos); + sal_Int32 nLastDotPos = i = rURL.indexOf('.', nSlashPos); while (i >= 0) { nLastDotPos = i; - i = rURL.indexOf((sal_Unicode)'.', i + 1); + i = rURL.indexOf('.', i + 1); } if (nLastDotPos >- 0) rExtension = rURL.copy(nLastDotPos + 1); diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index 97eba7241116..9c257130373f 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -1090,7 +1090,7 @@ bool ImpSvNumberInputScan::MayBeMonthDate() { // "-Jan-" const OUString& rM = sStrArray[ nNums[ 0 ] + 1 ]; - if (rM.getLength() >= 3 && rM[0] == (sal_Unicode)'-' && rM[ rM.getLength() - 1] == (sal_Unicode)'-') + if (rM.getLength() >= 3 && rM[0] == '-' && rM[ rM.getLength() - 1] == '-') { // Check year length assuming at least 3 digits (including // leading zero). Two digit years 1..31 are out of luck here @@ -1320,7 +1320,7 @@ bool ImpSvNumberInputScan::SkipDatePatternSeparator( sal_uInt16 nParticle, sal_I { const sal_Int32 nLen = sStrArray[nNext].getLength(); bool bOk = (rPat.indexOf( sStrArray[nNext], nPat) == nPat); - if (!bOk && (nPat + nLen > rPat.getLength() && sStrArray[nNext][ nLen - 1 ] == (sal_Unicode)' ')) + if (!bOk && (nPat + nLen > rPat.getLength() && sStrArray[nNext][ nLen - 1 ] == ' ')) { // The same ugly trailing blanks check as in // IsAcceptedDatePattern(). @@ -2130,7 +2130,7 @@ bool ImpSvNumberInputScan::ScanStartString( const OUString& rString, if ( nTempDayOfWeek < 0 ) { // abbreviated - if ( rString[ nPos ] == (sal_Unicode)'.' ) + if ( rString[ nPos ] == '.' ) { ++nPos; } @@ -2810,7 +2810,7 @@ bool ImpSvNumberInputScan::ScanEndString( const OUString& rString, { if ( nTempDayOfWeek < 0 ) { // short - if ( rString[ nPos ] == (sal_Unicode)'.' ) + if ( rString[ nPos ] == '.' ) { ++nPos; } @@ -2826,7 +2826,7 @@ bool ImpSvNumberInputScan::ScanEndString( const OUString& rString, #if NF_RECOGNIZE_ISO8601_TIMEZONES if (nPos == 0 && eScannedType == css::util::NumberFormat::DATETIME && - rString.getLength() == 1 && rString[ 0 ] == (sal_Unicode)'Z' && MayBeIso8601()) + rString.getLength() == 1 && rString[ 0 ] == 'Z' && MayBeIso8601()) { // ISO 8601 timezone UTC yyyy-mm-ddThh:mmZ ++nPos; @@ -3375,7 +3375,7 @@ void ImpSvNumberInputScan::InitText() void ImpSvNumberInputScan::ChangeIntl() { sal_Unicode cDecSep = pFormatter->GetNumDecimalSep()[0]; - bDecSepInDateSeps = ( cDecSep == (sal_Unicode)'-' || + bDecSepInDateSeps = ( cDecSep == '-' || cDecSep == pFormatter->GetDateSep()[0] ); bTextInitialized = false; aUpperCurrSymbol.clear(); diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 9dc90b41a4f5..086b02fe490d 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -4080,8 +4080,8 @@ OUString NfCurrencyEntry::BuildSymbolString(bool bBank, } else { - if ( aSymbol.indexOf( (sal_Unicode)'-' ) >= 0 || - aSymbol.indexOf( (sal_Unicode)']' ) >= 0) + if ( aSymbol.indexOf( '-' ) >= 0 || + aSymbol.indexOf( ']' ) >= 0) { aBuf.append('"').append(aSymbol).append('"'); } |