diff options
Diffstat (limited to 'chart2/source/controller/main')
9 files changed, 53 insertions, 53 deletions
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 119146a67de0..63e3b2336b21 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1304,7 +1304,7 @@ void SAL_CALL ChartController::releaseContextMenuInterceptor( void ChartController::executeDispatch_ChartType() { UndoLiveUpdateGuard aUndoGuard( - SCH_RESSTR( STR_ACTION_EDIT_CHARTTYPE ), m_xUndoManager ); + SchResId( STR_ACTION_EDIT_CHARTTYPE ), m_xUndoManager ); SolarMutexGuard aSolarGuard; //prepare and open dialog @@ -1325,7 +1325,7 @@ void ChartController::executeDispatch_SourceData() return; UndoLiveUpdateGuard aUndoGuard( - SCH_RESSTR(STR_ACTION_EDIT_DATA_RANGES), m_xUndoManager ); + SchResId(STR_ACTION_EDIT_DATA_RANGES), m_xUndoManager ); if( xChartDoc.is()) { SolarMutexGuard aSolarGuard; @@ -1350,7 +1350,7 @@ void ChartController::executeDispatch_MoveSeries( bool bForward ) UndoGuardWithSelection aUndoGuard( ActionDescriptionProvider::createDescription( (bForward ? ActionDescriptionProvider::ActionType::MoveToTop : ActionDescriptionProvider::ActionType::MoveToBottom), - SCH_RESSTR(STR_OBJECT_DATASERIES)), + SchResId(STR_OBJECT_DATASERIES)), m_xUndoManager ); bool bChanged = DiagramHelper::moveSeries( ChartModelHelper::findDiagram( getModel() ), xGivenDataSeries, bForward ); diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx index fdff4e769147..143b5995f597 100644 --- a/chart2/source/controller/main/ChartController_EditData.cxx +++ b/chart2/source/controller/main/ChartController_EditData.cxx @@ -47,7 +47,7 @@ void ChartController::executeDispatch_EditData() { SolarMutexGuard aSolarGuard; UndoLiveUpdateGuardWithData aUndoGuard( - SCH_RESSTR( STR_ACTION_EDIT_CHART_DATA ), + SchResId( STR_ACTION_EDIT_CHART_DATA ), m_xUndoManager ); ScopedVclPtrInstance<DataEditor> aDataEditorDialog( nullptr, xChartDoc, m_xCC ); if (aDataEditorDialog->Execute() == RET_OK) diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index c6a04bbc1b04..5156efe72111 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -89,7 +89,7 @@ void ChartController::executeDispatch_InsertAxes() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_AXES )), + ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_AXES )), m_xUndoManager ); try @@ -127,7 +127,7 @@ void ChartController::executeDispatch_InsertGrid() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_GRIDS )), + ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_GRIDS )), m_xUndoManager ); try @@ -161,7 +161,7 @@ void ChartController::executeDispatch_InsertTitles() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_TITLES )), + ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_TITLES )), m_xUndoManager ); try @@ -192,7 +192,7 @@ void ChartController::executeDispatch_DeleteLegend() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_LEGEND )), + ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_LEGEND )), m_xUndoManager ); ChartModel& rModel = dynamic_cast<ChartModel&>(*getModel().get()); @@ -204,7 +204,7 @@ void ChartController::executeDispatch_InsertLegend() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_LEGEND )), + ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_LEGEND )), m_xUndoManager ); ChartModel& rModel = dynamic_cast<ChartModel&>(*getModel().get()); @@ -216,7 +216,7 @@ void ChartController::executeDispatch_OpenLegendDialog() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_LEGEND )), + ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_LEGEND )), m_xUndoManager ); try @@ -244,7 +244,7 @@ void ChartController::executeDispatch_InsertMenu_DataLabels() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_DATALABELS )), + ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_DATALABELS )), m_xUndoManager ); //if a series is selected insert labels for that series only: @@ -306,7 +306,7 @@ void ChartController::executeDispatch_InsertMeanValue() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )), + ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_AVERAGE_LINE )), m_xUndoManager ); lcl_InsertMeanValueLine( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ) ); @@ -317,7 +317,7 @@ void ChartController::executeDispatch_InsertMenu_MeanValues() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )), + ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_AVERAGE_LINE )), m_xUndoManager ); uno::Reference< chart2::XDataSeries > xSeries( @@ -361,7 +361,7 @@ void ChartController::executeDispatch_InsertTrendline() UndoLiveUpdateGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_CURVE )), + ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_CURVE )), m_xUndoManager ); uno::Reference< chart2::XRegressionCurve > xCurve = @@ -423,7 +423,7 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError ) UndoLiveUpdateGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Insert, - SCH_RESSTR( bYError ? STR_OBJECT_ERROR_BARS_Y : STR_OBJECT_ERROR_BARS_X )), + SchResId( bYError ? STR_OBJECT_ERROR_BARS_Y : STR_OBJECT_ERROR_BARS_X )), m_xUndoManager ); // add error bars with standard deviation @@ -532,7 +532,7 @@ void ChartController::executeDispatch_InsertTrendlineEquation( bool bInsertR2 ) { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), + ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); xEqProp->setPropertyValue( "ShowEquation", uno::Any( true )); xEqProp->setPropertyValue( "XName", uno::Any( OUString("x") )); @@ -551,7 +551,7 @@ void ChartController::executeDispatch_InsertR2Value() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), + ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::Any( true )); aUndoGuard.commit(); @@ -566,7 +566,7 @@ void ChartController::executeDispatch_DeleteR2Value() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), + ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::Any( false )); aUndoGuard.commit(); @@ -581,7 +581,7 @@ void ChartController::executeDispatch_DeleteMeanValue() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )), + ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_AVERAGE_LINE )), m_xUndoManager ); RegressionCurveHelper::removeMeanValueLine( xRegCurveCnt ); aUndoGuard.commit(); @@ -596,7 +596,7 @@ void ChartController::executeDispatch_DeleteTrendline() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_CURVE )), + ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_CURVE )), m_xUndoManager ); RegressionCurveHelper::removeAllExceptMeanValueLine( xRegCurveCnt ); aUndoGuard.commit(); @@ -611,7 +611,7 @@ void ChartController::executeDispatch_DeleteTrendlineEquation() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), + ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); RegressionCurveHelper::removeEquations( xRegCurveCnt ); aUndoGuard.commit(); @@ -626,7 +626,7 @@ void ChartController::executeDispatch_DeleteErrorBars( bool bYError ) { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_CURVE )), + ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_CURVE )), m_xUndoManager ); StatisticsHelper::removeErrorBars( xDataSeries, bYError ); aUndoGuard.commit(); @@ -640,7 +640,7 @@ void ChartController::executeDispatch_InsertDataLabels() if( xSeries.is() ) { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Insert, - SCH_RESSTR( STR_OBJECT_DATALABELS )), + SchResId( STR_OBJECT_DATALABELS )), m_xUndoManager ); DataSeriesHelper::insertDataLabelsToSeriesAndAllPoints( xSeries ); aUndoGuard.commit(); @@ -650,7 +650,7 @@ void ChartController::executeDispatch_InsertDataLabels() void ChartController::executeDispatch_InsertDataLabel() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Insert, - SCH_RESSTR( STR_OBJECT_LABEL )), + SchResId( STR_OBJECT_LABEL )), m_xUndoManager ); DataSeriesHelper::insertDataLabelToPoint( ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ) ); aUndoGuard.commit(); @@ -663,7 +663,7 @@ void ChartController::executeDispatch_DeleteDataLabels() if( xSeries.is() ) { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Delete, - SCH_RESSTR( STR_OBJECT_DATALABELS )), + SchResId( STR_OBJECT_DATALABELS )), m_xUndoManager ); DataSeriesHelper::deleteDataLabelsFromSeriesAndAllPoints( xSeries ); aUndoGuard.commit(); @@ -673,7 +673,7 @@ void ChartController::executeDispatch_DeleteDataLabels() void ChartController::executeDispatch_DeleteDataLabel() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Delete, - SCH_RESSTR( STR_OBJECT_LABEL )), + SchResId( STR_OBJECT_LABEL )), m_xUndoManager ); DataSeriesHelper::deleteDataLabelsFromPoint( ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ) ); aUndoGuard.commit(); @@ -682,7 +682,7 @@ void ChartController::executeDispatch_DeleteDataLabel() void ChartController::executeDispatch_ResetAllDataPoints() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Format, - SCH_RESSTR( STR_OBJECT_DATAPOINTS )), + SchResId( STR_OBJECT_DATAPOINTS )), m_xUndoManager ); uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); if( xSeries.is() ) @@ -692,7 +692,7 @@ void ChartController::executeDispatch_ResetAllDataPoints() void ChartController::executeDispatch_ResetDataPoint() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Format, - SCH_RESSTR( STR_OBJECT_DATAPOINT )), + SchResId( STR_OBJECT_DATAPOINT )), m_xUndoManager ); uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); if( xSeries.is() ) @@ -711,7 +711,7 @@ void ChartController::executeDispatch_InsertAxisTitle() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_TITLE )), + ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_TITLE )), m_xUndoManager ); Reference< XAxis > xAxis = ObjectIdentifier::getAxisForCID( m_aSelection.getSelectedCID(), getModel() ); @@ -743,7 +743,7 @@ void ChartController::executeDispatch_InsertAxis() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_AXIS )), + ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_AXIS )), m_xUndoManager ); try @@ -765,7 +765,7 @@ void ChartController::executeDispatch_DeleteAxis() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_AXIS )), + ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_AXIS )), m_xUndoManager ); try @@ -787,7 +787,7 @@ void ChartController::executeDispatch_InsertMajorGrid() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_GRID )), + ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_GRID )), m_xUndoManager ); try @@ -809,7 +809,7 @@ void ChartController::executeDispatch_DeleteMajorGrid() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_GRID )), + ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_GRID )), m_xUndoManager ); try @@ -831,7 +831,7 @@ void ChartController::executeDispatch_InsertMinorGrid() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_GRID )), + ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_GRID )), m_xUndoManager ); try @@ -855,7 +855,7 @@ void ChartController::executeDispatch_DeleteMinorGrid() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR(STR_OBJECT_GRID)), + ActionDescriptionProvider::ActionType::Delete, SchResId(STR_OBJECT_GRID)), m_xUndoManager ); try diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 795b3b38b08c..1136031073a1 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -817,7 +817,7 @@ void ChartController::executeDispatch_View3D() try { UndoLiveUpdateGuard aUndoGuard( - SCH_RESSTR( STR_ACTION_EDIT_3D_VIEW ), + SchResId( STR_ACTION_EDIT_3D_VIEW ), m_xUndoManager ); //open dialog diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index a250d784985e..11fb754eec6e 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -63,7 +63,7 @@ void ChartController::StartTextEdit( const Point* pMousePixel ) OSL_PRECOND( !m_pTextActionUndoGuard.get(), "ChartController::StartTextEdit: already have a TextUndoGuard!?" ); m_pTextActionUndoGuard.reset( new UndoGuard( - SCH_RESSTR( STR_ACTION_EDIT_TEXT ), m_xUndoManager ) ); + SchResId( STR_ACTION_EDIT_TEXT ), m_xUndoManager ) ); SdrOutliner* pOutliner = m_pDrawViewWrapper->getOutliner(); //#i77362 change notification for changes on additional shapes are missing diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 50f0a12b474a..489dbf02bbb9 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -99,7 +99,7 @@ bool lcl_deleteDataSeries( { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_DATASERIES )), + ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_DATASERIES )), xUndoManager ); Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( xModel ) ); @@ -138,7 +138,7 @@ bool lcl_deleteDataCurve( { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_CURVE )), + ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_CURVE )), xUndoManager ); xRegressionCurveContainer->removeRegressionCurve( xRegressionCurve ); @@ -179,7 +179,7 @@ void ChartController::executeDispatch_NewArrangement() if( xDiagram.is()) { UndoGuard aUndoGuard( - SCH_RESSTR( STR_ACTION_REARRANGE_CHART ), + SchResId( STR_ACTION_REARRANGE_CHART ), m_xUndoManager ); ControllerLockGuardUNO aCtlLockGuard( xModel ); @@ -234,7 +234,7 @@ void ChartController::executeDispatch_ScaleText() { SolarMutexGuard aSolarGuard; UndoGuard aUndoGuard( - SCH_RESSTR( STR_ACTION_SCALE_TEXT ), + SchResId( STR_ACTION_SCALE_TEXT ), m_xUndoManager ); ControllerLockGuardUNO aCtlLockGuard( getModel() ); @@ -613,7 +613,7 @@ bool ChartController::executeDispatch_Delete() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_TITLE )), + ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_TITLE )), m_xUndoManager ); TitleHelper::removeTitle( ObjectIdentifier::getTitleTypeForCID( aCID ), getModel() ); @@ -631,7 +631,7 @@ bool ChartController::executeDispatch_Delete() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_LEGEND )), + ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_LEGEND )), m_xUndoManager ); xLegendProp->setPropertyValue( "Show", uno::Any( false )); bReturn = true; @@ -677,7 +677,7 @@ bool ChartController::executeDispatch_Delete() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )), + ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_AVERAGE_LINE )), m_xUndoManager ); RegressionCurveHelper::removeMeanValueLine( xRegCurveCnt ); bReturn = true; @@ -702,7 +702,7 @@ bool ChartController::executeDispatch_Delete() uno::Reference< frame::XModel > xModel( getModel() ); UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), + ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); { ControllerLockGuardUNO aCtlLockGuard( xModel ); @@ -737,7 +737,7 @@ bool ChartController::executeDispatch_Delete() uno::Reference< frame::XModel > xModel( getModel() ); UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( nId )), + ActionDescriptionProvider::ActionType::Delete, SchResId( nId )), m_xUndoManager ); { ControllerLockGuardUNO aCtlLockGuard( xModel ); @@ -761,7 +761,7 @@ bool ChartController::executeDispatch_Delete() UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Delete, - SCH_RESSTR( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )), + SchResId( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )), m_xUndoManager ); chart2::DataPointLabel aLabel; xObjectProperties->getPropertyValue(CHART_UNONAME_LABEL) >>= aLabel; @@ -826,7 +826,7 @@ void ChartController::executeDispatch_ToggleLegend() { Reference< frame::XModel > xModel( getModel() ); UndoGuard aUndoGuard( - SCH_RESSTR( STR_ACTION_TOGGLE_LEGEND ), m_xUndoManager ); + SchResId( STR_ACTION_TOGGLE_LEGEND ), m_xUndoManager ); ChartModel& rModel = dynamic_cast<ChartModel&>(*xModel.get()); Reference< beans::XPropertySet > xLegendProp( LegendHelper::getLegend(rModel), uno::UNO_QUERY ); bool bChanged = false; @@ -860,7 +860,7 @@ void ChartController::executeDispatch_ToggleLegend() void ChartController::executeDispatch_ToggleGridHorizontal() { UndoGuard aUndoGuard( - SCH_RESSTR( STR_ACTION_TOGGLE_GRID_HORZ ), m_xUndoManager ); + SchResId( STR_ACTION_TOGGLE_GRID_HORZ ), m_xUndoManager ); Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( getModel() )); if( xDiagram.is()) { @@ -893,7 +893,7 @@ void ChartController::executeDispatch_ToggleGridHorizontal() void ChartController::executeDispatch_ToggleGridVertical() { UndoGuard aUndoGuard( - SCH_RESSTR( STR_ACTION_TOGGLE_GRID_VERTICAL ), m_xUndoManager ); + SchResId( STR_ACTION_TOGGLE_GRID_VERTICAL ), m_xUndoManager ); Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( getModel() )); if( xDiagram.is()) { diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 9b3d0e3ba69d..a38bb94571f0 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -1535,7 +1535,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) bReturn = executeDispatch_Delete(); if( ! bReturn ) { - ScopedVclPtrInstance<InfoBox>(pChartWindow, SCH_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute(); + ScopedVclPtrInstance<InfoBox>(pChartWindow, SchResId(STR_ACTION_NOTPOSSIBLE))->Execute(); } } diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index 845bb7c65591..331a506a1840 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -71,7 +71,7 @@ DragMethod_PieSegment::~DragMethod_PieSegment() } void DragMethod_PieSegment::TakeSdrDragComment(OUString& rStr) const { - rStr = SCH_RESSTR(STR_STATUS_PIE_SEGMENT_EXPLODED); + rStr = SchResId(STR_STATUS_PIE_SEGMENT_EXPLODED); rStr = rStr.replaceFirst( "%PERCENTVALUE", OUString::number( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) )); } bool DragMethod_PieSegment::BeginSdrDrag() diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index d2499c243c31..0aa6610ba958 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -140,7 +140,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection() ListBoxEntryData aEntry; SdrObject* pSelectedObj = DrawViewWrapper::getSdrObject( aSelectedOID.getAdditionalShape() ); OUString aName = pSelectedObj ? pSelectedObj->GetName() : OUString(); - aEntry.UIName = ( aName.isEmpty() ? SCH_RESSTR( STR_OBJECT_SHAPE ) : aName ); + aEntry.UIName = ( aName.isEmpty() ? SchResId( STR_OBJECT_SHAPE ) : aName ); aEntry.OID = aSelectedOID; m_aEntries.push_back( aEntry ); } |