From ac7132598b1dfc4d266b89565755bd2795db9e0b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 31 Jan 2018 16:29:17 +0200 Subject: loplugin:datamembershadow in PopupMenuToolbarController this looks like an oversight, just use the baseclass member Change-Id: Ida36be64266bbc33a6bd1d89dcb665d24a6dd83f Reviewed-on: https://gerrit.libreoffice.org/49075 Reviewed-by: Maxim Monastirsky Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- compilerplugins/clang/datamembershadow.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compilerplugins') diff --git a/compilerplugins/clang/datamembershadow.cxx b/compilerplugins/clang/datamembershadow.cxx index 210ee1c9a0d1..c4e9370b36f1 100644 --- a/compilerplugins/clang/datamembershadow.cxx +++ b/compilerplugins/clang/datamembershadow.cxx @@ -61,8 +61,6 @@ bool DataMemberShadow::VisitFieldDecl(FieldDecl const * fieldDecl) return true; if (loplugin::isSamePathname(aFileName, SRCDIR "/filter/source/graphicfilter/idxf/dxfentrd.hxx")) return true; - if (loplugin::isSamePathname(aFileName, SRCDIR "/framework/source/uielement/popuptoolbarcontroller.cxx")) - return true; if (loplugin::isSamePathname(aFileName, SRCDIR "/sc/source/ui/vba/vbastyles.hxx")) return true; if (loplugin::isSamePathname(aFileName, SRCDIR "/sd/inc/Outliner.hxx")) @@ -98,6 +96,8 @@ bool DataMemberShadow::VisitFieldDecl(FieldDecl const * fieldDecl) return false; for (const FieldDecl* baseFieldDecl : baseCXXRecordDecl->fields()) { + // TODO look for overlaps even with private fields + if (baseFieldDecl->getAccess() == AS_private || !baseFieldDecl->getDeclName().isIdentifier() || fieldDecl->getName() != baseFieldDecl->getName()) { -- cgit