summaryrefslogtreecommitdiff
path: root/extensions/source
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-01-20 10:30:44 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-01-20 10:30:44 +0100
commit7c89e643b1152383ffa1a51e4a3b911ac1d1d36e (patch)
tree8694fcf7d05400b0e78bb33e57079eef257bd8dd /extensions/source
parent2bc5fb34285a00e551d076e8867f12de1e218bf6 (diff)
Replace suitable equalsAscii calls with equalsAsciiL.
Done with sed -i 's%\(\.equalsAscii\)(\(\s\?"[^"]\+"\)\(\s\?\))%\1L(\3RTL_CONSTASCII_STRINGPARAM(\2\3)\3)%g'.
Diffstat (limited to 'extensions/source')
-rw-r--r--extensions/source/bibliography/framectr.cxx6
-rw-r--r--extensions/source/logging/loggerconfig.cxx2
-rw-r--r--extensions/source/plugin/aqua/macmgr.cxx4
-rw-r--r--extensions/source/propctrlr/eventhandler.cxx2
-rw-r--r--extensions/source/propctrlr/formgeometryhandler.cxx4
-rw-r--r--extensions/source/propctrlr/propcontroller.cxx2
-rw-r--r--extensions/source/resource/resource.cxx54
-rw-r--r--extensions/source/update/check/updatecheckjob.cxx6
8 files changed, 40 insertions, 40 deletions
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index f8306b13d419..39b6e30660c2 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -224,8 +224,8 @@ BibFrameController_Impl::~BibFrameController_Impl()
sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException)
{
return (
- sServiceName.equalsAscii("com.sun.star.frame.Bibliography") ||
- sServiceName.equalsAscii("com.sun.star.frame.Controller")
+ sServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.frame.Bibliography")) ||
+ sServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.frame.Controller"))
);
}
@@ -748,7 +748,7 @@ void BibFrameController_Impl::addStatusListener(
else if(aURL.Path == C2U("Bib/sdbsource") ||
aURL.Path == C2U("Bib/Mapping") ||
aURL.Path == C2U("Bib/autoFilter") ||
- aURL.Path.equalsAscii("Bib/standardFilter"))
+ aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Bib/standardFilter")))
{
aEvent.IsEnabled = sal_True;
}
diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx
index 048ede71a41e..a8d216162677 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -134,7 +134,7 @@ namespace logging
//----------------------------------------------------------------
void lcl_transformFileHandlerSettings_nothrow( const Reference< XLogger >& _rxLogger, const ::rtl::OUString& _rSettingName, Any& _inout_rSettingValue )
{
- if ( !_rSettingName.equalsAscii( "FileURL" ) )
+ if ( !_rSettingName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FileURL" ) ) )
// not interested in this setting
return;
diff --git a/extensions/source/plugin/aqua/macmgr.cxx b/extensions/source/plugin/aqua/macmgr.cxx
index f1d0e3a3c99b..2d7d87c93fd0 100644
--- a/extensions/source/plugin/aqua/macmgr.cxx
+++ b/extensions/source/plugin/aqua/macmgr.cxx
@@ -413,7 +413,7 @@ static bool checkBlackList( CFBundleRef i_xBundle )
bool bReject = false;
// #i102735# VLC plugin prior to 1.0 tends to crash
- if( aBundleName.equalsAscii( "VLC Plug-in" ) )
+ if( aBundleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VLC Plug-in" ) ) )
{
sal_Int32 nIndex = 0;
rtl::OUString aMajor( aBundleVersion.getToken( 0, '.', nIndex ) );
@@ -423,7 +423,7 @@ static bool checkBlackList( CFBundleRef i_xBundle )
}
}
// #i103674# Garmin Communicator Plugin crashes
- else if( aBundleName.equalsAscii( "Garmin Communicator Plugin" ) )
+ else if( aBundleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Garmin Communicator Plugin" ) ) )
{
bReject = true;
}
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index bf1a44bdecbc..5f1df02469e1 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -271,7 +271,7 @@ namespace pcr
aScriptEvent = *pAssignedEvent;
- if ( !aScriptEvent.ScriptType.equalsAscii( "StarBasic" ) )
+ if ( !aScriptEvent.ScriptType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StarBasic" ) ) )
continue;
// this is an old-style macro specification:
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 0af7c29b7f80..209b466cfe9f 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -742,13 +742,13 @@ namespace pcr
::std::vector< EventTranslation > aEventTranslations;
aEventTranslations.reserve(2);
- if ( _event.PropertyName.equalsAscii( "Position" ) )
+ if ( _event.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Position" ) ) )
{
AwtPoint aPos = m_xShape->getPosition();
aEventTranslations.push_back( EventTranslation( PROPERTY_POSITIONX, makeAny( aPos.X ) ) );
aEventTranslations.push_back( EventTranslation( PROPERTY_POSITIONY, makeAny( aPos.Y ) ) );
}
- else if ( _event.PropertyName.equalsAscii( "Size" ) )
+ else if ( _event.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) )
{
AwtSize aSize = m_xShape->getSize();
aEventTranslations.push_back( EventTranslation( PROPERTY_WIDTH, makeAny( aSize.Width ) ) );
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 657b1f2e9955..efd52a54ccdb 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -748,7 +748,7 @@ namespace pcr
{
if ( _rEvent.Source == m_xModel )
{
- if ( _rEvent.PropertyName.equalsAscii( "IsReadOnly" ) )
+ if ( _rEvent.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsReadOnly" ) ) )
impl_updateReadOnlyView_nothrow();
return;
}
diff --git a/extensions/source/resource/resource.cxx b/extensions/source/resource/resource.cxx
index 8ebea6dc85d3..7c0a0fd60616 100644
--- a/extensions/source/resource/resource.cxx
+++ b/extensions/source/resource/resource.cxx
@@ -191,19 +191,19 @@ OUString SAL_CALL ResourceService::getExactName( const OUString & Approximate
{
OUString aName( ApproximateName );
aName = aName.toAsciiLowerCase();
- if( aName.equalsAscii("filename") )
+ if( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("filename")) )
return OUString(RTL_CONSTASCII_USTRINGPARAM("FileName"));
- else if( aName.equalsAscii("getstring" ))
+ else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("getstring" ) ))
return OUString(RTL_CONSTASCII_USTRINGPARAM("getString"));
- else if( aName.equalsAscii("getstrings" ))
+ else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("getstrings" ) ))
return OUString(RTL_CONSTASCII_USTRINGPARAM("getStrings"));
- else if( aName.equalsAscii("hasstring") )
+ else if( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("hasstring")) )
return OUString(RTL_CONSTASCII_USTRINGPARAM("hasString"));
- else if( aName.equalsAscii("hasstrings") )
+ else if( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("hasstrings")) )
return OUString(RTL_CONSTASCII_USTRINGPARAM("hasStrings"));
- else if( aName.equalsAscii("getstringlist") )
+ else if( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getstringlist")) )
return OUString(RTL_CONSTASCII_USTRINGPARAM("getStringList"));
- else if( aName.equalsAscii("hasStringList") )
+ else if( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("hasStringList")) )
return OUString(RTL_CONSTASCII_USTRINGPARAM("hasStringList"));
Reference< XExactName > xEN( getDefaultInvocation(), UNO_QUERY );
if( xEN.is() )
@@ -232,16 +232,16 @@ Any SAL_CALL ResourceService::invoke
throw(IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException)
{
Any aRet;
- if( FunctionName.equalsAscii("getString")
- || FunctionName.equalsAscii("getStrings" )
- || FunctionName.equalsAscii("hasString" )
- || FunctionName.equalsAscii("hasStrings" )
+ if( FunctionName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getString"))
+ || FunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("getStrings" ) )
+ || FunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("hasString" ) )
+ || FunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("hasStrings" ) )
)
{
sal_Int32 nElements = Params.getLength();
if( nElements < 1 )
throw IllegalArgumentException();
- if( nElements > 1 && (FunctionName.equalsAscii("getString") || FunctionName.equalsAscii("hasString") ) )
+ if( nElements > 1 && (FunctionName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getString")) || FunctionName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("hasString")) ) )
throw IllegalArgumentException();
if( !pResMgr )
throw IllegalArgumentException();
@@ -253,7 +253,7 @@ Any SAL_CALL ResourceService::invoke
sal_Bool* pOutBool = aBools.getArray();
Reference< XTypeConverter > xC = getTypeConverter();
- bool bGetBranch = FunctionName.equalsAscii( "getString" ) || FunctionName.equalsAscii( "getStrings" );
+ bool bGetBranch = FunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "getString" ) ) || FunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "getStrings" ) );
SolarMutexGuard aGuard;
for( sal_Int32 n = 0; n < nElements; n++ )
@@ -295,16 +295,16 @@ Any SAL_CALL ResourceService::invoke
pOutBool[n] = bRet;
}
}
- if( FunctionName.equalsAscii("getString") )
+ if( FunctionName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getString")) )
aRet <<= pOutString[0];
- else if( FunctionName.equalsAscii("getStrings" ) )
+ else if( FunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("getStrings" ) ) )
aRet <<= aStrings;
- else if( FunctionName.equalsAscii("hasString" ) )
+ else if( FunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("hasString" ) ) )
aRet <<= pOutBool[0];
else
aRet <<= aBools;
}
- else if( FunctionName.equalsAscii("getStringList") || FunctionName.equalsAscii("hasStringList" ) )
+ else if( FunctionName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getStringList")) || FunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("hasStringList" ) ) )
{
if( Params.getLength() != 1 )
throw IllegalArgumentException();
@@ -322,7 +322,7 @@ Any SAL_CALL ResourceService::invoke
throw CannotConvertException();
}
- if( FunctionName.equalsAscii("getStringList") )
+ if( FunctionName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getStringList")) )
{
ResId aId( (USHORT)nId, *pResMgr );
aId.SetRT( RSC_STRINGARRAY );
@@ -371,7 +371,7 @@ Any SAL_CALL ResourceService::invoke
void SAL_CALL ResourceService::setValue(const OUString& PropertyName, const Any& Value)
throw(UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException)
{
- if( PropertyName.equalsAscii("FileName") )
+ if( PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName")) )
{
OUString aName;
if( !(Value >>= aName) )
@@ -409,7 +409,7 @@ Any SAL_CALL ResourceService::getValue(const OUString& PropertyName)
throw(UnknownPropertyException, RuntimeException)
{
SolarMutexGuard aGuard;
- if( PropertyName.equalsAscii("FileName" ))
+ if( PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("FileName" ) ))
return makeAny( aFileName );
Reference< XInvocation > xI = getDefaultInvocation();
@@ -423,12 +423,12 @@ Any SAL_CALL ResourceService::getValue(const OUString& PropertyName)
BOOL SAL_CALL ResourceService::hasMethod(const OUString& Name)
throw(RuntimeException)
{
- if( Name.equalsAscii("getString") ||
- Name.equalsAscii("getStrings") ||
- Name.equalsAscii("hasString") ||
- Name.equalsAscii("hasStrings") ||
- Name.equalsAscii("getStringList") ||
- Name.equalsAscii("hasStringList")
+ if( Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getString")) ||
+ Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getStrings")) ||
+ Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("hasString")) ||
+ Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("hasStrings")) ||
+ Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getStringList")) ||
+ Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("hasStringList"))
)
return TRUE;
else
@@ -445,7 +445,7 @@ BOOL SAL_CALL ResourceService::hasMethod(const OUString& Name)
BOOL SAL_CALL ResourceService::hasProperty(const OUString& Name)
throw(RuntimeException)
{
- if( Name.equalsAscii("FileName") )
+ if( Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName")) )
return TRUE;
else
{
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index ede63876737b..d223220490b1 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -201,14 +201,14 @@ UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues)
{
for ( sal_Int32 n=namedValues.getLength(); n-- > 0; )
{
- if ( namedValues[ n ].Name.equalsAscii( "DynamicData" ) )
+ if ( namedValues[ n ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DynamicData" ) ) )
{
uno::Sequence<beans::NamedValue> aListProp;
if ( namedValues[n].Value >>= aListProp )
{
for ( sal_Int32 i=aListProp.getLength(); i-- > 0; )
{
- if ( aListProp[ i ].Name.equalsAscii( "updateList" ) )
+ if ( aListProp[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "updateList" ) ) )
{
handleExtensionUpdates( aListProp );
return uno::Any();
@@ -233,7 +233,7 @@ UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues)
m_pInitThread.reset(
new InitUpdateCheckJobThread(
m_xContext, aConfig,
- !aEventName.equalsAscii("onFirstVisibleTask")));
+ !aEventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("onFirstVisibleTask"))));
return uno::Any();
}