diff options
Diffstat (limited to 'xmloff/source/chart')
-rw-r--r-- | xmloff/source/chart/ColorPropertySet.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLExport.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLImport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLParagraphContext.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLPlotAreaContext.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLSeries2Context.cxx | 12 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLTableContext.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLTools.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx | 6 |
9 files changed, 25 insertions, 25 deletions
diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx index abaabc83b04d..c0f0011ceb6d 100644 --- a/xmloff/source/chart/ColorPropertySet.cxx +++ b/xmloff/source/chart/ColorPropertySet.cxx @@ -63,14 +63,14 @@ Sequence< Property > SAL_CALL lcl_ColorPropertySetInfo::getProperties() Property SAL_CALL lcl_ColorPropertySetInfo::getPropertyByName( const OUString& aName ) { - if( aName.equals( m_aColorPropName )) + if( aName == m_aColorPropName ) return m_aColorProp; throw UnknownPropertyException( m_aColorPropName, static_cast< uno::XWeak * >( this )); } sal_Bool SAL_CALL lcl_ColorPropertySetInfo::hasPropertyByName( const OUString& Name ) { - return Name.equals( m_aColorPropName ); + return Name == m_aColorPropName; } } // anonymous namespace @@ -144,13 +144,13 @@ Sequence< PropertyState > SAL_CALL ColorPropertySet::getPropertyStates( const Se void SAL_CALL ColorPropertySet::setPropertyToDefault( const OUString& PropertyName ) { - if( PropertyName.equals( m_aColorPropName )) + if( PropertyName == m_aColorPropName ) m_nColor = m_nDefaultColor; } uno::Any SAL_CALL ColorPropertySet::getPropertyDefault( const OUString& aPropertyName ) { - if( aPropertyName.equals( m_aColorPropName )) + if( aPropertyName == m_aColorPropName ) return uno::makeAny( m_nDefaultColor ); return uno::Any(); } diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index aad2d6539569..92b53cafbc0d 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -289,7 +289,7 @@ public: return ( xProp.is() && (xProp->getPropertyValue( "Role" ) >>= aRole ) && - m_aRole.equals( aRole )); + m_aRole == aRole ); } private: @@ -939,7 +939,7 @@ bool lcl_exportDomainForThisSequence( const Reference< chart2::data::XDataSequen OUString aRange( lcl_ConvertRange( rValues->getSourceRangeRepresentation(), xNewDoc ) ); //work around error in OOo 2.0 (problems with multiple series having a domain element) - if( rFirstRangeForThisDomainIndex.isEmpty() || !aRange.equals(rFirstRangeForThisDomainIndex) ) + if( rFirstRangeForThisDomainIndex.isEmpty() || aRange != rFirstRangeForThisDomainIndex ) { rExport.AddAttribute( XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, aRange); SvXMLElementExport aDomain( rExport, XML_NAMESPACE_CHART, XML_DOMAIN, true, true ); @@ -2601,7 +2601,7 @@ void SchXMLExportHelper_Impl::exportSeries( if( xSeqProp.is()) xSeqProp->getPropertyValue("Role") >>= aRole; // "main" sequence - if( aRole.equals( aLabelRole )) + if( aRole == aLabelRole ) { xValuesSeq.set( xTempValueSeq ); xLabelSeq.set( aSeqCnt[nSeqIdx]->getLabel()); diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index 8c44d3f65702..21f9864b0cea 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -70,7 +70,7 @@ public: bool operator () ( const Reference< chart2::XChartType > & xChartType ) const { return (xChartType.is() && - xChartType->getChartType().equals( m_aChartTypeName )); + xChartType->getChartType() == m_aChartTypeName ); } private: diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx index 6637254f6a7b..5fa8ecf4b053 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.cxx +++ b/xmloff/source/chart/SchXMLParagraphContext.cxx @@ -87,11 +87,11 @@ SvXMLImportContext* SchXMLParagraphContext::CreateChildContext( { if( nPrefix == XML_NAMESPACE_TEXT ) { - if( rLocalName.equals( ::xmloff::token::GetXMLToken( ::xmloff::token::XML_TAB_STOP ))) + if( rLocalName == ::xmloff::token::GetXMLToken( ::xmloff::token::XML_TAB_STOP )) { maBuffer.append( u'\x0009'); // tabulator } - else if( rLocalName.equals( ::xmloff::token::GetXMLToken( ::xmloff::token::XML_LINE_BREAK ))) + else if( rLocalName == ::xmloff::token::GetXMLToken( ::xmloff::token::XML_LINE_BREAK )) { maBuffer.append( u'\x000A'); // linefeed } diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index ba69c3a50456..74141afbc526 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -248,11 +248,11 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri break; case XML_TOK_PA_DS_HAS_LABELS: { - if( aValue.equals( ::xmloff::token::GetXMLToken( ::xmloff::token::XML_BOTH ))) + if( aValue == ::xmloff::token::GetXMLToken( ::xmloff::token::XML_BOTH )) mrColHasLabels = mrRowHasLabels = true; - else if( aValue.equals( ::xmloff::token::GetXMLToken( ::xmloff::token::XML_ROW ))) + else if( aValue == ::xmloff::token::GetXMLToken( ::xmloff::token::XML_ROW )) mrRowHasLabels = true; - else if( aValue.equals( ::xmloff::token::GetXMLToken( ::xmloff::token::XML_COLUMN ))) + else if( aValue == ::xmloff::token::GetXMLToken( ::xmloff::token::XML_COLUMN )) mrColHasLabels = true; } break; diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index a2e9069629b5..ee6a10c447f7 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -322,7 +322,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib sal_Int32 nNumOfAxes = mrAxes.size(); for( sal_Int32 nCurrent = 0; nCurrent < nNumOfAxes; nCurrent++ ) { - if( aValue.equals( mrAxes[ nCurrent ].aName ) && + if( aValue == mrAxes[ nCurrent ].aName && mrAxes[ nCurrent ].eDimension == SCH_XML_AXIS_Y ) { mpAttachedAxis = &( mrAxes[ nCurrent ] ); @@ -384,7 +384,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib } } if( ! mrGlobalChartTypeUsedBySeries ) - mrGlobalChartTypeUsedBySeries = (maSeriesChartTypeName.equals( maGlobalChartTypeName )); + mrGlobalChartTypeUsedBySeries = (maSeriesChartTypeName == maGlobalChartTypeName); sal_Int32 const nCoordinateSystemIndex = 0;//so far we can only import one coordinate system m_xSeries.set( SchXMLImportHelper::GetNewDataSeries( mxNewDoc, nCoordinateSystemIndex, maSeriesChartTypeName, ! mrGlobalChartTypeUsedBySeries )); @@ -811,7 +811,7 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe if( !(iStyle->msStyleName).isEmpty()) { - if( ! rCurrStyleName.equals( iStyle->msStyleName )) + if( rCurrStyleName != iStyle->msStyleName ) { rCurrStyleName = iStyle->msStyleName; rpStyle = pStylesCtxt->FindStyleChildContext( @@ -975,7 +975,7 @@ void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles if( !(iStyle->msStyleName).isEmpty()) { - if( ! rCurrStyleName.equals( iStyle->msStyleName )) + if( rCurrStyleName != iStyle->msStyleName ) { rCurrStyleName = iStyle->msStyleName; rpStyle = pStylesCtxt->FindStyleChildContext( @@ -1058,7 +1058,7 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri if( bIsDonutChart ) { //set special series styles for donut charts first - if( !rCurrStyleName.equals( iStyle->msSeriesStyleNameForDonuts ) ) + if( rCurrStyleName != iStyle->msSeriesStyleNameForDonuts ) { rCurrStyleName = iStyle->msSeriesStyleNameForDonuts; rpStyle = pStylesCtxt->FindStyleChildContext( @@ -1083,7 +1083,7 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri { } - if( !rCurrStyleName.equals( iStyle->msStyleName ) ) + if( rCurrStyleName != iStyle->msStyleName ) { rCurrStyleName = iStyle->msStyleName; rpStyle = pStylesCtxt->FindStyleChildContext( diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index 0d42dcebc3a9..32c7ee0ecad4 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -473,7 +473,7 @@ void SchXMLTableColumnContext::StartElement( const uno::Reference< xml::sax::XAt IsXMLToken( aLocalName, XML_VISIBILITY ) ) { OUString aVisibility = xAttrList->getValueByIndex( i ); - bHidden = aVisibility.equals( GetXMLToken( XML_COLLAPSE ) ); + bHidden = aVisibility == GetXMLToken( XML_COLLAPSE ); } } @@ -1039,7 +1039,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary( { aRange = xValues->getSourceRangeRepresentation(); sal_Int32 nIndex = aRange.toInt32(); - if( nIndex!=0 || !aRange.equals(lcl_aCategoriesRange) ) + if( nIndex!=0 || aRange != lcl_aCategoriesRange ) aUsageMap[nIndex] = true; } Reference< chart2::data::XDataSequence > xLabel( xLabeledSequence->getLabel() ); diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index b301a1ed7961..13ef728160d2 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -546,7 +546,7 @@ uno::Any getPropertyFromContext( const OUString& rPropertyName, const XMLPropSty if( nIdx == -1 ) continue; OUString aPropName = rMapper->GetEntryAPIName( nIdx ); - if(rPropertyName.equals(aPropName)) + if(rPropertyName == aPropName) return aPropIter->maValue; } return aRet; diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx index 2f876e9dc8c5..6508031bad93 100644 --- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx +++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx @@ -46,7 +46,7 @@ bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue, { bool bResult = false; - if( rStrImpValue.equals( GetXMLToken(XML_START) ) ) + if( rStrImpValue == GetXMLToken(XML_START) ) { if( !m_bCrossingValue ) { @@ -54,7 +54,7 @@ bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue, bResult = true; } } - else if( rStrImpValue.equals( GetXMLToken(XML_END) ) ) + else if( rStrImpValue == GetXMLToken(XML_END) ) { if( !m_bCrossingValue ) { @@ -62,7 +62,7 @@ bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue, bResult = true; } } - else if( rStrImpValue.equals( GetXMLToken(XML_0) ) ) + else if( rStrImpValue == GetXMLToken(XML_0) ) { if( !m_bCrossingValue ) { |