diff options
| author | Rafael Dominguez <venccsralph@gmail.com> | 2012-03-14 21:23:36 +0000 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-03-23 02:55:29 +0100 |
| commit | 2971651cd9d06b8ebf49323e937b78c34cd75609 (patch) | |
| tree | b0a400cd89ee477c33f297f63b551ae3da0f88f2 /chart2 | |
| parent | Add correct tabpage to chart property dialog. (diff) | |
| download | core-2971651cd9d06b8ebf49323e937b78c34cd75609.tar.gz core-2971651cd9d06b8ebf49323e937b78c34cd75609.zip | |
Add chart insert X errorbar toolbar and popup menu entries.
- Dispatch the commands to the proper functions.
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/main/ChartController.cxx | 5 | ||||
| -rw-r--r-- | chart2/source/controller/main/ChartController_Window.cxx | 5 | ||||
| -rw-r--r-- | chart2/uiconfig/menubar/menubar.xml | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 8fb8adf708cf..018349a6367a 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1111,6 +1111,8 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) this->executeDispatch_InsertMenu_Trendlines(); else if( aCommand.equals("InsertMenuMeanValues")) this->executeDispatch_InsertMenu_MeanValues(); + else if( aCommand.equals("InsertMenuXErrorBars")) + this->executeDispatch_InsertErrorBars(false); else if( aCommand.equals("InsertMenuYErrorBars")) this->executeDispatch_InsertErrorBars(true); else if( aCommand.equals("InsertSymbol")) @@ -1123,6 +1125,8 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) this->executeDispatch_InsertMeanValue(); else if( aCommand.equals("DeleteMeanValue")) this->executeDispatch_DeleteMeanValue(); + else if( aCommand.equals("InsertXErrorBars")) + this->executeDispatch_InsertErrorBars(false); else if( aCommand.equals("InsertYErrorBars")) this->executeDispatch_InsertErrorBars(true); else if( aCommand.equals("DeleteYErrorBars")) @@ -1509,6 +1513,7 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn ( "InsertR2Value" ) ( "DeleteR2Value" ) ( "InsertMenuTrendlines" ) ( "InsertTrendline" ) ( "InsertMenuMeanValues" ) ( "InsertMeanValue" ) + ( "InsertMenuXErrorBars" ) ( "InsertXErrorBars" ) ( "InsertMenuYErrorBars" ) ( "InsertYErrorBars" ) ( "InsertDataLabels" ) ( "InsertDataLabel" ) ( "DeleteTrendline" ) ( "DeleteMeanValue" ) ( "DeleteTrendlineEquation" ) diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 6a2a18bd0aaa..fbea9bebe558 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -1063,6 +1063,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) bool bHasEquation = RegressionCurveHelper::hasEquation( xTrendline ); Reference< chart2::XRegressionCurve > xMeanValue( RegressionCurveHelper::getMeanValueLine( xCurveCnt ) ); bool bHasYErrorBars = StatisticsHelper::hasErrorBars( xSeries, true ); + bool bHasXErrorBars = StatisticsHelper::hasErrorBars( xSeries, false ); bool bHasDataLabelsAtSeries = DataSeriesHelper::hasDataLabelsAtSeries( xSeries ); bool bHasDataLabelsAtPoints = DataSeriesHelper::hasDataLabelsAtPoints( xSeries ); bool bHasDataLabelAtPoint = false; @@ -1159,6 +1160,8 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTrendlineEquation") ); if( !xMeanValue.is() ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertMeanValue") ); + if( !bHasXErrorBars ) + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertXErrorBars")); if( !bHasYErrorBars ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertYErrorBars") ); @@ -1171,6 +1174,8 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteTrendlineEquation") ); if( xMeanValue.is() ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteMeanValue") ); + if( bHasXErrorBars ) + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteXErrorBars")); if( bHasYErrorBars ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteYErrorBars") ); diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml index a52dff8bb345..353a8ad76647 100644 --- a/chart2/uiconfig/menubar/menubar.xml +++ b/chart2/uiconfig/menubar/menubar.xml @@ -51,6 +51,7 @@ <menu:menuitem menu:id=".uno:InsertMenuDataLabels" menu:label="" /> <menu:menuitem menu:id=".uno:InsertMenuTrendlines" menu:label="" /> <menu:menuitem menu:id=".uno:InsertMenuMeanValues" menu:label="" /> + <menu:menuitem menu:id=".uno:InsertMenuXErrorBars" menu:label="" /> <menu:menuitem menu:id=".uno:InsertMenuYErrorBars" menu:label="" /> <menu:menuseparator/> <menu:menuitem menu:id=".uno:InsertSymbol" menu:helpid="10503" menu:label="" /> |