mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:stringconstant: adapt to improved OUStringLiteral1 (svl)

Browse Source 
Change-Id: I5b9c503fd28209b893688e81ddd00eb843b44e37
This commit is contained in:
Stephan Bergmann
2016-08-30 15:29:26 +02:00
parent f5a99c3748
commit d7beb36e94
3 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
svl/source/numbers/zformat.cxx
View File

@@ -776,10 +776,9 @@ SvNumberformat::SvNumberformat(OUString& rString,
} }
else else
{ {
sStr = "DBNum";
//! eSymbolType is negative //! eSymbolType is negative
sal_uInt8 nNum = (sal_uInt8)(1 - (eSymbolType - BRACKET_SYMBOLTYPE_DBNUM1)); sal_uInt8 nNum = (sal_uInt8)(1 - (eSymbolType - BRACKET_SYMBOLTYPE_DBNUM1));
sStr += OUString((sal_Unicode)('0' + nNum)); sStr = "DBNum" + OUStringLiteral1('0' + nNum);
NumFor[nIndex].SetNatNumNum( nNum, true ); NumFor[nIndex].SetNatNumNum( nNum, true );
} }
break; break;

38
svl/source/numbers/zforscan.cxx
View File

@@ -676,28 +676,28 @@ short ImpSvNumberformatScan::Next_Symbol( const OUString& rStr,
case ':': case ':':
case '-': case '-':
eType = NF_SYMBOLTYPE_DEL; eType = NF_SYMBOLTYPE_DEL;
sSymbol += OUString(cToken); sSymbol += OUStringLiteral1(cToken);
eState = SsStop; eState = SsStop;
break; break;
case '*': case '*':
eType = NF_SYMBOLTYPE_STAR; eType = NF_SYMBOLTYPE_STAR;
sSymbol += OUString(cToken); sSymbol += OUStringLiteral1(cToken);
eState = SsGetStar; eState = SsGetStar;
break; break;
case '_': case '_':
eType = NF_SYMBOLTYPE_BLANK; eType = NF_SYMBOLTYPE_BLANK;
sSymbol += OUString(cToken); sSymbol += OUStringLiteral1(cToken);
eState = SsGetBlank; eState = SsGetBlank;
break; break;
case '"': case '"':
eType = NF_SYMBOLTYPE_STRING; eType = NF_SYMBOLTYPE_STRING;
eState = SsGetString; eState = SsGetString;
sSymbol += OUString(cToken); sSymbol += OUStringLiteral1(cToken);
break; break;
case '\\': case '\\':
eType = NF_SYMBOLTYPE_STRING; eType = NF_SYMBOLTYPE_STRING;
eState = SsGetChar; eState = SsGetChar;
sSymbol += OUString(cToken); sSymbol += OUStringLiteral1(cToken);
break; break;
case '$': case '$':
case '+': case '+':
@@ -705,7 +705,7 @@ short ImpSvNumberformatScan::Next_Symbol( const OUString& rStr,
case ')': case ')':
eType = NF_SYMBOLTYPE_STRING; eType = NF_SYMBOLTYPE_STRING;
eState = SsStop; eState = SsStop;
sSymbol += OUString(cToken); sSymbol += OUStringLiteral1(cToken);
break; break;
default : default :
if (StringEqualsChar( pFormatter->GetNumDecimalSep(), cToken) || if (StringEqualsChar( pFormatter->GetNumDecimalSep(), cToken) ||
@@ -716,7 +716,7 @@ short ImpSvNumberformatScan::Next_Symbol( const OUString& rStr,
{ {
// Another separator than pre-known ASCII // Another separator than pre-known ASCII
eType = NF_SYMBOLTYPE_DEL; eType = NF_SYMBOLTYPE_DEL;
sSymbol += OUString(cToken); sSymbol += OUStringLiteral1(cToken);
eState = SsStop; eState = SsStop;
} }
else if ( pChrCls->isLetter( rStr, nPos-1 ) ) else if ( pChrCls->isLetter( rStr, nPos-1 ) )
@@ -740,7 +740,7 @@ short ImpSvNumberformatScan::Next_Symbol( const OUString& rStr,
if ( bCurrency ) if ( bCurrency )
{ {
eState = SsGetWord; eState = SsGetWord;
sSymbol += OUString(cToken); sSymbol += OUStringLiteral1(cToken);
} }
else else
{ {
@@ -754,7 +754,7 @@ short ImpSvNumberformatScan::Next_Symbol( const OUString& rStr,
{ {
case '+' : case '+' :
case '-' : // E+ E- combine to one symbol case '-' : // E+ E- combine to one symbol
sSymbol += OUString(cNext); sSymbol += OUStringLiteral1(cNext);
eType = NF_KEY_E; eType = NF_KEY_E;
nPos++; nPos++;
break; break;
@@ -772,20 +772,20 @@ short ImpSvNumberformatScan::Next_Symbol( const OUString& rStr,
else else
{ {
eState = SsGetWord; eState = SsGetWord;
sSymbol += OUString(cToken); sSymbol += OUStringLiteral1(cToken);
} }
} }
else else
{ {
eType = NF_SYMBOLTYPE_STRING; eType = NF_SYMBOLTYPE_STRING;
eState = SsStop; eState = SsStop;
sSymbol += OUString(cToken); sSymbol += OUStringLiteral1(cToken);
} }
break; break;
} }
break; break;
case SsGetChar: case SsGetChar:
sSymbol += OUString(cToken); sSymbol += OUStringLiteral1(cToken);
eState = SsStop; eState = SsStop;
break; break;
case SsGetString: case SsGetString:
@@ -793,7 +793,7 @@ short ImpSvNumberformatScan::Next_Symbol( const OUString& rStr,
{ {
eState = SsStop; eState = SsStop;
} }
sSymbol += OUString(cToken); sSymbol += OUStringLiteral1(cToken);
break; break;
case SsGetWord: case SsGetWord:
if ( pChrCls->isLetter( rStr, nPos-1 ) ) if ( pChrCls->isLetter( rStr, nPos-1 ) )
@@ -808,7 +808,7 @@ short ImpSvNumberformatScan::Next_Symbol( const OUString& rStr,
} }
else else
{ {
sSymbol += OUString(cToken); sSymbol += OUStringLiteral1(cToken);
} }
} }
else else
@@ -828,7 +828,7 @@ short ImpSvNumberformatScan::Next_Symbol( const OUString& rStr,
(nLen == 2 && (sSymbol[1] == 'M' || sSymbol[1] == 'm') (nLen == 2 && (sSymbol[1] == 'M' || sSymbol[1] == 'm')
&& (rStr[nPos + 1] == 'M' || rStr[nPos + 1] == 'm')))) && (rStr[nPos + 1] == 'M' || rStr[nPos + 1] == 'm'))))
{ {
sSymbol += OUString(cToken); sSymbol += OUStringLiteral1(cToken);
bDontStop = true; bDontStop = true;
} }
} }
@@ -845,11 +845,11 @@ short ImpSvNumberformatScan::Next_Symbol( const OUString& rStr,
break; break;
case SsGetStar: case SsGetStar:
eState = SsStop; eState = SsStop;
sSymbol += OUString(cToken); sSymbol += OUStringLiteral1(cToken);
break; break;
case SsGetBlank: case SsGetBlank:
eState = SsStop; eState = SsStop;
sSymbol += OUString(cToken); sSymbol += OUStringLiteral1(cToken);
break; break;
default: default:
break; break;
@@ -2715,7 +2715,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
{ {
case '+': case '+':
case '-': case '-':
rString += OUString(c); rString += OUStringLiteral1(c);
break; break;
case ' ': case ' ':
case '.': case '.':
@@ -2746,7 +2746,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
} }
else else
{ {
rString += OUString(c); rString += OUStringLiteral1(c);
} }
break; break;
default: default:

6
svl/source/passwordcontainer/passwordcontainer.cxx
View File

@@ -97,7 +97,7 @@ static vector< OUString > getInfoFromInd( const OUString& aInd )
while( *pLine && !( pLine[0] == '_' && pLine[1] == '_' )) while( *pLine && !( pLine[0] == '_' && pLine[1] == '_' ))
if( *pLine != '_' ) if( *pLine != '_' )
{ {
newItem += OUString( (sal_Unicode) *pLine ); newItem += OUStringLiteral1( *pLine );
pLine++; pLine++;
} }
else else
@@ -114,10 +114,10 @@ static vector< OUString > getInfoFromInd( const OUString& aInd )
return aResult; return aResult;
} }
aNum += OUString( (sal_Unicode) pLine[i] ); aNum += OUStringLiteral1( pLine[i] );
} }
newItem += OUString( (sal_Unicode) aNum.toUInt32( 16 ) ); newItem += OUStringLiteral1( aNum.toUInt32( 16 ) );
pLine += 3; pLine += 3;
} }