Improved loplugin:redundantcast static_cast handling

Change-Id: I74e4ebda40f95661c5ae344132fcabbbf08ab0a4

1 files changed, 13 insertions, 3 deletions

diff --git a/compilerplugins/clang/salunicodeliteral.cxx b/compilerplugins/clang/salunicodeliteral.cxx
index 6b03156b55e7..410a1aba45c9 100644
--- a/compilerplugins/clang/salunicodeliteral.cxx
+++ b/compilerplugins/clang/salunicodeliteral.cxx
@@ -52,13 +52,23 @@ private:
 
     void check(ExplicitCastExpr const * expr) {
         if (ignoreLocation(expr)
-            || isInUnoIncludeFile(expr->getExprLoc())
+            || isInUnoIncludeFile(expr->getExprLoc()))
                 //TODO: '#ifdef LIBO_INTERNAL_ONLY' within UNO include files
-            || !(loplugin::TypeCheck(expr->getTypeAsWritten())
-                 .Typedef("sal_Unicode").GlobalNamespace()))
         {
             return;
         }
+        for (auto t = expr->getTypeAsWritten();;) {
+            auto const tt = t->getAs<TypedefType>();
+            if (tt == nullptr) {
+                return;
+            }
+            if (loplugin::TypeCheck(t).Typedef("sal_Unicode")
+                .GlobalNamespace())
+            {
+                break;
+            }
+            t = tt->desugar();
+        }
         auto const e1 = expr->getSubExprAsWritten();
         auto const loc = e1->getLocStart();
         if (loc.isMacroID()