summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-07-13 12:43:20 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-07-13 15:20:58 +0200
commit3697b87b70c69e17e1d0398e0192a11dab179fe3 (patch)
treea498cce1f1351e6f92385aa9245c66c0724b6430 /oox
parent9bc95521aaa35b533894b3934519acdbd7a47815 (diff)
use more OUString::operator== in forms..sal
Change-Id: I70d7e50f8c1e019524ccad915f0cca912c5035dc Reviewed-on: https://gerrit.libreoffice.org/39899 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/core/filterdetect.cxx2
-rw-r--r--oox/source/docprop/docprophandler.cxx2
-rw-r--r--oox/source/drawingml/customshapeproperties.cxx6
-rw-r--r--oox/source/export/ColorPropertySet.cxx8
-rw-r--r--oox/source/export/chartexport.cxx4
-rw-r--r--oox/source/export/shapes.cxx4
-rw-r--r--oox/source/helper/propertymap.cxx2
-rw-r--r--oox/source/shape/ShapeContextHandler.cxx2
8 files changed, 15 insertions, 15 deletions
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index 13d3fed8a773..f36c6496157f 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -222,7 +222,7 @@ void FilterDetectDocHandler::parseContentTypesDefault( const AttributeList& rAtt
void FilterDetectDocHandler::parseContentTypesOverride( const AttributeList& rAttribs )
{
- if( rAttribs.getString( XML_PartName, OUString() ).equals( maTargetPath ) )
+ if( rAttribs.getString( XML_PartName, OUString() ) == maTargetPath )
mrFilterName = getFilterNameFromContentType( rAttribs.getString( XML_ContentType, OUString() ), maFileName );
}
diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx
index 3f8912d0f0d3..c575c9a1736f 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -247,7 +247,7 @@ void OOXMLDocPropHandler::UpdateDocStatistic( const OUString& aChars )
bool bFound = false;
sal_Int32 nLen = aSet.getLength();
for ( sal_Int32 nInd = 0; nInd < nLen; nInd++ )
- if ( aSet[nInd].Name.equals( aName ) )
+ if ( aSet[nInd].Name == aName )
{
aSet[nInd].Value <<= aChars.toInt32();
bFound = true;
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 160879cc3e66..57aedfcd022a 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -164,7 +164,7 @@ void CustomShapeProperties::pushToPropSet(
for ( i = 0; i < nCount; i++ )
{
const OUString sAdjustmentValues("AdjustmentValues");
- if ( aGeoPropSeq[ i ].Name.equals( sAdjustmentValues ) )
+ if ( aGeoPropSeq[ i ].Name == sAdjustmentValues )
{
OUString presetTextWarp;
if ( aGeoPropSeq[ i ].Value >>= presetTextWarp )
@@ -184,7 +184,7 @@ void CustomShapeProperties::pushToPropSet(
for ( i = 0; i < nCount; i++ )
{
const OUString sAdjustmentValues("AdjustmentValues");
- if ( aGeoPropSeq[ i ].Name.equals( sAdjustmentValues ) )
+ if ( aGeoPropSeq[ i ].Name == sAdjustmentValues )
{
uno::Sequence< css::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq;
if ( aGeoPropSeq[ i ].Value >>= aAdjustmentSeq )
@@ -216,7 +216,7 @@ void CustomShapeProperties::pushToPropSet(
xPropSet->setPropertyValue( sCustomShapeGeometry, Any( aGeoPropSeq ) );
}
}
- else if ( aGeoPropSeq[ i ].Name.equals( sType ) )
+ else if ( aGeoPropSeq[ i ].Name == sType )
{
if ( sConnectorShapeType.getLength() > 0 )
aGeoPropSeq[ i ].Value <<= sConnectorShapeType;
diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx
index ec25b10c3c49..c55ca4936c82 100644
--- a/oox/source/export/ColorPropertySet.cxx
+++ b/oox/source/export/ColorPropertySet.cxx
@@ -66,14 +66,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
@@ -163,13 +163,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/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 5f488e0b4b75..075b98f23de5 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -143,7 +143,7 @@ public:
return ( xProp.is() &&
(xProp->getPropertyValue( "Role" ) >>= aRole ) &&
- m_aRole.equals( aRole ));
+ m_aRole == aRole );
}
private:
@@ -2008,7 +2008,7 @@ void ChartExport::exportSeries( const Reference<chart2::XChartType>& xChartType,
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/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index ff909e7bc625..6cf8246a79d4 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -661,12 +661,12 @@ void lcl_AnalyzeHandles( const uno::Sequence<beans::PropertyValues> & rHandles,
const Sequence< PropertyValue >& rPropSeq = rHandles[ k ];
for ( const PropertyValue& rPropVal: rPropSeq )
{
- if ( rPropVal.Name.equals( sPosition ) )
+ if ( rPropVal.Name == sPosition )
{
if ( rPropVal.Value >>= aPosition )
bPosition = true;
}
- else if ( rPropVal.Name.equals( sSwitched ) )
+ else if ( rPropVal.Name == sSwitched )
{
rPropVal.Value >>= bSwitched ;
}
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 8356b13da191..10eef84abe17 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -905,7 +905,7 @@ void PropertyMap::dumpCode( const Reference< XPropertySet >& rXPropSet )
for (int i=0; i < props.getLength (); i++) {
// ignore Type, it is set elsewhere
- if (props[i].Name.equals (sType))
+ if (props[i].Name == sType)
continue;
OString name = OUStringToOString( props [i].Name, RTL_TEXTENCODING_UTF8);
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index a84171949e1f..a499500d17f7 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -212,7 +212,7 @@ ShapeContextHandler::getDrawingShapeContext()
{
// Reset the handler if fragment path has changed
OUString sHandlerFragmentPath = dynamic_cast<ContextHandler&>(*mxDrawingFragmentHandler.get()).getFragmentPath();
- if ( !msRelationFragmentPath.equals(sHandlerFragmentPath) )
+ if ( msRelationFragmentPath != sHandlerFragmentPath )
{
mxDrawingFragmentHandler.clear();
mxDrawingFragmentHandler.set