loplugin:cstylecast: sal

Change-Id: I0ad9681a8b31d78cefce5b66040415154a1c7a99

1 files changed, 2 insertions, 9 deletions

diff --git a/compilerplugins/clang/cstylecast.cxx b/compilerplugins/clang/cstylecast.cxx
index c14436d65f7d..6fbf60b66ab7 100644
--- a/compilerplugins/clang/cstylecast.cxx
+++ b/compilerplugins/clang/cstylecast.cxx
@@ -97,19 +97,12 @@ bool CStyleCast::VisitCStyleCastExpr(const CStyleCastExpr * expr) {
         return true;
     }
     if ( compat::isInMainFile(compiler.getSourceManager(), spellingLocation) ) {
-        if (filename.startswith(SRCDIR "/sal/") // sal has tons of weird stuff going on that I don't understand enough to fix
-           || filename.startswith(SRCDIR "/bridges/")) { // I'm not messing with this code - far too dangerous
+        if (filename.startswith(SRCDIR "/bridges/")) { // I'm not messing with this code - far too dangerous
             return true;
         }
     } else {
         if (filename == SRCDIR "/include/tools/solar.h"
-           || filename.startswith(SRCDIR "/include/cppuhelper/")
-           || ((StringRef(
-                    compiler.getSourceManager().getFileEntryForID(
-                        compiler.getSourceManager().getMainFileID())
-                    ->getName())
-                == SRCDIR "/jurt/source/pipe/staticsalhack.cxx")
-               && filename.startswith(SRCDIR "/sal/"))) {
+           || filename.startswith(SRCDIR "/include/cppuhelper/")) {
             return true;
         }
     }