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

Also handle OUString with non-RTL_TEXTENCODING_ASCII_US encoding

Browse Source 
(just in case)

Change-Id: I7ba2967c1cef81a3f6604077d876c8b993f7f16a
Reviewed-on: https://gerrit.libreoffice.org/42609
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2017-09-21 22:11:29 +02:00
parent e590e4dd5e
commit 7b45044fd1
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
compilerplugins/clang/stringconstant.cxx
View File

@@ -756,6 +756,8 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) {
ChangeKind kind;
PassThrough pass;
bool simplify;
bool encIsAscii;
std::string enc;
switch (expr->getConstructor()->getNumParams()) {
case 1:
if (!loplugin::TypeCheck(
@@ -846,11 +848,12 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) {
return true;
}
if (!expr->getArg(2)->EvaluateAsInt(
res, compiler.getASTContext())
|| res != 11) // RTL_TEXTENCODING_ASCII_US
res, compiler.getASTContext()))
{
return true;
}
encIsAscii = res == 11; // RTL_TEXTENCODING_ASCII_US
enc = res.toString(10);
if (!expr->getArg(3)->EvaluateAsInt(
res, compiler.getASTContext())
|| res != 0x333) // OSTRING_TO_OUSTRING_CVTFLAGS
@@ -1056,9 +1059,10 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) {
if (simplify) {
report(
DiagnosticsEngine::Warning,
"simplify construction of %0 with %1",
("simplify construction of %0 with %1%select{ (but beware, the"
" given textencoding %3 is not RTL_TEXTENCODING_ASCII_US)|}2"),
expr->getExprLoc())
<< classdecl << describeChangeKind(kind)
<< classdecl << describeChangeKind(kind) << encIsAscii << enc
<< expr->getSourceRange();
}
return true;