Plugin::isInUnoIncludeFile should not cover WORKDIR

...that got in, for no apparent reason, when various, slightly different
implementations of isInUnoIncludeFile got consolidated into one.

Change-Id: I64a9eb62703d57a0b7b57720ec9f251ffa780691

compilerplugins/clang/plugin.cxx

@@ -166,8 +166,7 @@ bool Plugin::isInUnoIncludeFile(SourceLocation spellingLocation) const {
            || name.startswith(SRCDIR "/include/salhelper/")
            || name.startswith(SRCDIR "/include/systools/")
            || name.startswith(SRCDIR "/include/typelib/")
-           || name.startswith(SRCDIR "/include/uno/")
-           || name.startswith(WORKDIR "/"));
+           || name.startswith(SRCDIR "/include/uno/"));
 }
 
 bool Plugin::isInUnoIncludeFile(const FunctionDecl* functionDecl) const {

compilerplugins/clang/unreffun.cxx

@@ -133,6 +133,14 @@ bool UnrefFun::VisitFunctionDecl(FunctionDecl const * decl) {
     {
         return true;
     }
+    auto loc = decl->getLocation();
+    if (compiler.getSourceManager().isMacroBodyExpansion(loc)
+        && (Lexer::getImmediateMacroName(
+                loc, compiler.getSourceManager(), compiler.getLangOpts())
+            == "MDDS_MTV_DEFINE_ELEMENT_CALLBACKS"))
+    {
+        return true;
+    }
     report(
         DiagnosticsEngine::Warning,
         (canon->isDefined()

sc/qa/extras/scannotationshapeobj.cxx

@@ -116,8 +116,8 @@ uno::Reference<text::XTextContent> ScAnnotationShapeObj::getTextContent()
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScAnnotationShapeObj);
 
-CPPUNIT_PLUGIN_IMPLEMENT();
-
 }
 
+CPPUNIT_PLUGIN_IMPLEMENT();
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */