From 42e89217fb3b8bda7cc084c8e14ba56efa8eae3f Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Wed, 19 Oct 2016 13:59:56 +0300 Subject: No need to check here if menu name is empty We now do this on the ResourceMenuController side. Change-Id: Ic249b6a687fe059393ccf55bbc4534242c08e30e --- chart2/source/controller/main/ChartController_Window.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'chart2') diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index b1daf046eaee..4e7a7912165d 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -1217,11 +1217,10 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) } } - css::uno::Sequence< css::uno::Any > aArgs( aMenuName.isEmpty() ? 2 : 3 ); + css::uno::Sequence< css::uno::Any > aArgs( 3 ); aArgs[0] <<= comphelper::makePropertyValue( "IsContextMenu", true ); aArgs[1] <<= comphelper::makePropertyValue( "Frame", m_xFrame ); - if ( !aMenuName.isEmpty() ) - aArgs[2] <<= comphelper::makePropertyValue( "Value", aMenuName ); + aArgs[2] <<= comphelper::makePropertyValue( "Value", aMenuName ); css::uno::Reference< css::frame::XPopupMenuController > xPopupController( m_xCC->getServiceManager()->createInstanceWithArgumentsAndContext( -- cgit