From 32eeb405d7fd6788aaa34e1bf8a04388d7a3958f Mon Sep 17 00:00:00 2001 From: Arkadiy Illarionov Date: Tue, 4 Jun 2019 02:29:43 +0300 Subject: tdf#39593 remove IMPL_XUNOTUNNEL* macros Replace with UNO3_GETIMPLEMENTATION* macros. Replace single usage of IMPL_XUNOTUNNEL_MINIMAL with it's body. Change-Id: I7d4ad76399b999ebb2178ecf57edcf6bd2aa6c3e Reviewed-on: https://gerrit.libreoffice.org/73424 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- framework/source/uielement/popuptoolbarcontroller.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'framework/source/uielement/popuptoolbarcontroller.cxx') diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 6d325ff4f452..43333b925831 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -329,7 +329,7 @@ void GenericPopupToolbarController::statusChanged( const css::frame::FeatureStat if ( m_bReplaceWithLast && !rEvent.IsEnabled && m_xPopupMenu.is() ) { - Menu* pVclMenu = VCLXMenu::GetImplementation( m_xPopupMenu )->GetMenu(); + Menu* pVclMenu = VCLXMenu::getImplementation( m_xPopupMenu )->GetMenu(); ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; @@ -663,7 +663,7 @@ void SAL_CALL NewToolbarController::execute( sal_Int16 /*KeyModifier*/ ) // TODO investigate how to wrap Get/SetUserValue in css::awt::XMenu MenuAttributes* pMenuAttributes( nullptr ); VCLXPopupMenu* pTkPopupMenu = - static_cast( VCLXMenu::GetImplementation( m_xPopupMenu ) ); + static_cast( VCLXMenu::getImplementation( m_xPopupMenu ) ); SolarMutexGuard aSolarMutexGuard; PopupMenu* pVCLPopupMenu = pTkPopupMenu ? -- cgit