diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-10-19 13:59:56 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-10-19 14:01:32 +0300 |
| commit | 42e89217fb3b8bda7cc084c8e14ba56efa8eae3f (patch) | |
| tree | 0610b5510bae0c08d57ba16b5c8960243c00a5e2 | |
| parent | c00d8271ba443c4f0acf657c226eea4824597f95 (diff) | |
No need to check here if menu name is empty
We now do this on the ResourceMenuController side.
Change-Id: Ic249b6a687fe059393ccf55bbc4534242c08e30e
| -rw-r--r-- | chart2/source/controller/main/ChartController_Window.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
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( |