mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator

Browse Source 
Pattern used:

find . -name "*.cxx" -exec sed -i 's/\( *\)\(else if\|if\) *( *\([^!()|&]*\)\.equalsAsciiL( *RTL_CONSTASCII_STRINGPARAM *( *\([^)]*\)) *) *) *{$/\1\2 ( \3 == \4 ) {/' \{\} \;
This commit is contained in:
Szabolcs Dezsi
2012-04-06 15:37:46 +02:00
committed by Jan Holesovsky
parent 99268dbe1f
commit 27cea710fd
18 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configmgr/source/components.cxx
View File

@@ -540,14 +540,14 @@ Components::Components(
}
rtl::OUString type(conf.copy(i, c - i));
rtl::OUString url(expand(conf.copy(c + 1, n - c - 1)));
if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("xcsxcu"))) {
if ( type == "xcsxcu" ) {
parseXcsXcuLayer(layer, url);
layer += 2; //TODO: overflow
} else if ( type == "bundledext" )
{
parseXcsXcuIniLayer(layer, url, false);
layer += 2; //TODO: overflow
} else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sharedext"))) {
} else if ( type == "sharedext" ) {
if (sharedExtensionLayer_ != -1) {
throw css::uno::RuntimeException(
rtl::OUString(
@@ -559,7 +559,7 @@ Components::Components(
sharedExtensionLayer_ = layer;
parseXcsXcuIniLayer(layer, url, true);
layer += 2; //TODO: overflow
} else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("userext"))) {
} else if ( type == "userext" ) {
if (userExtensionLayer_ != -1) {
throw css::uno::RuntimeException(
rtl::OUString(
@@ -571,13 +571,13 @@ Components::Components(
userExtensionLayer_ = layer;
parseXcsXcuIniLayer(layer, url, true);
layer += 2; //TODO: overflow
} else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("module"))) {
} else if ( type == "module" ) {
parseModuleLayer(layer, url);
++layer; //TODO: overflow
} else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("res"))) {
} else if ( type == "res" ) {
parseResLayer(layer, url);
++layer; //TODO: overflow
} else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("user"))) {
} else if ( type == "user" ) {
if (url.isEmpty()) {
throw css::uno::RuntimeException(
rtl::OUString(

2
configmgr/source/configurationprovider.cxx
View File

@@ -365,7 +365,7 @@ void Service::setLocale(css::lang::Locale const & eLocale)
css::lang::Locale Service::getLocale() throw (css::uno::RuntimeException) {
osl::MutexGuard guard(*lock_);
css::lang::Locale loc;
if (locale_.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("*"))) {
if ( locale_ == "*" ) {
loc.Language = locale_;
} else if (! locale_.isEmpty()) {
try {

2
configmgr/source/data.cxx
View File

@@ -224,7 +224,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
if (path != 0) {
path->clear();
}
if (pathRepresentation.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("/"))) {
if ( pathRepresentation == "/" ) {
if (canonicRepresentation != 0) {
*canonicRepresentation = pathRepresentation;
}

2
configmgr/source/type.cxx
View File

@@ -150,7 +150,7 @@ Type getDynamicType(css::uno::Any const & value) {
case css::uno::TypeClass_SEQUENCE: //TODO
{
rtl::OUString name(value.getValueType().getTypeName());
if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("[]byte"))) {
if ( name == "[]byte" ) {
return TYPE_HEXBINARY;
} else if (name.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM("[]boolean")))

2
desktop/source/app/langselect.cxx
View File

@@ -394,7 +394,7 @@ Sequence< OUString > LanguageSelection::getInstalledLanguages()
static Sequence< OUString > _getFallbackLocales(const OUString& aIsoLang)
{
Sequence< OUString > seqFallbacks;
if (aIsoLang.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("zh-HK"))) {
if ( aIsoLang == "zh-HK" ) {
seqFallbacks = Sequence< OUString >(1);
seqFallbacks[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("zh-TW"));
}

10
desktop/source/deployment/manager/dp_manager.cxx
View File

@@ -351,7 +351,7 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create(
Reference<deployment::XPackageManager> xPackageManager( that );
OUString packages, logFile, stamp;
if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("user") )) {
if ( context == "user" ) {
that->m_activePackages = OUSTR(
"vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages");
that->m_registrationData = OUSTR(
@@ -373,7 +373,7 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create(
//the virtual store).
stamp = OUSTR("$UNO_USER_PACKAGES_CACHE");
}
else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("shared") )) {
else if ( context == "shared" ) {
that->m_activePackages = OUSTR(
"vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE/uno_packages");
that->m_registrationData = OUSTR(
@@ -384,7 +384,7 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create(
"vnd.sun.star.expand:$SHARED_EXTENSIONS_USER/log.txt");
stamp = OUSTR("$UNO_SHARED_PACKAGES_CACHE");
}
else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bundled") )) {
else if ( context == "bundled" ) {
that->m_activePackages = OUSTR(
"vnd.sun.star.expand:$BUNDLED_EXTENSIONS");
that->m_registrationData = OUSTR(
@@ -396,7 +396,7 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create(
//No stamp file. We assume that bundled is always readonly. It must not be
//modified from ExtensionManager but only by the installer
}
else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bundled_prereg") )) {
else if ( context == "bundled_prereg" ) {
//This is a bundled repository but the registration data
//is in the brand layer: share/prereg
//It is special because the registration data are copied at the first startup
@@ -414,7 +414,7 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create(
logFile = OUSTR(
"vnd.sun.star.expand:$BUNDLED_EXTENSIONS_PREREG/log.txt");
}
else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("tmp") )) {
else if ( context == "tmp" ) {
that->m_activePackages = OUSTR(
"vnd.sun.star.expand:$TMP_EXTENSIONS/extensions");
that->m_registrationData = OUSTR(

4
i18npool/source/collator/collator_unicode.cxx
View File

@@ -93,7 +93,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
if (hModule) {
const sal_uInt8* (*func)() = NULL;
aBuf.appendAscii("get_").append(rLocale.Language).appendAscii("_");
if (rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("zh"))) {
if ( rLocale.Language == "zh" ) {
OUString func_base = aBuf.makeStringAndClear();
if (OUString(RTL_CONSTASCII_USTRINGPARAM("TW HK MO")).indexOf(rLocale.Country) >= 0)
func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule,
@@ -101,7 +101,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
if (!func)
func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule, (func_base + rAlgorithm).pData);
} else {
if (rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ja"))) {
if ( rLocale.Language == "ja" ) {
// replace algrithm name to implementation name.
if (rAlgorithm.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("phonetic (alphanumeric first)")) )
aBuf.appendAscii("phonetic_alphanumeric_first");

6
i18npool/source/nativenumber/nativenumbersupplier.cxx
View File

@@ -766,7 +766,7 @@ sal_Int16 SAL_CALL NativeNumberSupplier::convertFromXmlAttributes( const NativeN
sal_Int16 num = sal::static_int_cast<sal_Int16>( number.indexOf(aAttr.Format) );
if (aAttr.Style.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("short"))) {
if ( aAttr.Style == "short" ) {
if (num == NumberChar_FullWidth)
return NativeNumberMode::NATNUM3;
else if (num == NumberChar_Hangul_ko)
@@ -775,7 +775,7 @@ sal_Int16 SAL_CALL NativeNumberSupplier::convertFromXmlAttributes( const NativeN
return NativeNumberMode::NATNUM1;
else if (natNumIn(num, natnum2, sizeof_natnum2))
return NativeNumberMode::NATNUM2;
} else if (aAttr.Style.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("medium"))) {
} else if ( aAttr.Style == "medium" ) {
if (num == NumberChar_Hangul_ko)
return NativeNumberMode::NATNUM11;
else if (num == NumberChar_he)
@@ -784,7 +784,7 @@ sal_Int16 SAL_CALL NativeNumberSupplier::convertFromXmlAttributes( const NativeN
return NativeNumberMode::NATNUM7;
else if (natNumIn(num, natnum2, sizeof_natnum2))
return NativeNumberMode::NATNUM8;
} else if (aAttr.Style.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("long"))) {
} else if ( aAttr.Style == "long" ) {
if (num == NumberChar_FullWidth)
return NativeNumberMode::NATNUM6;
else if (num == NumberChar_Hangul_ko)

14
sal/rtl/source/bootstrap.cxx
View File

@@ -480,24 +480,24 @@ bool Bootstrap_Impl::getValue(
if (override && getDirectValue(key, value, mode, requestStack)) {
return true;
}
if (key.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("_OS"))) {
if ( key == "_OS" ) {
rtl_uString_assign(
value, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(THIS_OS)).pData);
return true;
}
if (key.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("_ARCH"))) {
if ( key == "_ARCH" ) {
rtl_uString_assign(
value, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(THIS_ARCH)).pData);
return true;
}
if (key.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("_CPPU_ENV"))) {
if ( key == "_CPPU_ENV" ) {
rtl_uString_assign(
value,
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MY_STRING(CPPU_ENV))).
pData));
return true;
}
if (key.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ORIGIN"))) {
if ( key == "ORIGIN" ) {
rtl_uString_assign(
value,
_iniName.copy(
@@ -507,21 +507,21 @@ bool Bootstrap_Impl::getValue(
if (getAmbienceValue(key, value, mode, requestStack)) {
return true;
}
if (key.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SYSUSERCONFIG"))) {
if ( key == "SYSUSERCONFIG" ) {
rtl::OUString v;
bool b = osl::Security().getConfigDir(v);
EnsureNoFinalSlash(v);
rtl_uString_assign(value, v.pData);
return b;
}
if (key.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SYSUSERHOME"))) {
if ( key == "SYSUSERHOME" ) {
rtl::OUString v;
bool b = osl::Security().getHomeDir(v);
EnsureNoFinalSlash(v);
rtl_uString_assign(value, v.pData);
return b;
}
if (key.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SYSBINDIR"))) {
if ( key == "SYSBINDIR" ) {
getExecutableDirectory_Impl(value);
return true;
}

18
sc/source/ui/vba/vbaworkbook.cxx
View File

@@ -111,7 +111,7 @@ ScVbaWorkbook::getFileFormat( ) throw (::uno::RuntimeException)
// #FIXME - seems suspect should we not walk through the properties
// to find the FilterName
if (aArgs[0].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterName"))) {
if ( aArgs[0].Name == "FilterName" ) {
aArgs[0].Value >>= aFilterName;
} else {
aArgs[1].Value >>= aFilterName;
@@ -121,27 +121,27 @@ ScVbaWorkbook::getFileFormat( ) throw (::uno::RuntimeException)
aFileFormat = excel::XlFileFormat::xlCSV; //xlFileFormat.
}
if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DBF"))) {
if ( aFilterName == "DBF" ) {
aFileFormat = excel::XlFileFormat::xlDBF4;
}
if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DIF"))) {
if ( aFilterName == "DIF" ) {
aFileFormat = excel::XlFileFormat::xlDIF;
}
if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Lotus"))) {
if ( aFilterName == "Lotus" ) {
aFileFormat = excel::XlFileFormat::xlWK3;
}
if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MS Excel 4.0"))) {
if ( aFilterName == "MS Excel 4.0" ) {
aFileFormat = excel::XlFileFormat::xlExcel4Workbook;
}
if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MS Excel 5.0/95"))) {
if ( aFilterName == "MS Excel 5.0/95" ) {
aFileFormat = excel::XlFileFormat::xlExcel5;
}
if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MS Excel 97"))) {
if ( aFilterName == "MS Excel 97" ) {
aFileFormat = excel::XlFileFormat::xlExcel9795;
}
@@ -149,14 +149,14 @@ ScVbaWorkbook::getFileFormat( ) throw (::uno::RuntimeException)
aFileFormat = excel::XlFileFormat::xlHtml;
}
if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("calc_StarOffice_XML_Calc_Template"))) {
if ( aFilterName == "calc_StarOffice_XML_Calc_Template" ) {
aFileFormat = excel::XlFileFormat::xlTemplate;
}
if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("StarOffice XML (Calc)"))) {
aFileFormat = excel::XlFileFormat::xlWorkbookNormal;
}
if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("calc8"))) {
if ( aFilterName == "calc8" ) {
aFileFormat = excel::XlFileFormat::xlWorkbookNormal;
}

8
sfx2/source/doc/SfxDocumentMetaData.cxx
View File

@@ -1320,7 +1320,7 @@ void SAL_CALL SfxDocumentMetaData::init(
::rtl::OUString::createFromAscii(s_nsODFMeta),
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value-type")));
::rtl::OUString text = getNodeText(*it);
if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("float"))) {
if ( type == "float" ) {
double d;
if (::sax::Converter::convertDouble(d, text)) {
any <<= d;
@@ -1329,7 +1329,7 @@ void SAL_CALL SfxDocumentMetaData::init(
OUStringToOString(text, RTL_TEXTENCODING_UTF8).getStr());
continue;
}
} else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("date"))) {
} else if ( type == "date" ) {
bool isDateTime;
css::util::Date d;
css::util::DateTime dt;
@@ -1344,7 +1344,7 @@ void SAL_CALL SfxDocumentMetaData::init(
OUStringToOString(text, RTL_TEXTENCODING_UTF8).getStr());
continue;
}
} else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("time"))) {
} else if ( type == "time" ) {
css::util::Duration ud;
if (textToDuration(ud, text)) {
any <<= ud;
@@ -1353,7 +1353,7 @@ void SAL_CALL SfxDocumentMetaData::init(
OUStringToOString(text, RTL_TEXTENCODING_UTF8).getStr());
continue;
}
} else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("boolean"))) {
} else if ( type == "boolean" ) {
bool b;
if (::sax::Converter::convertBool(b, text)) {
any <<= b;

6
shell/source/backends/desktopbe/desktopbackend.cxx
View File

@@ -237,19 +237,19 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
}
// Fall back to the default if the specific backend is not available:
css::uno::Reference< css::uno::XInterface > backend;
if (desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GNOME"))) {
if ( desktop == "GNOME" ) {
backend = createBackend(
context,
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.backend.GconfBackend")));
} else if (desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KDE"))) {
} else if ( desktop == "KDE" ) {
backend = createBackend(
context,
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.backend.KDEBackend")));
} else if (desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KDE4"))) {
} else if ( desktop == "KDE4" ) {
backend = createBackend(
context,
rtl::OUString(

6
shell/source/backends/kde4be/kde4access.cxx
View File

@@ -57,7 +57,7 @@ namespace uno = css::uno ;
}
css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ExternalMailer"))) {
if ( id == "ExternalMailer" ) {
KEMailSettings aEmailSettings;
QString aClientProgram;
::rtl::OUString sClientProgram;
@@ -273,7 +273,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
return css::beans::Optional< css::uno::Any >(
true, uno::makeAny( nPort ) );
}
} else if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy"))) {
} else if ( id == "ooInetNoProxy" ) {
QString aNoProxyFor;
switch ( KProtocolManager::proxyType() )
{
@@ -295,7 +295,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
return css::beans::Optional< css::uno::Any >(
true, uno::makeAny( sNoProxyFor ) );
}
} else if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooInetProxyType"))) {
} else if ( id == "ooInetProxyType" ) {
int nProxyType;
switch ( KProtocolManager::proxyType() )
{

6
shell/source/backends/kdebe/kdeaccess.cxx
View File

@@ -53,7 +53,7 @@ namespace uno = css::uno ;
}
css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ExternalMailer"))) {
if ( id == "ExternalMailer" ) {
KEMailSettings aEmailSettings;
QString aClientProgram;
::rtl::OUString sClientProgram;
@@ -269,7 +269,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
return css::beans::Optional< css::uno::Any >(
true, uno::makeAny( nPort ) );
}
} else if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy"))) {
} else if ( id == "ooInetNoProxy" ) {
QString aNoProxyFor;
switch ( KProtocolManager::proxyType() )
{
@@ -291,7 +291,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
return css::beans::Optional< css::uno::Any >(
true, uno::makeAny( sNoProxyFor ) );
}
} else if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooInetProxyType"))) {
} else if ( id == "ooInetProxyType" ) {
int nProxyType;
switch ( KProtocolManager::proxyType() )
{

2
shell/source/backends/localebe/localebackend.cxx
View File

@@ -294,7 +294,7 @@ css::uno::Any LocaleBackend::getPropertyValue(
css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
css::uno::RuntimeException)
{
if (PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Locale"))) {
if ( PropertyName == "Locale" ) {
return css::uno::makeAny(
css::beans::Optional< css::uno::Any >(
true, css::uno::makeAny(getLocale())));

4
stoc/source/uriproc/UriReferenceFactory.cxx
View File

@@ -282,12 +282,12 @@ void processSegments(
for (sal_Int32 i = 0; i < count; ++i) {
if (processSpecialSegments) {
rtl::OUString segment(uriReference->getPathSegment(i));
if (segment.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("."))) {
if ( segment == "." ) {
if (!base && i == count - 1) {
segments.push_back(0);
}
continue;
} else if (segment.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".."))) {
} else if ( segment == ".." ) {
if (segments.empty()
|| /*MSVC trouble: std::*/abs(segments.back()) == 1)
{

2
ucb/source/ucp/ftp/ftpcontent.cxx
View File

@@ -893,7 +893,7 @@ Sequence<Any> FTPContent::setPropertyValues(
osl::MutexGuard aGuard(m_aMutex);
for(sal_Int32 i = 0; i < ret.getLength(); ++i) {
if(seqPropVal[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Title"))) {
if ( seqPropVal[i].Name == "Title" ) {
rtl::OUString Title;
if(!(seqPropVal[i].Value >>= Title)) {
ret[i] <<= IllegalTypeException();

2
vcl/source/app/svapp.cxx
View File

@@ -1708,7 +1708,7 @@ bool Application::IsHeadlessModeRequested()
for (sal_uInt32 i = 0; i < n; ++i) {
rtl::OUString arg;
rtl_getAppCommandArg(i, &arg.pData);
if (arg.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("--headless"))) {
if ( arg == "--headless" ) {
return true;
}
}