From 367105e0248c7b80b60b2554d04f5f248b4259b3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 19 Oct 2015 10:37:58 +0200 Subject: cleanup some local var declarations found with git grep -nP '(\w+)\s+=\s+\g1\(' | lots-of-hand-filtering Change-Id: I598b0cfa6607823eaef09d95e610e05145c727f7 --- .../controller/drawinglayer/DrawViewWrapper.cxx | 2 +- .../controller/main/ChartController_Insert.cxx | 10 ++++----- .../controller/main/ChartController_Tools.cxx | 24 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 'chart2/source') diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index da032cc4ab73..be031a0f22e8 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -235,7 +235,7 @@ void DrawViewWrapper::setMarkHandleProvider( MarkHandleProvider* pMarkHandleProv void DrawViewWrapper::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* /* pRedirector */) { svtools::ColorConfig aColorConfig; - Color aFillColor = Color( aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor ); + Color aFillColor( aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor ); this->SetApplicationBackgroundColor(aFillColor); this->E3dView::CompleteRedraw( pOut, rReg ); } diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 5ca647ffee02..ca09dce26f77 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -532,7 +532,7 @@ void ChartController::executeDispatch_InsertTrendlineEquation( bool bInsertR2 ) if( xEqProp.is()) { // using assignment for broken gcc 3.3 - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); @@ -549,7 +549,7 @@ void ChartController::executeDispatch_InsertR2Value() ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); if( xEqProp.is()) { - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); @@ -564,7 +564,7 @@ void ChartController::executeDispatch_DeleteR2Value() ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); if( xEqProp.is()) { - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); @@ -639,7 +639,7 @@ void ChartController::executeDispatch_InsertDataLabels() ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); if( xSeries.is() ) { - UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_DATALABELS )), m_xUndoManager ); DataSeriesHelper::insertDataLabelsToSeriesAndAllPoints( xSeries ); @@ -649,7 +649,7 @@ void ChartController::executeDispatch_InsertDataLabels() void ChartController::executeDispatch_InsertDataLabel() { - UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_LABEL )), m_xUndoManager ); DataSeriesHelper::insertDataLabelToPoint( ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ) ); diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 2240eae61fbf..c6e01a805761 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -136,7 +136,7 @@ bool lcl_deleteDataCurve( if( xRegressionCurveContainer.is()) { - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE )), xUndoManager ); @@ -179,7 +179,7 @@ void ChartController::executeDispatch_NewArrangement() if( xDiagram.is()) { // using assignment for broken gcc 3.3 - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( SCH_RESSTR( STR_ACTION_REARRANGE_CHART ), m_xUndoManager ); ControllerLockGuardUNO aCtlLockGuard( xModel ); @@ -235,7 +235,7 @@ void ChartController::executeDispatch_ScaleText() { SolarMutexGuard aSolarGuard; // using assignment for broken gcc 3.3 - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( SCH_RESSTR( STR_ACTION_SCALE_TEXT ), m_xUndoManager ); ControllerLockGuardUNO aCtlLockGuard( getModel() ); @@ -616,7 +616,7 @@ bool ChartController::executeDispatch_Delete() case OBJECTTYPE_TITLE: { // using assignment for broken gcc 3.3 - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_TITLE )), m_xUndoManager ); @@ -635,7 +635,7 @@ bool ChartController::executeDispatch_Delete() if( xLegendProp.is()) { // using assignment for broken gcc 3.3 - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_LEGEND )), m_xUndoManager ); @@ -682,7 +682,7 @@ bool ChartController::executeDispatch_Delete() if( xRegCurveCnt.is()) { // using assignment for broken gcc 3.3 - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )), m_xUndoManager ); @@ -708,7 +708,7 @@ bool ChartController::executeDispatch_Delete() { uno::Reference< frame::XModel > xModel( getModel() ); // using assignment for broken gcc 3.3 - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); @@ -742,7 +742,7 @@ bool ChartController::executeDispatch_Delete() uno::Reference< frame::XModel > xModel( getModel() ); // using assignment for broken gcc 3.3 - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE, SCH_RESSTR( nId )), m_xUndoManager ); @@ -765,7 +765,7 @@ bool ChartController::executeDispatch_Delete() ObjectIdentifier::getObjectPropertySet( aCID, getModel() ); if( xObjectProperties.is() ) { - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE, SCH_RESSTR( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )), @@ -832,7 +832,7 @@ bool ChartController::executeDispatch_Delete() void ChartController::executeDispatch_ToggleLegend() { Reference< frame::XModel > xModel( getModel() ); - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( SCH_RESSTR( STR_ACTION_TOGGLE_LEGEND ), m_xUndoManager ); ChartModel& rModel = dynamic_cast(*xModel.get()); Reference< beans::XPropertySet > xLegendProp( LegendHelper::getLegend(rModel), uno::UNO_QUERY ); @@ -867,7 +867,7 @@ void ChartController::executeDispatch_ToggleLegend() void ChartController::executeDispatch_ToggleGridHorizontal() { Reference< frame::XModel > xModel( getModel() ); - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( SCH_RESSTR( STR_ACTION_TOGGLE_GRID_HORZ ), m_xUndoManager ); Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( getModel() )); if( xDiagram.is()) @@ -901,7 +901,7 @@ void ChartController::executeDispatch_ToggleGridHorizontal() void ChartController::executeDispatch_ToggleGridVertical() { Reference< frame::XModel > xModel( getModel() ); - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( SCH_RESSTR( STR_ACTION_TOGGLE_GRID_VERTICAL ), m_xUndoManager ); Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( getModel() )); if( xDiagram.is()) -- cgit