diff options
author | Szabolcs Dezsi <dezsiszabi@hotmail.com> | 2012-04-06 14:28:18 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2012-04-06 14:30:05 +0200 |
commit | 8a01ee624318ac08800af89d988971114637a04e (patch) | |
tree | e4acf35e42ab0c1d0b593bd8970fa2c435f90c95 /desktop | |
parent | 6cf547f02c79278430ee75483a3128076cfc609e (diff) |
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 'desktop')
-rw-r--r-- | desktop/source/app/app.cxx | 2 | ||||
-rw-r--r-- | desktop/source/app/cmdlineargs.cxx | 2 | ||||
-rw-r--r-- | desktop/source/app/officeipcthread.cxx | 2 | ||||
-rw-r--r-- | desktop/source/migration/migration.cxx | 2 | ||||
-rw-r--r-- | desktop/source/migration/services/basicmigration.cxx | 2 | ||||
-rw-r--r-- | desktop/source/migration/services/oo3extensionmigration.cxx | 4 | ||||
-rw-r--r-- | desktop/source/migration/services/wordbookmigration.cxx | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 0a448c16079b..6df1561c2c84 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2425,7 +2425,7 @@ void Desktop::OpenClients() OUString aPreloadData; aPerfTuneIniFile.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "QuickstartPreloadConfiguration" )), aPreloadData, aDefault ); - if ( aPreloadData.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "1" ) )) + if ( aPreloadData == "1" ) { if ( rArgs.IsWriter() || rArgs.IsCalc() || diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 037c716308e8..e62315b08780 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -480,7 +480,7 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString& #endif SetBoolParam_Impl( CMD_BOOLPARAM_NOQUICKSTART, sal_False ); } - else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "quickstart=no" ))) + else if ( oArg == "quickstart=no" ) { SetBoolParam_Impl( CMD_BOOLPARAM_NOQUICKSTART, sal_True ); SetBoolParam_Impl( CMD_BOOLPARAM_QUICKSTART, sal_False ); diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 8ca6083a815d..58daf1f5189c 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -478,7 +478,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() OUString aUserInstallPathHashCode; - if ( aPreloadData.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "1" ) )) + if ( aPreloadData == "1" ) { sal_Char szBuffer[32]; sprintf( szBuffer, "%d", SUPD ); diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 496d23946fef..d0efd587ad81 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -107,7 +107,7 @@ static const char XDG_CONFIG_PART[] = "/.config"; { for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ ) { - if ( aPropSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Label" ) )) + if ( aPropSeq[i].Name == "Label" ) { aPropSeq[i].Value >>= aStr; break; diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx index 1ac73ac62ead..a2a7b9b5dd77 100644 --- a/desktop/source/migration/services/basicmigration.cxx +++ b/desktop/source/migration/services/basicmigration.cxx @@ -209,7 +209,7 @@ namespace migration { beans::NamedValue aValue; *pIter >>= aValue; - if ( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UserData" ) ) ) + if ( aValue.Name == "UserData" ) { if ( !(aValue.Value >>= m_sSourceDir) ) { diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index 563ed1489d8a..64b4a6e12d1b 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -413,14 +413,14 @@ void OO3ExtensionMigration::initialize( const Sequence< Any >& aArguments ) thro { beans::NamedValue aValue; *pIter >>= aValue; - if ( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UserData" ) ) ) + if ( aValue.Name == "UserData" ) { if ( !(aValue.Value >>= m_sSourceDir) ) { OSL_FAIL( "ExtensionMigration::initialize: argument UserData has wrong type!" ); } } - else if ( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExtensionBlackList" ) ) ) + else if ( aValue.Name == "ExtensionBlackList" ) { Sequence< ::rtl::OUString > aBlackList; if ( (aValue.Value >>= aBlackList ) && ( aBlackList.getLength() > 0 )) diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index 3a30754f1f0a..2d274d18f5a6 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -277,7 +277,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) { beans::NamedValue aValue; *pIter >>= aValue; - if ( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UserData" ) ) ) + if ( aValue.Name == "UserData" ) { if ( !(aValue.Value >>= m_sSourceDir) ) { |