summaryrefslogtreecommitdiffstats
path: root/xmloff
diff options
context:
space:
mode:
authorSzabolcs Dezsi <dezsiszabi@hotmail.com>2012-04-06 14:28:18 +0200
committerJan Holesovsky <kendy@suse.cz>2012-04-06 14:30:05 +0200
commit8a01ee624318ac08800af89d988971114637a04e (patch)
treee4acf35e42ab0c1d0b593bd8970fa2c435f90c95 /xmloff
parentDo not extern these const char[]'s. (diff)
downloadcore-8a01ee624318ac08800af89d988971114637a04e.tar.gz
core-8a01ee624318ac08800af89d988971114637a04e.zip
Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
Pattern used: find . -name "*.cxx" -exec sed -i 's/\( *\)\(else if\|if\) *( *\([^!()|&]*\)\.equalsAsciiL( *RTL_CONSTASCII_STRINGPARAM *( *\([^)]*\) ) *) *)$/\1\2 ( \3 == \4 )/' \{\} \;
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/chart/SchXMLPlotAreaContext.cxx4
-rw-r--r--xmloff/source/core/DocumentSettingsContext.cxx4
-rw-r--r--xmloff/source/core/xmlexp.cxx4
-rw-r--r--xmloff/source/draw/animationimport.cxx4
-rw-r--r--xmloff/source/forms/elementimport.cxx2
-rw-r--r--xmloff/source/style/xmlstyle.cxx2
6 files changed, 10 insertions, 10 deletions
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 5df79c9ddd94..167e9e8bca0b 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -487,7 +487,7 @@ SvXMLImportContext* SchXMLPlotAreaContext::CreateChildContext(
// for NetCharts there were no xAxis exported to older files
// so we need to add the x axis here for those old NetChart files
- if( maChartTypeServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.NetChartType" )) )
+ if ( maChartTypeServiceName == "com.sun.star.chart2.NetChartType" )
bAddMissingXAxisForNetCharts = true;
//Issue 59288
@@ -499,7 +499,7 @@ SvXMLImportContext* SchXMLPlotAreaContext::CreateChildContext(
if( SchXMLTools::isDocumentGeneratedWithOpenOfficeOlderThan2_4( GetImport().GetModel() ) )
{
//issue74660
- if( maChartTypeServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.ColumnChartType" )) )
+ if ( maChartTypeServiceName == "com.sun.star.chart2.ColumnChartType" )
bAdaptXAxisOrientationForOld2DBarCharts = true;
}
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index 9c962ce4296b..691baaf9d11c 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -804,7 +804,7 @@ void XMLConfigItemMapIndexedContext::EndElement()
{
if (mpBaseContext)
{
- if( maConfigItemName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ForbiddenCharacters" ) ) )
+ if ( maConfigItemName == "ForbiddenCharacters" )
{
uno::Reference< i18n::XForbiddenCharacters > xForbChars;
@@ -891,7 +891,7 @@ void XMLConfigItemMapIndexedContext::EndElement()
mrAny <<= maProps.GetIndexContainer();
}
}
- else if( maConfigItemName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Symbols" ) ) )
+ else if ( maConfigItemName == "Symbols" )
{
uno::Reference< container::XIndexAccess > xIndex( maProps.GetIndexContainer(), uno::UNO_QUERY );
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 6b750ad929b1..d30585f7a4bf 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -837,12 +837,12 @@ sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue
const OUString& rPropName = pProps->Name;
const Any& rValue = pProps->Value;
- if( rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FileName" ) ) )
+ if ( rPropName == "FileName" )
{
if( !(rValue >>= msOrigFileName ) )
return sal_False;
}
- else if (rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterName" ) ) )
+ else if ( rPropName == "FilterName" )
{
if( !(rValue >>= msFilterName ) )
return sal_False;
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 9eaf9a31bb47..5baefba6bbac 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -693,11 +693,11 @@ AnimationNodeContext::AnimationNodeContext(
if( (nPrefix == XML_NAMESPACE_PRESENTATION) && IsXMLToken( aLocalName, XML_PRESET_ID ) )
{
const OUString& rValue = xAttrList->getValueByIndex( nAttribute );
- if( rValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ooo-entrance-random" ) ) )
+ if ( rValue == "ooo-entrance-random" )
{
nPresetClass = EffectPresetClass::ENTRANCE;
}
- else if( rValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ooo-exit-random" ) ) )
+ else if ( rValue == "ooo-exit-random" )
{
nPresetClass = EffectPresetClass::EXIT;
}
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 9100f599759c..58859149aafe 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -1587,7 +1587,7 @@ namespace xmloff
{
::rtl::OUString sDefaultControl;
OSL_VERIFY( aDefaultControlPropertyPos->Value >>= sDefaultControl );
- if ( sDefaultControl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "stardiv.one.form.control.Edit" ) ) )
+ if ( sDefaultControl == "stardiv.one.form.control.Edit" )
{
// complete remove this property value from the array. Today's "default value" of the "DefaultControl"
// property is sufficient
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index beae4d64fbda..efcd5140c5d4 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -630,7 +630,7 @@ sal_uInt16 SvXMLStylesContext::GetFamily(
{
nFamily = XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID;
}
- else if( rValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( XML_STYLE_FAMILY_SCH_CHART_NAME )))
+ else if ( rValue == XML_STYLE_FAMILY_SCH_CHART_NAME )
{
nFamily = XML_STYLE_FAMILY_SCH_CHART_ID;
}