diff options
| author | Rafael Dominguez <venccsralph@gmail.com> | 2012-03-16 17:17:58 +0000 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-03-23 02:55:30 +0100 |
| commit | 34cadd6397c6d1767bba431450976d4f4f0b100c (patch) | |
| tree | 62018e3d3976f7b9d0313276de00221c46f2d652 /chart2/source/controller | |
| parent | Add chart errorbar type property. (diff) | |
| download | core-34cadd6397c6d1767bba431450976d4f4f0b100c.tar.gz core-34cadd6397c6d1767bba431450976d4f4f0b100c.zip | |
Specialize STR_OBJECT_ERROR_BARS for each errobar type.
Diffstat (limited to 'chart2/source/controller')
4 files changed, 19 insertions, 8 deletions
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index cc9e6f6c740c..8ede4c949aef 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -284,16 +284,16 @@ rtl::OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural aRet=String(SchResId(STR_OBJECT_LABEL)); break; case OBJECTTYPE_DATA_ERRORS: - aRet=String(SchResId(STR_OBJECT_ERROR_BARS));//@todo? maybe distinguish plural singular + aRet=String(SchResId(STR_OBJECT_ERROR_BARS_Y)); break; case OBJECTTYPE_DATA_ERRORS_X: - aRet=String(SchResId(STR_OBJECT_ERROR_BARS));//@todo? maybe specialize in future + aRet=String(SchResId(STR_OBJECT_ERROR_BARS_X)); break; case OBJECTTYPE_DATA_ERRORS_Y: - aRet=String(SchResId(STR_OBJECT_ERROR_BARS));//@todo? maybe specialize in future + aRet=String(SchResId(STR_OBJECT_ERROR_BARS_Y)); break; case OBJECTTYPE_DATA_ERRORS_Z: - aRet=String(SchResId(STR_OBJECT_ERROR_BARS));//@todo? maybe specialize in future + aRet=String(SchResId(STR_OBJECT_ERROR_BARS_Z)); break; case OBJECTTYPE_DATA_AVERAGE_LINE: aRet=String(SchResId(STR_OBJECT_AVERAGE_LINE)); diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src index 5a3a500ff849..067c106fa874 100644 --- a/chart2/source/controller/dialogs/Strings.src +++ b/chart2/source/controller/dialogs/Strings.src @@ -331,9 +331,19 @@ String STR_OBJECT_CURVE_EQUATION Text[ en-US ] = "Equation"; }; -String STR_OBJECT_ERROR_BARS +String STR_OBJECT_ERROR_BARS_X { - Text [ en-US ] = "Error Bars"; + Text [ en-US ] = "X Error Bars"; +}; + +String STR_OBJECT_ERROR_BARS_Y +{ + Text [ en-US ] = "Y Error Bars"; +}; + +String STR_OBJECT_ERROR_BARS_Z +{ + Text [ en-US ] = "Z Error Bars"; }; String STR_OBJECT_STOCK_LOSS { diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 9fc38dda011e..c4efa902fd44 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -484,7 +484,8 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError ) { UndoLiveUpdateGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_ERROR_BARS ))), + ActionDescriptionProvider::INSERT, + String( SchResId( bYError ? STR_OBJECT_ERROR_BARS_Y : STR_OBJECT_ERROR_BARS_X ))), m_xUndoManager ); // add error bars with standard deviation diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index e1a22797157d..9da159cffee5 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -723,7 +723,7 @@ bool ChartController::executeDispatch_Delete() // using assignment for broken gcc 3.3 UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_ERROR_BARS ))), + ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_ERROR_BARS_Y ))), m_xUndoManager ); { ControllerLockGuard aCtlLockGuard( xModel ); |