diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-31 16:29:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-02 07:39:50 +0100 |
| commit | ac7132598b1dfc4d266b89565755bd2795db9e0b (patch) | |
| tree | 360048822cb8b90ba93cc320d49211c8046f0ee3 | |
| parent | 1d9868329658eab34352c499bc2893752cc3aaaf (diff) | |
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 <momonasmon@gmail.com>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | compilerplugins/clang/datamembershadow.cxx | 4 | ||||
| -rw-r--r-- | framework/source/uielement/popuptoolbarcontroller.cxx | 3 |
2 files changed, 3 insertions, 4 deletions
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()) { diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 22bfc8fdc969..e9077536bd7d 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -79,7 +79,6 @@ protected: virtual ToolBoxItemBits getDropDownStyle() const; void createPopupMenuController(); - css::uno::Reference< css::uno::XComponentContext > m_xContext; bool m_bHasController; OUString m_aPopupCommand; css::uno::Reference< css::awt::XPopupMenu > m_xPopupMenu; @@ -92,7 +91,7 @@ private: PopupMenuToolbarController::PopupMenuToolbarController( const css::uno::Reference< css::uno::XComponentContext >& xContext, const OUString &rPopupCommand ) - : m_xContext( xContext ) + : ToolBarBase( xContext, css::uno::Reference< css::frame::XFrame >(), /*aCommandURL*/OUString() ) , m_bHasController( false ) , m_aPopupCommand( rPopupCommand ) { |