mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further clean-up

Browse Source 
Change-Id: I16b8bfe2c4a337acf188ec8ffa2ed084ca437faa
This commit is contained in:
Stephan Bergmann
2016-06-29 11:38:22 +02:00
parent 5d88bf766c
commit ac265f6210
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
compilerplugins/clang/passstuffbyref.cxx
View File

@@ -243,13 +243,19 @@ void PassStuffByRef::checkReturnValue(const FunctionDecl * functionDecl, const C
return; return;
} }
loplugin::DeclCheck dc(functionDecl); loplugin::DeclCheck dc(functionDecl);
std::string aFunctionName = functionDecl->getQualifiedNameAsString();
// function is passed as parameter to another function // function is passed as parameter to another function
if (dc.Function("ImplColMonoFnc").Class("GDIMetaFile").GlobalNamespace() if (dc.Function("ImplColMonoFnc").Class("GDIMetaFile").GlobalNamespace()
|| (dc.Function("darkColor").Class("SvxBorderLine").Namespace("editeng") || (dc.Function("darkColor").Class("SvxBorderLine").Namespace("editeng")
.GlobalNamespace()) .GlobalNamespace())
|| aFunctionName.compare(0, 8, "xforms::") == 0) || (dc.MemberFunction().Class("Binding").Namespace("xforms")
.GlobalNamespace())
|| (dc.MemberFunction().Class("Model").Namespace("xforms")
.GlobalNamespace())
|| (dc.MemberFunction().Class("Submission").Namespace("xforms")
.GlobalNamespace()))
{
return; return;
}
// not sure how to exclude this yet, returns copy of one of it's params // not sure how to exclude this yet, returns copy of one of it's params
if (dc.Function("sameDistColor").GlobalNamespace() if (dc.Function("sameDistColor").GlobalNamespace()
|| dc.Function("sameColor").GlobalNamespace() || dc.Function("sameColor").GlobalNamespace()
@@ -278,7 +284,7 @@ void PassStuffByRef::checkReturnValue(const FunctionDecl * functionDecl, const C
DiagnosticsEngine::Warning, DiagnosticsEngine::Warning,
"rather return %0 from function %1 %2 by const& than by value, to avoid unnecessary copying", "rather return %0 from function %1 %2 by const& than by value, to avoid unnecessary copying",
functionDecl->getSourceRange().getBegin()) functionDecl->getSourceRange().getBegin())
<< type.getAsString() << aFunctionName << type->getTypeClassName() << functionDecl->getSourceRange(); << type.getAsString() << functionDecl->getQualifiedNameAsString() << type->getTypeClassName() << functionDecl->getSourceRange();
// display the location of the class member declaration so I don't have to search for it by hand // display the location of the class member declaration so I don't have to search for it by hand
if (functionDecl->getSourceRange().getBegin() != functionDecl->getCanonicalDecl()->getSourceRange().getBegin()) if (functionDecl->getSourceRange().getBegin() != functionDecl->getCanonicalDecl()->getSourceRange().getBegin())

2
forms/source/xforms/computedexpression.hxx
View File

@@ -111,7 +111,7 @@ public:
// get the result of this expression as string/bool/... // get the result of this expression as string/bool/...
// (Results will be based on the last call of evaluate(..). The caller // (Results will be based on the last call of evaluate(..). The caller
// must call evaluate to ensure current results.) // must call evaluate to ensure current results.)
css::uno::Reference<css::xml::xpath::XXPathObject> getXPath() const { return mxResult;} css::uno::Reference<css::xml::xpath::XXPathObject> const & getXPath() const { return mxResult;}
bool getBool( bool bDefault = false ) const; bool getBool( bool bDefault = false ) const;
OUString getString() const; OUString getString() const;