diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 13:21:05 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 14:12:23 +0100 |
| commit | acb7ca428382b8db42d7afcd79d72682aae0df8d (patch) | |
| tree | 1a9c188c5bc6bc8043ccbb80ec906f6e3631add7 /chart2/source/model | |
| parent | 39ddeb53c04f7a8410a5146e2ce7b4acf204ad2b (diff) | |
chart2: Use appropriate OUString functions on string constants
Change-Id: Ifc28920e69db410b00312e634caba33b0e286b7f
Diffstat (limited to 'chart2/source/model')
4 files changed, 10 insertions, 10 deletions
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 480954eaf498..cd5dac49a494 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -369,12 +369,12 @@ sal_Int32 XMLFilter::impl_Import( uno::Sequence< beans::PropertyValue > aModProps = xModel->getArgs(); for( sal_Int32 nInd = 0; nInd < aModProps.getLength(); nInd++ ) { - if( aModProps[nInd].Name.equals( "HierarchicalDocumentName" ) ) + if( aModProps[nInd].Name == "HierarchicalDocumentName" ) { // Actually this argument only has meaning for embedded documents aModProps[nInd].Value >>= aHierarchName; } - else if( aModProps[nInd].Name.equals( "DocumentBaseURL" ) ) + else if( aModProps[nInd].Name == "DocumentBaseURL" ) { aModProps[nInd].Value >>= aBaseUri; } diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index 0d2ac75e5363..23a3c290af07 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -509,9 +509,9 @@ void SAL_CALL ChartModel::load( aMDHelper.ISSET_InputStream ) { if( aMDHelper.ISSET_FilterName && - (aMDHelper.FilterName.equals( "StarChart 5.0") || - aMDHelper.FilterName.equals( "StarChart 4.0") || - aMDHelper.FilterName.equals( "StarChart 3.0") )) + (aMDHelper.FilterName == "StarChart 5.0" || + aMDHelper.FilterName == "StarChart 4.0" || + aMDHelper.FilterName == "StarChart 3.0" )) { attachResource( aMDHelper.URL, rMediaDescriptor ); impl_load( rMediaDescriptor, 0 ); // cannot create a storage from binary streams, but I do not need the storage here anyhow diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index e82cf5a55a2c..64375568c233 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -308,12 +308,12 @@ sal_Bool SAL_CALL ColumnLineChartTypeTemplate::matchesTemplate( if( nNumberOfChartTypes > 2 ) break; OUString aCTService = aChartTypeSeq[j]->getChartType(); - if( aCTService.equals( CHART2_SERVICE_NAME_CHARTTYPE_COLUMN )) + if( aCTService == CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ) { xColumnChartType.set( aChartTypeSeq[j] ); xColumnChartCooSys.set( aCooSysSeq[i] ); } - else if( aCTService.equals( CHART2_SERVICE_NAME_CHARTTYPE_LINE )) + else if( aCTService == CHART2_SERVICE_NAME_CHARTTYPE_LINE ) xLineChartType.set( aChartTypeSeq[j] ); } } diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index 8f9fae68db66..dca4cbb99c6a 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -442,11 +442,11 @@ sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate( if( nNumberOfChartTypes > 3 ) break; OUString aCTService = aChartTypeSeq[j]->getChartType(); - if( aCTService.equals( CHART2_SERVICE_NAME_CHARTTYPE_COLUMN )) + if( aCTService == CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ) xVolumeChartType.set( aChartTypeSeq[j] ); - else if( aCTService.equals( CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK )) + else if( aCTService == CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK ) xCandleStickChartType.set( aChartTypeSeq[j] ); - else if( aCTService.equals( CHART2_SERVICE_NAME_CHARTTYPE_LINE )) + else if( aCTService == CHART2_SERVICE_NAME_CHARTTYPE_LINE ) xLineChartType.set( aChartTypeSeq[j] ); } } |