[Libreoffice-commits] core.git: compilerplugins/clang lotuswordpro/source

[Noel Grandin]

 compilerplugins/clang/inlinesimplememberfunctions.cxx |   30 ++++++++++++++++--
 lotuswordpro/source/filter/lwplayout.hxx              |    1 
 2 files changed, 29 insertions(+), 2 deletions(-)

New commits:
commit 6921edd448c901cdc9e132886b5b102bdd368ad9
Author: Noel Grandin <n...@peralex.com>
Date:   Mon Jun 9 11:36:13 2014 +0200

    compile fix
    
    after my commit 184a00b96235f6432294ded63ce4a4a318effdb5
    "loplugin: inlinesimplememberfunctions"
    
    Change-Id: Ib46d862b90566506c3035a12eeb01892b225ed51

diff --git a/compilerplugins/clang/inlinesimplememberfunctions.cxx 
b/compilerplugins/clang/inlinesimplememberfunctions.cxx
index cd5aa23..0d4428c 100644
--- a/compilerplugins/clang/inlinesimplememberfunctions.cxx
+++ b/compilerplugins/clang/inlinesimplememberfunctions.cxx
@@ -153,6 +153,32 @@ bool InlineSimpleMemberFunctions::VisitCXXMethodDecl(const 
CXXMethodDecl * funct
              MemberExpr
                CXXThisExpr
     */
+    childStmt = *(*compoundStmt->child_begin())->child_begin();
+    while (1) {
+        if (! oneAndOnlyOne( childStmt->children() ))
+            return true;
+        if (dyn_cast<CXXThisExpr>( childStmt ) != nullptr) {
+
+            compoundStmt->dump();
+                if (!rewrite(functionDecl))
+                {
+                    report(
+                        DiagnosticsEngine::Warning,
+                        "inlinesimpleaccessmethods",
+                        functionDecl->getSourceRange().getBegin())
+                      << functionDecl->getSourceRange();
+                    // display the location of the class member declaration
+                    report(
+                        DiagnosticsEngine::Note,
+                        "inlinesimpleaccessmethods",
+                        
functionDecl->getCanonicalDecl()->getSourceRange().getBegin())
+                      << functionDecl->getCanonicalDecl()->getSourceRange();
+                }
+             return true;
+        }
+        childStmt = *childStmt->child_begin();
+    }
+/*
     if (dyn_cast<ImplicitCastExpr>( childStmt ) != nullptr
         && oneAndOnlyOne( childStmt->children() ))
     {
@@ -182,7 +208,7 @@ bool InlineSimpleMemberFunctions::VisitCXXMethodDecl(const 
CXXMethodDecl * funct
             }
         }
     }
-
+*/
     return true;
 }
 
@@ -288,7 +314,7 @@ bool InlineSimpleMemberFunctions::rewrite(const 
CXXMethodDecl * functionDecl) {
     return replaceText(canonicalDecl->getLocEnd().getLocWithOffset(p2 - p1 + 
1), 1, s1);
 }
 
-loplugin::Plugin::Registration< InlineSimpleMemberFunctions > 
X("inlinesimplememberfunctions");
+loplugin::Plugin::Registration< InlineSimpleMemberFunctions > 
X("inlinesimplememberfunctions", true);
 
 }
 
diff --git a/lotuswordpro/source/filter/lwplayout.hxx 
b/lotuswordpro/source/filter/lwplayout.hxx
index 1b2c9aa..ac0ee3a 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -82,6 +82,7 @@
 #include "xfilter/xfpagemaster.hxx"
 #include "xfilter/xfcolumns.hxx"
 #include "xfilter/xfborders.hxx"
+#include "xfilter/xffont.hxx"
 #include "xfilter/xfframestyle.hxx"
 #include "xfilter/xfframe.hxx"
 #include "xfilter/xfbgimage.hxx"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits