diff options
| author | Rafael Dominguez <venccsralph@gmail.com> | 2012-03-14 18:40:44 +0000 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-03-23 02:55:29 +0100 |
| commit | 3e964eeb7ca1b662705b5d6ce54102d33f310705 (patch) | |
| tree | 8229c43b50c7caadf6bc9143d5d518de60858b23 /chart2 | |
| parent | Display correct errorbar in InsertDialog. (diff) | |
| download | core-3e964eeb7ca1b662705b5d6ce54102d33f310705.tar.gz core-3e964eeb7ca1b662705b5d6ce54102d33f310705.zip | |
Set chart objecttype depending on errorbar type.
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx | 4 | ||||
| -rw-r--r-- | chart2/source/controller/main/ChartController_Insert.cxx | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx index 52e4a42770bf..b21fd148a3b7 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx @@ -67,7 +67,9 @@ InsertErrorBarsDialog::InsertErrorBarsDialog( /* bNoneAvailable = */ true, eType )) { FreeResource(); - this->SetText( ObjectNameProvider::getName_ObjectForAllSeries( OBJECTTYPE_DATA_ERRORS ) ); + ObjectType objType = eType == ErrorBarResources::ERROR_BAR_Y ? OBJECTTYPE_DATA_ERRORS : OBJECTTYPE_DATA_ERRORS_X; + + this->SetText( ObjectNameProvider::getName_ObjectForAllSeries(objType) ); m_apErrorBarResources->SetChartDocumentForRangeChoosing( xChartDocument ); } diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 09d8a6445b57..9fc38dda011e 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -474,6 +474,8 @@ void ChartController::executeDispatch_InsertTrendline() void ChartController::executeDispatch_InsertErrorBars( bool bYError ) { + ObjectType objType = bYError ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X; + //if a series is selected insert error bars for that series only: uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); @@ -502,7 +504,7 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError ) aItemConverter.FillItemSet( aItemSet ); ObjectPropertiesDialogParameter aDialogParameter = ObjectPropertiesDialogParameter( ObjectIdentifier::createClassifiedIdentifierWithParent( - OBJECTTYPE_DATA_ERRORS, ::rtl::OUString(), m_aSelection.getSelectedCID())); + objType, ::rtl::OUString(), m_aSelection.getSelectedCID())); aDialogParameter.init( getModel() ); ViewElementListProvider aViewElementListProvider( m_pDrawModelWrapper.get()); SolarMutexGuard aGuard; @@ -531,7 +533,7 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError ) UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, - ObjectNameProvider::getName_ObjectForAllSeries( OBJECTTYPE_DATA_ERRORS ) ), + ObjectNameProvider::getName_ObjectForAllSeries( objType ) ), m_xUndoManager ); try |