diff options
| -rw-r--r-- | compilerplugins/clang/unicodetochar.cxx | 91 | ||||
| -rw-r--r-- | oox/source/vml/vmlformatting.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/svrtf/rtfout.cxx | 4 |
3 files changed, 94 insertions, 3 deletions
diff --git a/compilerplugins/clang/unicodetochar.cxx b/compilerplugins/clang/unicodetochar.cxx new file mode 100644 index 000000000000..cfcb5b5d7549 --- /dev/null +++ b/compilerplugins/clang/unicodetochar.cxx @@ -0,0 +1,91 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <stack> + +#include "check.hxx" +#include "plugin.hxx" + +// In C++, find implicit conversions from char16_t (aka sal_Unicode) to char. +// Such places are probably meant to properly work on char16_t instead. + +// (This does not work for clang-cl/MSVC yet, where sal_Unicode is still a +// typedef for wchar_t, but that is intended to be changed eventually.) + +namespace { + +class Visitor final: + public RecursiveASTVisitor<Visitor>, public loplugin::Plugin +{ +public: + explicit Visitor(InstantiationData const & data): Plugin(data) {} + + bool TraverseCStyleCastExpr(CStyleCastExpr * expr) { + subExprs_.push(expr->getSubExpr()); + bool ret = RecursiveASTVisitor::TraverseCStyleCastExpr(expr); + subExprs_.pop(); + return ret; + } + + bool TraverseCXXStaticCastExpr(CXXStaticCastExpr * expr) { + subExprs_.push(expr->getSubExpr()); + bool ret = RecursiveASTVisitor::TraverseCXXStaticCastExpr(expr); + subExprs_.pop(); + return ret; + } + + bool TraverseCXXFunctionalCastExpr(CXXFunctionalCastExpr * expr) { + subExprs_.push(expr->getSubExpr()); + bool ret = RecursiveASTVisitor::TraverseCXXFunctionalCastExpr(expr); + subExprs_.pop(); + return ret; + } + + bool VisitImplicitCastExpr(ImplicitCastExpr const * expr) { + if ((!subExprs_.empty() && expr == subExprs_.top()) + || ignoreLocation(expr)) + { + return true; + } + if (!(loplugin::TypeCheck(expr->getType()).Char() + && expr->getSubExpr()->getType()->isSpecificBuiltinType( + clang::BuiltinType::Char16))) + { + return true; + } + APSInt res; + if (expr->getSubExpr()->EvaluateAsInt(res, compiler.getASTContext()) + && res >= 0 && res <= 0x7F) + { + return true; + } + report( + DiagnosticsEngine::Warning, + "suspicious implicit cast from %0 to %1", + expr->getExprLoc()) + << expr->getSubExpr()->getType() << expr->getType() + << expr->getSourceRange(); + return true; + } + +private: + void run() override { + if (compiler.getLangOpts().CPlusPlus) { + TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); + } + } + + std::stack<Expr const *> subExprs_; +}; + +static loplugin::Plugin::Registration<Visitor> reg("unicodetochar"); + +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx index 27fa0f4486e9..f8c8de8dae8d 100644 --- a/oox/source/vml/vmlformatting.cxx +++ b/oox/source/vml/vmlformatting.cxx @@ -398,7 +398,7 @@ void ConversionHelper::decodeVmlPath( ::std::vector< ::std::vector< Point > >& r } // Allow two-char commands to peek ahead to the next character - char nextChar = '\0'; + sal_Unicode nextChar = '\0'; if (i+1 < rPath.getLength()) nextChar = rPath[i+1]; diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx index 605fad7252ce..edaab84b5c04 100644 --- a/svtools/source/svrtf/rtfout.cxx +++ b/svtools/source/svrtf/rtfout.cxx @@ -120,11 +120,11 @@ SvStream& Out_Char(SvStream& rStream, sal_Unicode c, case '\\': case '}': case '{': - rStream.WriteChar( '\\' ).WriteChar( c ); + rStream.WriteChar( '\\' ).WriteChar( char(c) ); break; default: if (c >= ' ' && c <= '~') - rStream.WriteChar( c ); + rStream.WriteChar( char(c) ); else { //If we can't convert to the dest encoding, or if |