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 --- framework/source/uielement/popuptoolbarcontroller.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'framework/source/uielement') 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 ) { -- cgit