diff options
| author | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-10-06 22:23:08 -0300 |
|---|---|---|
| committer | Muthu Subramanian <sumuthu@suse.com> | 2012-10-08 21:41:25 +0530 |
| commit | d812cee7cb3ac7069d4cfbabc567312a325f6f69 (patch) | |
| tree | 22257449aad8b2143b23e40f45a25caea2a2892d | |
| parent | 1e34ec4c18bad3e2ec1e9e32dd42e5bc0d4d97ac (diff) | |
OUString cleanup in Chart2
Include C2U macro removal and rtl prefix
Change-Id: I3de75446e53618862e50c69382a7ddaf0d482fa7
8 files changed, 220 insertions, 225 deletions
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index ceb5a150f88b..a03796fd42fa 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -129,7 +129,7 @@ Image ChartTypeDialogController::getImage() { return Image(); } -bool ChartTypeDialogController::isSubType( const rtl::OUString& rServiceName ) +bool ChartTypeDialogController::isSubType( const OUString& rServiceName ) { const tTemplateServiceChartTypeParameterMap& rTemplateMap = this->getTemplateMap(); tTemplateServiceChartTypeParameterMap::const_iterator aIt( rTemplateMap.find( rServiceName )); @@ -138,7 +138,7 @@ bool ChartTypeDialogController::isSubType( const rtl::OUString& rServiceName ) return false; } ChartTypeParameter ChartTypeDialogController::getChartTypeParameterForService( - const rtl::OUString& rServiceName + const OUString& rServiceName , const uno::Reference< beans::XPropertySet >& xTemplateProps ) { ChartTypeParameter aRet; @@ -150,9 +150,9 @@ ChartTypeParameter ChartTypeDialogController::getChartTypeParameterForService( { try { - xTemplateProps->getPropertyValue( C2U( "CurveStyle" )) >>= aRet.eCurveStyle; - xTemplateProps->getPropertyValue( C2U( "CurveResolution" )) >>= aRet.nCurveResolution; - xTemplateProps->getPropertyValue( C2U( "SplineOrder" )) >>= aRet.nSplineOrder; + xTemplateProps->getPropertyValue( "CurveStyle" ) >>= aRet.eCurveStyle; + xTemplateProps->getPropertyValue( "CurveResolution" ) >>= aRet.nCurveResolution; + xTemplateProps->getPropertyValue( "SplineOrder" ) >>= aRet.nSplineOrder; } catch( uno::Exception & ex ) { @@ -162,7 +162,7 @@ ChartTypeParameter ChartTypeDialogController::getChartTypeParameterForService( try { - xTemplateProps->getPropertyValue( C2U( "Geometry3D" )) >>= aRet.nGeometry3D; + xTemplateProps->getPropertyValue( "Geometry3D" ) >>= aRet.nGeometry3D; } catch( uno::Exception& ex ) { @@ -243,7 +243,7 @@ void ChartTypeDialogController::adjustParameterToMainType( ChartTypeParameter& r rParameter = ChartTypeParameter(); } } -rtl::OUString ChartTypeDialogController::getServiceNameForParameter( const ChartTypeParameter& rParameter ) const +OUString ChartTypeDialogController::getServiceNameForParameter( const ChartTypeParameter& rParameter ) const { ChartTypeParameter aParameter(rParameter); if( aParameter.bXAxisWithValues ) @@ -268,7 +268,7 @@ rtl::OUString ChartTypeDialogController::getServiceNameForParameter( const Chart return (*aIter).first; } } - return ::rtl::OUString(); + return OUString(); } uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTemplate( const ChartTypeParameter& rParameter @@ -276,7 +276,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla { uno::Reference< XChartTypeTemplate > xTemplate(0); - rtl::OUString aServiceName( this->getServiceNameForParameter( rParameter ) ); + OUString aServiceName( this->getServiceNameForParameter( rParameter ) ); if(!aServiceName.isEmpty()) { xTemplate.set( xTemplateManager->createInstance( aServiceName ), uno::UNO_QUERY ); @@ -287,9 +287,9 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla { try { - xTemplateProps->setPropertyValue( C2U( "CurveStyle" ), uno::makeAny(rParameter.eCurveStyle) ); - xTemplateProps->setPropertyValue( C2U( "CurveResolution" ), uno::makeAny(rParameter.nCurveResolution) ); - xTemplateProps->setPropertyValue( C2U( "SplineOrder" ), uno::makeAny(rParameter.nSplineOrder) ); + xTemplateProps->setPropertyValue( "CurveStyle" , uno::makeAny(rParameter.eCurveStyle) ); + xTemplateProps->setPropertyValue( "CurveResolution" , uno::makeAny(rParameter.nCurveResolution) ); + xTemplateProps->setPropertyValue( "SplineOrder" , uno::makeAny(rParameter.nSplineOrder) ); } catch( uno::Exception & ex ) { @@ -298,7 +298,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla } try { - xTemplateProps->setPropertyValue( C2U( "Geometry3D" ), uno::makeAny(rParameter.nGeometry3D) ); + xTemplateProps->setPropertyValue( "Geometry3D" , uno::makeAny(rParameter.nGeometry3D) ); } catch( uno::Exception & ex ) { @@ -345,7 +345,7 @@ bool ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame { uno::Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY ); if( xDiaProp.is() ) - xDiaProp->setPropertyValue( C2U( "SortByXValues" ), uno::makeAny( rParameter.bSortByXValues ) ); + xDiaProp->setPropertyValue( "SortByXValues" , uno::makeAny( rParameter.bSortByXValues ) ); } } return false; @@ -440,13 +440,13 @@ const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTem { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap - ( C2U( "com.sun.star.chart2.template.Column" ), ChartTypeParameter(1,false,false,GlobalStackMode_NONE) ) - ( C2U( "com.sun.star.chart2.template.StackedColumn" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedColumn" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) ) - ( C2U( "com.sun.star.chart2.template.ThreeDColumnFlat" ), ChartTypeParameter(1,false,true,GlobalStackMode_NONE) ) - ( C2U( "com.sun.star.chart2.template.StackedThreeDColumnFlat" ), ChartTypeParameter(2,false,true,GlobalStackMode_STACK_Y) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDColumnFlat" ), ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) ) - ( C2U( "com.sun.star.chart2.template.ThreeDColumnDeep" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z) ) + ( "com.sun.star.chart2.template.Column" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE) ) + ( "com.sun.star.chart2.template.StackedColumn" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) ) + ( "com.sun.star.chart2.template.PercentStackedColumn" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) ) + ( "com.sun.star.chart2.template.ThreeDColumnFlat" , ChartTypeParameter(1,false,true,GlobalStackMode_NONE) ) + ( "com.sun.star.chart2.template.StackedThreeDColumnFlat" , ChartTypeParameter(2,false,true,GlobalStackMode_STACK_Y) ) + ( "com.sun.star.chart2.template.PercentStackedThreeDColumnFlat" , ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) ) + ( "com.sun.star.chart2.template.ThreeDColumnDeep" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z) ) ; return m_aTemplateMap; } @@ -517,13 +517,13 @@ const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTempla { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap - ( C2U( "com.sun.star.chart2.template.Bar" ), ChartTypeParameter(1,false,false,GlobalStackMode_NONE) ) - ( C2U( "com.sun.star.chart2.template.StackedBar" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedBar" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) ) - ( C2U( "com.sun.star.chart2.template.ThreeDBarFlat" ), ChartTypeParameter(1,false,true,GlobalStackMode_NONE) ) - ( C2U( "com.sun.star.chart2.template.StackedThreeDBarFlat" ), ChartTypeParameter(2,false,true,GlobalStackMode_STACK_Y) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDBarFlat" ), ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) ) - ( C2U( "com.sun.star.chart2.template.ThreeDBarDeep" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z) ) + ( "com.sun.star.chart2.template.Bar" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE) ) + ( "com.sun.star.chart2.template.StackedBar" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) ) + ( "com.sun.star.chart2.template.PercentStackedBar" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) ) + ( "com.sun.star.chart2.template.ThreeDBarFlat" , ChartTypeParameter(1,false,true,GlobalStackMode_NONE) ) + ( "com.sun.star.chart2.template.StackedThreeDBarFlat" , ChartTypeParameter(2,false,true,GlobalStackMode_STACK_Y) ) + ( "com.sun.star.chart2.template.PercentStackedThreeDBarFlat" , ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) ) + ( "com.sun.star.chart2.template.ThreeDBarDeep" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z) ) ; return m_aTemplateMap; } @@ -593,14 +593,14 @@ const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTempla { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap - ( C2U( "com.sun.star.chart2.template.Pie" ), ChartTypeParameter(1,false,false) ) - ( C2U( "com.sun.star.chart2.template.PieAllExploded" ), ChartTypeParameter(2,false,false) ) - ( C2U( "com.sun.star.chart2.template.Donut" ), ChartTypeParameter(3,false,false) ) - ( C2U( "com.sun.star.chart2.template.DonutAllExploded" ), ChartTypeParameter(4,false,false) ) - ( C2U( "com.sun.star.chart2.template.ThreeDPie" ), ChartTypeParameter(1,false,true) ) - ( C2U( "com.sun.star.chart2.template.ThreeDPieAllExploded" ), ChartTypeParameter(2,false,true) ) - ( C2U( "com.sun.star.chart2.template.ThreeDDonut" ), ChartTypeParameter(3,false,true) ) - ( C2U( "com.sun.star.chart2.template.ThreeDDonutAllExploded" ), ChartTypeParameter(4,false,true) ) + ( "com.sun.star.chart2.template.Pie" , ChartTypeParameter(1,false,false) ) + ( "com.sun.star.chart2.template.PieAllExploded" , ChartTypeParameter(2,false,false) ) + ( "com.sun.star.chart2.template.Donut" , ChartTypeParameter(3,false,false) ) + ( "com.sun.star.chart2.template.DonutAllExploded" , ChartTypeParameter(4,false,false) ) + ( "com.sun.star.chart2.template.ThreeDPie" , ChartTypeParameter(1,false,true) ) + ( "com.sun.star.chart2.template.ThreeDPieAllExploded" , ChartTypeParameter(2,false,true) ) + ( "com.sun.star.chart2.template.ThreeDDonut" , ChartTypeParameter(3,false,true) ) + ( "com.sun.star.chart2.template.ThreeDDonutAllExploded" , ChartTypeParameter(4,false,true) ) ; return m_aTemplateMap; } @@ -657,19 +657,19 @@ const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTempl static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap //------------------------------------------------------- - ( C2U( "com.sun.star.chart2.template.Symbol" ), ChartTypeParameter(1,false,false,GlobalStackMode_NONE,true,false) ) - ( C2U( "com.sun.star.chart2.template.StackedSymbol" ), ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y,true,false) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedSymbol" ), ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y_PERCENT,true,false) ) - ( C2U( "com.sun.star.chart2.template.LineSymbol" ), ChartTypeParameter(2,false,false,GlobalStackMode_NONE,true,true) ) - ( C2U( "com.sun.star.chart2.template.StackedLineSymbol" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y,true,true) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedLineSymbol" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y_PERCENT,true,true) ) - ( C2U( "com.sun.star.chart2.template.Line" ), ChartTypeParameter(3,false,false,GlobalStackMode_NONE,false,true) ) - ( C2U( "com.sun.star.chart2.template.StackedLine" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y,false,true) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedLine" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT,false,true) ) + ( "com.sun.star.chart2.template.Symbol" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE,true,false) ) + ( "com.sun.star.chart2.template.StackedSymbol" , ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y,true,false) ) + ( "com.sun.star.chart2.template.PercentStackedSymbol" , ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y_PERCENT,true,false) ) + ( "com.sun.star.chart2.template.LineSymbol" , ChartTypeParameter(2,false,false,GlobalStackMode_NONE,true,true) ) + ( "com.sun.star.chart2.template.StackedLineSymbol" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y,true,true) ) + ( "com.sun.star.chart2.template.PercentStackedLineSymbol" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y_PERCENT,true,true) ) + ( "com.sun.star.chart2.template.Line" , ChartTypeParameter(3,false,false,GlobalStackMode_NONE,false,true) ) + ( "com.sun.star.chart2.template.StackedLine" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y,false,true) ) + ( "com.sun.star.chart2.template.PercentStackedLine" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT,false,true) ) //------------------------------------------------------- - ( C2U( "com.sun.star.chart2.template.StackedThreeDLine" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y,false,true) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDLine" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y_PERCENT,false,true) ) - ( C2U( "com.sun.star.chart2.template.ThreeDLineDeep" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z,false,true) ) + ( "com.sun.star.chart2.template.StackedThreeDLine" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y,false,true) ) + ( "com.sun.star.chart2.template.PercentStackedThreeDLine" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y_PERCENT,false,true) ) + ( "com.sun.star.chart2.template.ThreeDLineDeep" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z,false,true) ) //------------------------------------------------------- ; return m_aTemplateMap; @@ -789,10 +789,10 @@ const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplat static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap //------------------------------------------------------- - ( C2U( "com.sun.star.chart2.template.ScatterSymbol" ), ChartTypeParameter(1,true,false,GlobalStackMode_NONE,true,false) ) - ( C2U( "com.sun.star.chart2.template.ScatterLineSymbol" ), ChartTypeParameter(2,true,false,GlobalStackMode_NONE,true,true) ) - ( C2U( "com.sun.star.chart2.template.ScatterLine" ), ChartTypeParameter(3,true,false,GlobalStackMode_NONE,false,true) ) - ( C2U( "com.sun.star.chart2.template.ThreeDScatter" ), ChartTypeParameter(4,true,true,GlobalStackMode_NONE,false,true) ) + ( "com.sun.star.chart2.template.ScatterSymbol" , ChartTypeParameter(1,true,false,GlobalStackMode_NONE,true,false) ) + ( "com.sun.star.chart2.template.ScatterLineSymbol" , ChartTypeParameter(2,true,false,GlobalStackMode_NONE,true,true) ) + ( "com.sun.star.chart2.template.ScatterLine" , ChartTypeParameter(3,true,false,GlobalStackMode_NONE,false,true) ) + ( "com.sun.star.chart2.template.ThreeDScatter" , ChartTypeParameter(4,true,true,GlobalStackMode_NONE,false,true) ) ; return m_aTemplateMap; } @@ -879,12 +879,12 @@ const tTemplateServiceChartTypeParameterMap& AreaChartDialogController::getTempl { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap - ( C2U( "com.sun.star.chart2.template.Area" ), ChartTypeParameter(1,false,false,GlobalStackMode_NONE) ) - ( C2U( "com.sun.star.chart2.template.ThreeDArea" ), ChartTypeParameter(1,false,true,GlobalStackMode_STACK_Z) ) - ( C2U( "com.sun.star.chart2.template.StackedArea" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) ) - ( C2U( "com.sun.star.chart2.template.StackedThreeDArea" ), ChartTypeParameter(2,false,true,GlobalStackMode_STACK_Y) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedArea" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDArea" ), ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) ) + ( "com.sun.star.chart2.template.Area" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE) ) + ( "com.sun.star.chart2.template.ThreeDArea" , ChartTypeParameter(1,false,true,GlobalStackMode_STACK_Z) ) + ( "com.sun.star.chart2.template.StackedArea" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) ) + ( "com.sun.star.chart2.template.StackedThreeDArea" , ChartTypeParameter(2,false,true,GlobalStackMode_STACK_Y) ) + ( "com.sun.star.chart2.template.PercentStackedArea" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) ) + ( "com.sun.star.chart2.template.PercentStackedThreeDArea" , ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) ) ; return m_aTemplateMap; } @@ -963,21 +963,21 @@ const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTempla static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap //@todo need templates with symbols only - ( C2U( "com.sun.star.chart2.template.NetSymbol" ), ChartTypeParameter(1,false,false,GlobalStackMode_NONE,true,false) ) - ( C2U( "com.sun.star.chart2.template.StackedNetSymbol" ), ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y,true,false) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedNetSymbol" ),ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y_PERCENT,true,false) ) + ( "com.sun.star.chart2.template.NetSymbol" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE,true,false) ) + ( "com.sun.star.chart2.template.StackedNetSymbol" , ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y,true,false) ) + ( "com.sun.star.chart2.template.PercentStackedNetSymbol" ,ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y_PERCENT,true,false) ) - ( C2U( "com.sun.star.chart2.template.Net" ), ChartTypeParameter(2,false,false,GlobalStackMode_NONE,true,true) ) - ( C2U( "com.sun.star.chart2.template.StackedNet" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y,true,true) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedNet" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y_PERCENT,true,true) ) + ( "com.sun.star.chart2.template.Net" , ChartTypeParameter(2,false,false,GlobalStackMode_NONE,true,true) ) + ( "com.sun.star.chart2.template.StackedNet" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y,true,true) ) + ( "com.sun.star.chart2.template.PercentStackedNet" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y_PERCENT,true,true) ) - ( C2U( "com.sun.star.chart2.template.NetLine" ), ChartTypeParameter(3,false,false,GlobalStackMode_NONE,false,true) ) - ( C2U( "com.sun.star.chart2.template.StackedNetLine" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y,false,true) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedNetLine" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT,false,true) ) + ( "com.sun.star.chart2.template.NetLine" , ChartTypeParameter(3,false,false,GlobalStackMode_NONE,false,true) ) + ( "com.sun.star.chart2.template.StackedNetLine" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y,false,true) ) + ( "com.sun.star.chart2.template.PercentStackedNetLine" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT,false,true) ) - ( C2U( "com.sun.star.chart2.template.FilledNet" ), ChartTypeParameter(4,false,false,GlobalStackMode_NONE,false,false) ) - ( C2U( "com.sun.star.chart2.template.StackedFilledNet" ), ChartTypeParameter(4,false,false,GlobalStackMode_STACK_Y,false,false) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedFilledNet" ),ChartTypeParameter(4,false,false,GlobalStackMode_STACK_Y_PERCENT,false,false) ) + ( "com.sun.star.chart2.template.FilledNet" , ChartTypeParameter(4,false,false,GlobalStackMode_NONE,false,false) ) + ( "com.sun.star.chart2.template.StackedFilledNet" , ChartTypeParameter(4,false,false,GlobalStackMode_STACK_Y,false,false) ) + ( "com.sun.star.chart2.template.PercentStackedFilledNet" ,ChartTypeParameter(4,false,false,GlobalStackMode_STACK_Y_PERCENT,false,false) ) ; return m_aTemplateMap; } @@ -1054,10 +1054,10 @@ const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemp { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap - ( C2U( "com.sun.star.chart2.template.StockLowHighClose" ), ChartTypeParameter(1) ) - ( C2U( "com.sun.star.chart2.template.StockOpenLowHighClose" ), ChartTypeParameter(2) ) - ( C2U( "com.sun.star.chart2.template.StockVolumeLowHighClose" ), ChartTypeParameter(3) ) - ( C2U( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" ),ChartTypeParameter(4) ) + ( "com.sun.star.chart2.template.StockLowHighClose" , ChartTypeParameter(1) ) + ( "com.sun.star.chart2.template.StockOpenLowHighClose" , ChartTypeParameter(2) ) + ( "com.sun.star.chart2.template.StockVolumeLowHighClose" , ChartTypeParameter(3) ) + ( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" ,ChartTypeParameter(4) ) ; return m_aTemplateMap; } @@ -1109,8 +1109,8 @@ const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogControlle { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap - ( C2U( "com.sun.star.chart2.template.ColumnWithLine" ), ChartTypeParameter(1) ) - ( C2U( "com.sun.star.chart2.template.StackedColumnWithLine" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) ) + ( "com.sun.star.chart2.template.ColumnWithLine" , ChartTypeParameter(1) ) + ( "com.sun.star.chart2.template.StackedColumnWithLine" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) ) ; return m_aTemplateMap; } @@ -1185,7 +1185,7 @@ void CombiColumnLineChartDialogController::fillExtraControls( const ChartTypePar if(xTemplateProps.is()) try { - xTemplateProps->getPropertyValue( C2U("NumberOfLines") ) >>= nNumLines; + xTemplateProps->getPropertyValue( "NumberOfLines" ) >>= nNumLines; } catch( const uno::Exception & ex ) { @@ -1206,7 +1206,7 @@ void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Ref if( xTemplateProps.is() ) { sal_Int32 nNumLines = static_cast< sal_Int32 >( m_pMF_NumberOfLines->GetValue()); - xTemplateProps->setPropertyValue( C2U( "NumberOfLines" ), uno::makeAny(nNumLines) ); + xTemplateProps->setPropertyValue( "NumberOfLines" , uno::makeAny(nNumLines) ); } } @@ -1251,7 +1251,7 @@ const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTem { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap - ( C2U( "com.sun.star.chart2.template.Bubble" ), ChartTypeParameter(1,true) ) ; + ( "com.sun.star.chart2.template.Bubble" , ChartTypeParameter(1,true) ) ; return m_aTemplateMap; } void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 2c9caa8c50dd..26eab789b849 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -75,7 +75,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; using namespace ::svt; @@ -580,7 +579,7 @@ void DataBrowser::RenewTable() GetDataWindow().LogicToPixel( Size( 42, 0 )).getWidth() )); OUString aDefaultSeriesName(SCH_RESSTR(STR_COLUMN_LABEL)); - replaceParamterInString( aDefaultSeriesName, C2U("%COLUMNNUMBER"), OUString::valueOf( sal_Int32(24) ) ); + replaceParamterInString( aDefaultSeriesName, "%COLUMNNUMBER", OUString::valueOf( sal_Int32(24) ) ); sal_Int32 nColumnWidth = GetDataWindow().GetTextWidth( aDefaultSeriesName ) + GetDataWindow().LogicToPixel( Point( 4 + impl::SeriesHeader::GetRelativeAppFontXPosForNameField(), 0 ), MAP_APPFONT ).X(); sal_Int32 nColumnCount = m_apDataBrowserModel->getColumnCount(); @@ -613,7 +612,7 @@ void DataBrowser::RenewTable() sal_Int32 nColor = 0; // @todo: Set "DraftColor", i.e. interpolated colors for gradients, bitmaps, etc. if( xSeriesProp.is() && - ( xSeriesProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Color"))) >>= nColor )) + ( xSeriesProp->getPropertyValue( "Color" ) >>= nColor )) spHeader->SetColor( Color( nColor )); spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis ); spHeader->SetSeriesName( @@ -621,7 +620,7 @@ void DataBrowser::RenewTable() aIt->m_xDataSeries, (aIt->m_xChartType.is() ? aIt->m_xChartType->getRoleOfSequenceForSeriesLabel() : - OUString( RTL_CONSTASCII_USTRINGPARAM("values-y")))))); + OUString("values-y"))))); // index is 1-based, as 0 is for the column that contains the row-numbers spHeader->SetRange( aIt->m_nStartColumn + 1, aIt->m_nEndColumn + 1 ); spHeader->SetGetFocusHdl( aFocusLink ); @@ -646,7 +645,7 @@ String DataBrowser::GetColString( sal_Int32 nColumnId ) const String DataBrowser::GetRowString( sal_Int32 nRow ) const { - return rtl::OUString::valueOf(nRow + 1); + return OUString::valueOf(nRow + 1); } String DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const @@ -1119,7 +1118,7 @@ sal_uInt32 DataBrowser::GetNumberFormatKey( sal_Int32 nRow, sal_uInt16 nCol ) co return m_apDataBrowserModel->getNumberFormatKey( lcl_getColumnInData( nCol ), lcl_getRowInData( nRow )); } -bool DataBrowser::isDateString( rtl::OUString aInputString, double& fOutDateValue ) +bool DataBrowser::isDateString( OUString aInputString, double& fOutDateValue ) { sal_uInt32 nNumberFormat=0; SvNumberFormatter* pSvNumberFormatter = m_spNumberFormatterWrapper.get() ? m_spNumberFormatterWrapper->getSvNumberFormatter() : 0; @@ -1259,7 +1258,7 @@ void DataBrowser::RenewSeriesHeaders() Reference< beans::XPropertySet > xSeriesProp( aIt->m_xDataSeries, uno::UNO_QUERY ); sal_Int32 nColor = 0; if( xSeriesProp.is() && - ( xSeriesProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Color"))) >>= nColor )) + ( xSeriesProp->getPropertyValue( "Color" ) >>= nColor )) spHeader->SetColor( Color( nColor )); spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis ); spHeader->SetSeriesName( @@ -1267,7 +1266,7 @@ void DataBrowser::RenewSeriesHeaders() aIt->m_xDataSeries, (aIt->m_xChartType.is() ? aIt->m_xChartType->getRoleOfSequenceForSeriesLabel() : - OUString( RTL_CONSTASCII_USTRINGPARAM("values-y")))))); + OUString( "values-y"))))); spHeader->SetRange( aIt->m_nStartColumn + 1, aIt->m_nEndColumn + 1 ); spHeader->SetGetFocusHdl( aFocusLink ); spHeader->SetEditChangedHdl( aSeriesHeaderChangedLink ); diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx index 89f5aac9d349..e28259c5a007 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.cxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx @@ -57,7 +57,7 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; + namespace { @@ -70,7 +70,7 @@ OUString lcl_getRole( { try { - xProp->getPropertyValue( C2U("Role")) >>= aResult; + xProp->getPropertyValue( "Role" ) >>= aResult; } catch( const uno::Exception & ex ) { @@ -235,8 +235,8 @@ struct DataBrowserModel::tDataColumn { ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > m_xDataSeries; - sal_Int32 m_nIndexInDataSeries; - ::rtl::OUString m_aUIRoleName; + sal_Int32 m_nIndexInDataSeries; + OUString m_aUIRoleName; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > m_xLabeledDataSequence; eCellType m_eCellType; @@ -249,7 +249,7 @@ struct DataBrowserModel::tDataColumn const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xDataSeries, sal_Int32 nIndexInDataSeries, - ::rtl::OUString aUIRoleName, + OUString aUIRoleName, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > xLabeledDataSequence, eCellType aCellType, @@ -336,7 +336,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex ) Reference< beans::XPropertySet > xSeriesProps( xSeries, uno::UNO_QUERY ); if( xSeriesProps.is() ) - xSeriesProps->getPropertyValue( C2U( "NumberFormat" )) >>= nSeriesNumberFormat; + xSeriesProps->getPropertyValue( "NumberFormat" ) >>= nSeriesNumberFormat; } else { @@ -394,7 +394,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex ) // labels Reference< chart2::data::XDataSequence > xNewLabelSeq( xDataProvider->createDataSequenceByRangeRepresentation( - OUString( RTL_CONSTASCII_USTRINGPARAM( "label " )) + + "label " + OUString::valueOf( nIndex ))); lcl_copyDataSequenceProperties( aLSequences[nSeqIdx]->getLabel(), xNewLabelSeq ); @@ -409,7 +409,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex ) //give the new series the same number format as the former series especially for bubble charts thus the bubble size values can be edited with same format immidiately Reference< beans::XPropertySet > xNewSeriesProps( xNewSeries, uno::UNO_QUERY ); if( xNewSeriesProps.is() ) - xNewSeriesProps->setPropertyValue( C2U( "NumberFormat" ), uno::makeAny( nSeriesNumberFormat ) ); + xNewSeriesProps->setPropertyValue( "NumberFormat" , uno::makeAny( nSeriesNumberFormat ) ); } updateFromModel(); @@ -704,7 +704,7 @@ bool DataBrowserModel::setCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow, dou setCellAny( nAtColumn, nAtRow, uno::makeAny( fValue )); } -bool DataBrowserModel::setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::rtl::OUString & rText ) +bool DataBrowserModel::setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const OUString & rText ) { return (getCellType( nAtColumn, nAtRow ) == TEXT) && setCellAny( nAtColumn, nAtRow, uno::makeAny( rText )); @@ -831,7 +831,7 @@ void DataBrowserModel::updateFromModel() Reference< chart2::XDataSeriesContainer > xSeriesCnt( aChartTypes[nCTIdx], uno::UNO_QUERY ); if( xSeriesCnt.is()) { - rtl::OUString aRoleForDataLabelNumberFormat = ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( aChartTypes[nCTIdx] ); + OUString aRoleForDataLabelNumberFormat = ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( aChartTypes[nCTIdx] ); Sequence< Reference< chart2::XDataSeries > > aSeries( xSeriesCnt->getDataSeries()); lcl_tSharedSeqVec aSharedSequences( lcl_getSharedSequences( aSeries )); @@ -877,7 +877,7 @@ void DataBrowserModel::updateFromModel() nSequenceNumberFormatKey = ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel( Reference< beans::XPropertySet >( xSeries, uno::UNO_QUERY ), xSeries, -1, xDiagram ); } - else if( aRole.equals( C2U( "values-x" ) ) ) + else if( aRole.equals( "values-x" ) ) nSequenceNumberFormatKey = nXAxisNumberFormat; if( ::std::find_if( aSharedSequences.begin(), aSharedSequences.end(), @@ -900,7 +900,7 @@ void DataBrowserModel::updateFromModel() try { Reference< beans::XPropertySet > xProp( aCooSysSeq[nCooSysIdx], uno::UNO_QUERY ); - xProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("SwapXAndYAxis"))) >>= bSwapXAndYAxis; + xProp->getPropertyValue( "SwapXAndYAxis" ) >>= bSwapXAndYAxis; } catch( const beans::UnknownPropertyException & ex ) { diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index 601c19b208e0..161e3440b0ce 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -56,13 +56,12 @@ using namespace ::chart::ContainerHelper; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; // ---------------------------------------- namespace { -const OUString lcl_aLabelRole( RTL_CONSTASCII_USTRINGPARAM( "label" )); +const OUString lcl_aLabelRole( "label" ); struct lcl_ChartTypeToSeriesCnt : ::std::unary_function< Reference< XChartType >, Reference< XDataSeriesContainer > > @@ -83,21 +82,21 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI ) if( aTranslationMap.empty() ) { - aTranslationMap[ C2U( "categories" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_CATEGORIES ))); - aTranslationMap[ C2U( "error-bars-x" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR ))); - aTranslationMap[ C2U( "error-bars-x-positive" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR_POSITIVE ))); - aTranslationMap[ C2U( "error-bars-x-negative" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR_NEGATIVE ))); - aTranslationMap[ C2U( "error-bars-y" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR ))); - aTranslationMap[ C2U( "error-bars-y-positive" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_POSITIVE ))); - aTranslationMap[ C2U( "error-bars-y-negative" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_NEGATIVE ))); - aTranslationMap[ C2U( "label" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_LABEL ))); - aTranslationMap[ C2U( "values-first" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_FIRST ))); - aTranslationMap[ C2U( "values-last" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_LAST ))); - aTranslationMap[ C2U( "values-max" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_MAX ))); - aTranslationMap[ C2U( "values-min" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_MIN ))); - aTranslationMap[ C2U( "values-x" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X ))); - aTranslationMap[ C2U( "values-y" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y ))); - aTranslationMap[ C2U( "values-size" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_SIZE ))); + aTranslationMap[ "categories" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_CATEGORIES ))); + aTranslationMap[ "error-bars-x" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR ))); + aTranslationMap[ "error-bars-x-positive" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR_POSITIVE ))); + aTranslationMap[ "error-bars-x-negative" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR_NEGATIVE ))); + aTranslationMap[ "error-bars-y" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR ))); + aTranslationMap[ "error-bars-y-positive" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_POSITIVE ))); + aTranslationMap[ "error-bars-y-negative" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_NEGATIVE ))); + aTranslationMap[ "label" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_LABEL ))); + aTranslationMap[ "values-first" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_FIRST ))); + aTranslationMap[ "values-last" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_LAST ))); + aTranslationMap[ "values-max" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_MAX ))); + aTranslationMap[ "values-min" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_MIN ))); + aTranslationMap[ "values-x" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X ))); + aTranslationMap[ "values-y" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y ))); + aTranslationMap[ "values-size" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_SIZE ))); } if( bFromInternalToUI ) @@ -124,28 +123,28 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI ) return aResult; } -typedef ::std::map< ::rtl::OUString, sal_Int32 > lcl_tRoleIndexMap; +typedef ::std::map< OUString, sal_Int32 > lcl_tRoleIndexMap; void lcl_createRoleIndexMap( lcl_tRoleIndexMap & rOutMap ) { rOutMap.clear(); sal_Int32 nIndex = 0; - rOutMap[ C2U( "label" ) ] = ++nIndex; - rOutMap[ C2U( "categories" ) ] = ++nIndex; - rOutMap[ C2U( "values-x" ) ] = ++nIndex; - rOutMap[ C2U( "values-y" ) ] = ++nIndex; - rOutMap[ C2U( "error-bars-x" ) ] = ++nIndex; - rOutMap[ C2U( "error-bars-x-positive" ) ] = ++nIndex; - rOutMap[ C2U( "error-bars-x-negative" ) ] = ++nIndex; - rOutMap[ C2U( "error-bars-y" ) ] = ++nIndex; - rOutMap[ C2U( "error-bars-y-positive" ) ] = ++nIndex; - rOutMap[ C2U( "error-bars-y-negative" ) ] = ++nIndex; - rOutMap[ C2U( "values-first" ) ] = ++nIndex; - rOutMap[ C2U( "values-min" ) ] = ++nIndex; - rOutMap[ C2U( "values-max" ) ] = ++nIndex; - rOutMap[ C2U( "values-last" ) ] = ++nIndex; - rOutMap[ C2U( "values-size" ) ] = ++nIndex; + rOutMap[ "label" ] = ++nIndex; + rOutMap[ "categories" ] = ++nIndex; + rOutMap[ "values-x" ] = ++nIndex; + rOutMap[ "values-y" ] = ++nIndex; + rOutMap[ "error-bars-x" ] = ++nIndex; + rOutMap[ "error-bars-x-positive" ] = ++nIndex; + rOutMap[ "error-bars-x-negative" ] = ++nIndex; + rOutMap[ "error-bars-y" ] = ++nIndex; + rOutMap[ "error-bars-y-positive" ] = ++nIndex; + rOutMap[ "error-bars-y-negative" ] = ++nIndex; + rOutMap[ "values-first" ] = ++nIndex; + rOutMap[ "values-min" ] = ++nIndex; + rOutMap[ "values-max" ] = ++nIndex; + rOutMap[ "values-last" ] = ++nIndex; + rOutMap[ "values-size" ] = ++nIndex; } struct lcl_DataSeriesContainerAppend : public @@ -164,7 +163,7 @@ struct lcl_DataSeriesContainerAppend : public if( xVal.is()) { Sequence< Reference< XDataSeries > > aSeq( xVal->getDataSeries()); - OUString aRole( RTL_CONSTASCII_USTRINGPARAM("values-y")); + OUString aRole( "values-y" ); Reference< XChartType > xCT( xVal, uno::UNO_QUERY ); if( xCT.is()) aRole = xCT->getRoleOfSequenceForSeriesLabel(); @@ -199,7 +198,7 @@ struct lcl_RolesWithRangeAppend : public typedef ::chart::DialogModel::tRolesWithRanges tContainerType; explicit lcl_RolesWithRangeAppend( tContainerType & rCnt, - const ::rtl::OUString & aLabelRole ) + const OUString & aLabelRole ) : m_rDestCnt( rCnt ), m_aRoleForLabelSeq( aLabelRole ) {} @@ -216,7 +215,7 @@ struct lcl_RolesWithRangeAppend : public { OUString aRole; Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW ); - if( xProp->getPropertyValue( C2U("Role")) >>= aRole ) + if( xProp->getPropertyValue( "Role") >>= aRole ) { m_rDestCnt.insert( tContainerType::value_type( @@ -259,7 +258,7 @@ void lcl_SetSequenceRole( { Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY ); if( xProp.is()) - xProp->setPropertyValue( C2U("Role"), uno::makeAny( rRole )); + xProp->setPropertyValue( "Role" , uno::makeAny( rRole )); } Reference< XDataSeries > lcl_CreateNewSeries( @@ -274,7 +273,7 @@ Reference< XDataSeries > lcl_CreateNewSeries( // create plain series Reference< XDataSeries > xResult( xContext->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.chart2.DataSeries" ), + "com.sun.star.chart2.DataSeries" , xContext ), uno::UNO_QUERY ); if( xTemplate.is()) { @@ -285,8 +284,7 @@ Reference< XDataSeries > lcl_CreateNewSeries( // without setting it as hard attribute Reference< XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme()); if( xColorScheme.is()) - xResultProp->setPropertyValue( - C2U("Color"), uno::makeAny( xColorScheme->getColorByIndex( nNewSeriesIndex ))); + xResultProp->setPropertyValue( "Color" , uno::makeAny( xColorScheme->getColorByIndex( nNewSeriesIndex ))); } sal_Int32 nGroupIndex=0; if( xChartType.is()) @@ -458,7 +456,7 @@ Reference< data::XDataProvider > DialogModel::getDataProvider() const DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges( const Reference< XDataSeries > & xSeries, - const ::rtl::OUString & aRoleOfSequenceForLabel, + const OUString & aRoleOfSequenceForLabel, const Reference< chart2::XChartType > & xChartType ) const { DialogModel::tRolesWithRanges aResult; @@ -726,7 +724,7 @@ OUString DialogModel::GetRoleDataLabel() return OUString( String( ::chart::SchResId( STR_OBJECT_DATALABELS ))); } -sal_Int32 DialogModel::GetRoleIndexForSorting( const ::rtl::OUString & rInternalRoleString ) +sal_Int32 DialogModel::GetRoleIndexForSorting( const OUString & rInternalRoleString ) { static lcl_tRoleIndexMap aRoleIndexMap; @@ -778,8 +776,8 @@ void DialogModel::applyInterpretedData( // without setting it as hard attribute Reference< XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme()); if( xColorScheme.is()) - xSeriesProp->setPropertyValue( - C2U("Color"), uno::makeAny( xColorScheme->getColorByIndex( nSeriesCounter ))); + xSeriesProp->setPropertyValue( "Color" , + uno::makeAny( xColorScheme->getColorByIndex( nSeriesCounter ))); } m_xTemplate->applyStyle( aSeries[nSeries], nGroup, nNewSeriesIndex++, nSeriesInGroup ); } diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 78def1fdd769..6ef7bd9684d3 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -47,12 +47,11 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -using rtl::OUString; namespace { -OUString lcl_getDataSeriesName( const rtl::OUString& rObjectCID, const Reference< frame::XModel >& xChartModel ) +OUString lcl_getDataSeriesName( const OUString& rObjectCID, const Reference< frame::XModel >& xChartModel ) { OUString aRet; @@ -71,10 +70,10 @@ OUString lcl_getDataSeriesName( const rtl::OUString& rObjectCID, const Reference return aRet; } -OUString lcl_getFullSeriesName( const rtl::OUString& rObjectCID, const Reference< frame::XModel >& xChartModel ) +OUString lcl_getFullSeriesName( const OUString& rObjectCID, const Reference< frame::XModel >& xChartModel ) { OUString aRet = String(SchResId(STR_TIP_DATASERIES)); - OUString aWildcard( C2U("%SERIESNAME") ); + OUString aWildcard( "%SERIESNAME" ); sal_Int32 nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), lcl_getDataSeriesName( rObjectCID, xChartModel ) ); @@ -103,7 +102,7 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal Sequence< Reference< data::XLabeledDataSequence > > aDataSequences( xDataSource->getDataSequences() ); - rtl::OUString aX, aY, aY_Min, aY_Max, aY_First, aY_Last, a_Size; + OUString aX, aY, aY_Min, aY_Max, aY_First, aY_Last, a_Size; double fValue = 0; uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( xChartModel, uno::UNO_QUERY ); @@ -124,47 +123,47 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal { try { - uno::Any aARole = xProp->getPropertyValue( C2U( "Role" ) ); - rtl::OUString aRole; + uno::Any aARole = xProp->getPropertyValue( "Role" ); + OUString aRole; aARole >>= aRole; - if( aRole.equals(C2U("values-x")) ) + if( aRole == "values-x" ) { aData[nPointIndex]>>= fValue; sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex ); aX = aNumberFormatterWrapper.getFormattedString( nNumberFormatKey, fValue, nLabelColor, bColorChanged ); } - else if( aRole.equals(C2U("values-y")) ) + else if( aRole == "values-y") { aData[nPointIndex]>>= fValue; sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex ); aY = aNumberFormatterWrapper.getFormattedString( nNumberFormatKey, fValue, nLabelColor, bColorChanged ); } - else if( aRole.equals(C2U("values-first")) ) + else if( aRole == "values-first" ) { aData[nPointIndex]>>= fValue; sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex ); aY_First = aNumberFormatterWrapper.getFormattedString( nNumberFormatKey, fValue, nLabelColor, bColorChanged ); } - else if( aRole.equals(C2U("values-min")) ) + else if( aRole == "values-min" ) { aData[nPointIndex]>>= fValue; sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex ); aY_Min = aNumberFormatterWrapper.getFormattedString( nNumberFormatKey, fValue, nLabelColor, bColorChanged ); } - else if( aRole.equals(C2U("values-max")) ) + else if( aRole == "values-max" ) { aData[nPointIndex]>>= fValue; sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex ); aY_Max = aNumberFormatterWrapper.getFormattedString( nNumberFormatKey, fValue, nLabelColor, bColorChanged ); } - else if( aRole.equals(C2U("values-last")) ) + else if( aRole == "values-last" ) { aData[nPointIndex]>>= fValue; sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex ); aY_Last = aNumberFormatterWrapper.getFormattedString( nNumberFormatKey, fValue, nLabelColor, bColorChanged ); } - else if( aRole.equals(C2U("values-size")) ) + else if( aRole == "values-size" ) { aData[nPointIndex]>>= fValue; sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex ); @@ -187,7 +186,7 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal aRet = aX; } - OUString aSeparator(C2U(" ")); + OUString aSeparator( " " ); lcl_addText( aRet, aSeparator, aY ); lcl_addText( aRet, aSeparator, aY_First ); @@ -201,9 +200,9 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal } //end anonymous namespace -rtl::OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural ) +OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural ) { - rtl::OUString aRet; + OUString aRet; switch( eObjectType ) { case OBJECTTYPE_PAGE: @@ -311,10 +310,10 @@ rtl::OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural return aRet; } -rtl::OUString ObjectNameProvider::getAxisName( const rtl::OUString& rObjectCID +OUString ObjectNameProvider::getAxisName( const OUString& rObjectCID , const uno::Reference< frame::XModel >& xChartModel ) { - rtl::OUString aRet; + OUString aRet; @@ -408,10 +407,10 @@ OUString ObjectNameProvider::getTitleName( const OUString& rObjectCID return aRet; } -rtl::OUString ObjectNameProvider::getGridName( const rtl::OUString& rObjectCID +OUString ObjectNameProvider::getGridName( const OUString& rObjectCID , const uno::Reference< frame::XModel >& xChartModel ) { - rtl::OUString aRet; + OUString aRet; sal_Int32 nCooSysIndex = -1; @@ -462,14 +461,14 @@ rtl::OUString ObjectNameProvider::getGridName( const rtl::OUString& rObjectCID return aRet; } -rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, const Reference< chart2::XChartDocument >& xChartDocument, bool bVerbose ) +OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Reference< chart2::XChartDocument >& xChartDocument, bool bVerbose ) { return getHelpText( rObjectCID, Reference< frame::XModel >( xChartDocument, uno::UNO_QUERY ), bVerbose ); } -rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, const Reference< frame::XModel >& xChartModel, bool bVerbose ) +OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Reference< frame::XModel >& xChartModel, bool bVerbose ) { - rtl::OUString aRet; + OUString aRet; ObjectType eObjectType( ObjectIdentifier::getObjectType(rObjectCID) ); if( OBJECTTYPE_AXIS == eObjectType ) { @@ -492,7 +491,7 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, { if( bVerbose ) { - OUString aNewLine(C2U("\n")); + OUString aNewLine( "\n" ); aRet=String(SchResId(STR_TIP_DATAPOINT_INDEX)); aRet+=aNewLine; @@ -511,7 +510,7 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, //replace data point index sal_Int32 nIndex = -1; - OUString aWildcard( C2U("%POINTNUMBER") ); + OUString aWildcard( "%POINTNUMBER" ); nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) { @@ -519,7 +518,7 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, } //replace data series index - aWildcard = C2U("%SERIESNUMBER"); + aWildcard = "%SERIESNUMBER"; nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) { @@ -539,14 +538,14 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, } //replace point values - aWildcard = C2U("%POINTVALUES"); + aWildcard = "%POINTVALUES"; nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), lcl_getDataPointValueText( xSeries,nPointIndex, DataSeriesHelper::getCoordinateSystemOfSeries(xSeries, xDiagram), xChartModel ) ); //replace series name - aWildcard = C2U("%SERIESNAME"); + aWildcard = "%SERIESNAME"; nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), lcl_getDataSeriesName( rObjectCID, xChartModel ) ); @@ -571,13 +570,13 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, // replace formula sal_Int32 nIndex = -1; - OUString aWildcard( C2U("%FORMULA") ); + OUString aWildcard( "%FORMULA" ); nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), xCalculator->getRepresentation()); // replace r^2 - aWildcard = C2U("%RSQUARED"); + aWildcard = "%RSQUARED"; nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) { @@ -622,7 +621,7 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, sal_Unicode aDecimalSep( '.' ); sal_Int32 nIndex = -1; - OUString aWildcard( C2U("%AVERAGE_VALUE") ); + OUString aWildcard( "%AVERAGE_VALUE" ); nIndex = aRet.indexOf( aWildcard ); // as the curve is constant, the value at any x-value is ok if( nIndex != -1 ) @@ -635,7 +634,7 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, } // replace standard deviation - aWildcard = C2U("%STD_DEVIATION"); + aWildcard = "%STD_DEVIATION"; nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) { @@ -666,9 +665,9 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, return aRet; } -rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ) +OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ) { - rtl::OUString aRet; + OUString aRet; ObjectType eObjectType( ObjectIdentifier::getObjectType(rObjectCID) ); Reference< frame::XModel > xChartModel( xChartDocument, uno::UNO_QUERY ); @@ -683,7 +682,7 @@ rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & r sal_Int32 nPointIndex( ObjectIdentifier::getParticleID(rObjectCID).toInt32() ); // replace data point index - replaceParamterInString( aRet, C2U("%POINTNUMBER"), OUString::valueOf( nPointIndex + 1 )); + replaceParamterInString( aRet, "%POINTNUMBER", OUString::valueOf( nPointIndex + 1 )); // replace data series index { @@ -695,11 +694,11 @@ rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & r if( aSeriesVector[nSeriesIndex] == xSeries ) break; } - replaceParamterInString( aRet, C2U("%SERIESNUMBER"), OUString::valueOf( nSeriesIndex + 1 ) ); + replaceParamterInString( aRet, "%SERIESNUMBER", OUString::valueOf( nSeriesIndex + 1 ) ); } // replace point value - replaceParamterInString( aRet, C2U("%POINTVALUES"), lcl_getDataPointValueText( + replaceParamterInString( aRet, "%POINTVALUES", lcl_getDataPointValueText( xSeries, nPointIndex, DataSeriesHelper::getCoordinateSystemOfSeries(xSeries, xDiagram), xChartModel ) ); } } @@ -711,7 +710,7 @@ rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & r if( !aHelpText.isEmpty()) { aRet = String( SchResId( STR_STATUS_OBJECT_MARKED )); - replaceParamterInString( aRet, C2U("%OBJECTNAME"), aHelpText ); + replaceParamterInString( aRet, "%OBJECTNAME", aHelpText ); } } @@ -719,8 +718,8 @@ rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & r } -rtl::OUString ObjectNameProvider::getNameForCID( - const rtl::OUString& rObjectCID, +OUString ObjectNameProvider::getNameForCID( + const OUString& rObjectCID, const uno::Reference< chart2::XChartDocument >& xChartDocument ) { ObjectType eType( ObjectIdentifier::getObjectType( rObjectCID )); @@ -747,18 +746,18 @@ rtl::OUString ObjectNameProvider::getNameForCID( case OBJECTTYPE_DATA_AVERAGE_LINE: case OBJECTTYPE_DATA_CURVE_EQUATION: { - rtl::OUString aRet = lcl_getFullSeriesName( rObjectCID, xModel ); - aRet += C2U(" "); + OUString aRet = lcl_getFullSeriesName( rObjectCID, xModel ); + aRet += " "; if( eType == OBJECTTYPE_DATA_POINT || eType == OBJECTTYPE_DATA_LABEL ) { aRet += getName( OBJECTTYPE_DATA_POINT ); sal_Int32 nPointIndex = ObjectIdentifier::getIndexFromParticleOrCID( rObjectCID ); - aRet += C2U(" "); + aRet += " "; aRet += OUString::valueOf(nPointIndex+1); if( eType == OBJECTTYPE_DATA_LABEL ) { - aRet += C2U(" "); + aRet += " "; aRet += getName( OBJECTTYPE_DATA_LABEL ); } } @@ -773,9 +772,9 @@ rtl::OUString ObjectNameProvider::getNameForCID( return getName( eType ); } -rtl::OUString ObjectNameProvider::getName_ObjectForSeries( +OUString ObjectNameProvider::getName_ObjectForSeries( ObjectType eObjectType, - const rtl::OUString& rSeriesCID, + const OUString& rSeriesCID, const uno::Reference< chart2::XChartDocument >& xChartDocument ) { uno::Reference< frame::XModel> xChartModel( xChartDocument, uno::UNO_QUERY ); @@ -783,18 +782,18 @@ rtl::OUString ObjectNameProvider::getName_ObjectForSeries( if( xSeries.is() ) { OUString aRet = String(SchResId(STR_OBJECT_FOR_SERIES)); - replaceParamterInString( aRet, C2U("%OBJECTNAME"), getName( eObjectType, false /*bPlural*/ ) ); - replaceParamterInString( aRet, C2U("%SERIESNAME"), lcl_getDataSeriesName( rSeriesCID, xChartModel ) ); + replaceParamterInString( aRet, "%OBJECTNAME", getName( eObjectType, false /*bPlural*/ ) ); + replaceParamterInString( aRet, "%SERIESNAME", lcl_getDataSeriesName( rSeriesCID, xChartModel ) ); return aRet; } else return ObjectNameProvider::getName_ObjectForAllSeries( eObjectType ); } -rtl::OUString ObjectNameProvider::getName_ObjectForAllSeries( ObjectType eObjectType ) +OUString ObjectNameProvider::getName_ObjectForAllSeries( ObjectType eObjectType ) { OUString aRet = String(SchResId(STR_OBJECT_FOR_ALL_SERIES)); - replaceParamterInString( aRet, C2U("%OBJECTNAME"), getName( eObjectType, true /*bPlural*/ ) ); + replaceParamterInString( aRet, "%OBJECTNAME", getName( eObjectType, true /*bPlural*/ ) ); return aRet; } diff --git a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx index b9f607c48dc9..006f673a0c69 100644 --- a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; // ---------------------------------------- @@ -124,17 +123,17 @@ bool RangeSelectionHelper::chooseRange( { Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - C2U("InitialValue"), -1, uno::makeAny( aCurrentRange ), + "InitialValue", -1, uno::makeAny( aCurrentRange ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - C2U("Title"), -1, + "Title", -1, uno::makeAny( aUIString ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - C2U("CloseOnMouseRelease"), -1, uno::makeAny( true ), + "CloseOnMouseRelease", -1, uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - C2U("MultiSelectionMode"), -1, uno::makeAny( true ), + "MultiSelectionMode", -1, uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE ); if( m_xRangeSelectionListener.is() ) diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index 4584fcc23e5a..5d4e8a593b46 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -54,7 +54,7 @@ CreationWizardUnoDlg::CreationWizardUnoDlg( const uno::Reference< uno::XComponen { uno::Reference< frame::XDesktop > xDesktop( m_xCC->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.frame.Desktop" ), m_xCC ), uno::UNO_QUERY ); + "com.sun.star.frame.Desktop" , m_xCC ), uno::UNO_QUERY ); if( xDesktop.is() ) { uno::Reference< frame::XTerminateListener > xListener( this ); @@ -74,10 +74,10 @@ CreationWizardUnoDlg::~CreationWizardUnoDlg() // lang::XServiceInfo APPHELPER_XSERVICEINFO_IMPL(CreationWizardUnoDlg,CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME) - uno::Sequence< rtl::OUString > CreationWizardUnoDlg + uno::Sequence< OUString > CreationWizardUnoDlg ::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = CHART_WIZARD_DIALOG_SERVICE_NAME; return aSNS; } @@ -191,7 +191,7 @@ void SAL_CALL CreationWizardUnoDlg::disposing( const lang::EventObject& /*Source } //------------------------------------------------------------------------- -void SAL_CALL CreationWizardUnoDlg::setTitle( const ::rtl::OUString& /*rTitle*/ ) throw(uno::RuntimeException) +void SAL_CALL CreationWizardUnoDlg::setTitle( const OUString& /*rTitle*/ ) throw(uno::RuntimeException) { } //------------------------------------------------------------------------- @@ -292,7 +292,7 @@ void SAL_CALL CreationWizardUnoDlg::disposing() { uno::Reference< frame::XDesktop > xDesktop( m_xCC->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.frame.Desktop" ), m_xCC ), uno::UNO_QUERY ); + "com.sun.star.frame.Desktop" , m_xCC ), uno::UNO_QUERY ); if( xDesktop.is() ) { uno::Reference< frame::XTerminateListener > xListener( this ); @@ -313,16 +313,16 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL CreationWizardUnoDlg::getProp return 0; } -void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const ::rtl::OUString& rPropertyName +void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const OUString& rPropertyName , const uno::Any& rValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException , lang::WrappedTargetException, uno::RuntimeException) { - if( rPropertyName.equals(C2U("Position")) ) + if( rPropertyName == "Position" ) { awt::Point aPos; if( ! (rValue >>= aPos) ) - throw lang::IllegalArgumentException( C2U("Property 'Position' requires value of type awt::Point"), 0, 0 ); + throw lang::IllegalArgumentException( "Property 'Position' requires value of type awt::Point", 0, 0 ); //set left upper outer corner relative to screen //pixels, screen position @@ -337,24 +337,24 @@ void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const ::rtl::OUString& rPr m_pDialog->SetPosPixel( aNewOuterPos ); } } - else if( rPropertyName.equals(C2U("Size")) ) + else if( rPropertyName == "Size") { //read only property, do nothing } - else if( rPropertyName.equals(C2U("UnlockControllersOnExecute")) ) + else if( rPropertyName == "UnlockControllersOnExecute" ) { if( ! (rValue >>= m_bUnlockControllersOnExecute) ) - throw lang::IllegalArgumentException( C2U("Property 'UnlockControllers' requires value of type boolean"), 0, 0 ); + throw lang::IllegalArgumentException( "Property 'UnlockControllers' requires value of type boolean" , 0, 0 ); } else - throw beans::UnknownPropertyException( C2U("unknown property was tried to set to chart wizard"), 0 ); + throw beans::UnknownPropertyException( "unknown property was tried to set to chart wizard" , 0 ); } -uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const ::rtl::OUString& rPropertyName ) +uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { uno::Any aRet; - if( rPropertyName.equals(C2U("Position")) ) + if( rPropertyName == "Position" ) { //get left upper outer corner relative to screen //pixels, screen position @@ -367,7 +367,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const ::rtl::OUString& aRet = uno::makeAny( aPoint ); } } - else if( rPropertyName.equals(C2U("Size")) ) + else if( rPropertyName == "Size" ) { //get outer size inclusive decoration //pixels, screen position @@ -380,35 +380,35 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const ::rtl::OUString& aRet = uno::makeAny( aSize ); } } - else if( rPropertyName.equals(C2U("UnlockControllersOnExecute")) ) + else if( rPropertyName == "UnlockControllersOnExecute" ) { aRet = uno::makeAny( m_bUnlockControllersOnExecute ); } else - throw beans::UnknownPropertyException( C2U("unknown property was tried to get from chart wizard"), 0 ); + throw beans::UnknownPropertyException( "unknown property was tried to get from chart wizard" , 0 ); return aRet; } void SAL_CALL CreationWizardUnoDlg::addPropertyChangeListener( - const ::rtl::OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* xListener */ ) + const OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* xListener */ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); } void SAL_CALL CreationWizardUnoDlg::removePropertyChangeListener( - const ::rtl::OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* aListener */ ) + const OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* aListener */ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); } -void SAL_CALL CreationWizardUnoDlg::addVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ ) +void SAL_CALL CreationWizardUnoDlg::addVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); } -void SAL_CALL CreationWizardUnoDlg::removeVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ ) +void SAL_CALL CreationWizardUnoDlg::removeVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 15f72a189c2e..de868dc390b9 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -79,7 +79,7 @@ using ::com::sun::star::uno::Reference; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -ObjectPropertiesDialogParameter::ObjectPropertiesDialogParameter( const rtl::OUString& rObjectCID ) +ObjectPropertiesDialogParameter::ObjectPropertiesDialogParameter( const OUString& rObjectCID ) : m_aObjectCID( rObjectCID ) , m_eObjectType( ObjectIdentifier::getObjectType( m_aObjectCID ) ) , m_bAffectsMultipleObjects(false) @@ -103,8 +103,8 @@ ObjectPropertiesDialogParameter::ObjectPropertiesDialogParameter( const rtl::OUS , m_xChartDocument( 0 ) , m_bComplexCategoriesAxis( false ) { - rtl::OUString aParticleID = ObjectIdentifier::getParticleID( m_aObjectCID ); - m_bAffectsMultipleObjects = aParticleID.equals(C2U("ALLELEMENTS")); + OUString aParticleID = ObjectIdentifier::getParticleID( m_aObjectCID ); + m_bAffectsMultipleObjects = (aParticleID == "ALLELEMENTS"); } ObjectPropertiesDialogParameter::~ObjectPropertiesDialogParameter() { @@ -113,7 +113,7 @@ ObjectType ObjectPropertiesDialogParameter::getObjectType() const { return m_eObjectType; } -rtl::OUString ObjectPropertiesDialogParameter::getLocalizedName() const +OUString ObjectPropertiesDialogParameter::getLocalizedName() const { return m_aLocalizedName; } @@ -296,7 +296,7 @@ bool ObjectPropertiesDialogParameter::IsCrossingAxisIsCategoryAxis() const { return m_bIsCrossingAxisIsCategoryAxis; } -const uno::Sequence< rtl::OUString >& ObjectPropertiesDialogParameter::GetCategories() const +const uno::Sequence< OUString >& ObjectPropertiesDialogParameter::GetCategories() const { return m_aCategories; } |