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

automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings

Browse Source 
Done with a perl regex:

s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms

Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
This commit is contained in:
Thomas Arnhold
2013-03-19 09:22:44 +01:00
parent fe8eba5faa
commit 8b27d78b4a
1024 changed files with 6337 additions and 6666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cppu/source/AffineBridge/AffineBridge.cxx
View File

@@ -321,18 +321,18 @@ int AffineBridge::v_isValid(rtl::OUString * pReason)
{
int result = m_enterCount > 0;
if (!result)
*pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered"));
*pReason = rtl::OUString("not entered");
else
{
result = m_innerThreadId == osl_getThreadIdentifier(NULL);
if (!result)
*pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong thread"));
*pReason = rtl::OUString("wrong thread");
}
if (result)
*pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OK"));
*pReason = rtl::OUString("OK");
return result;
}

6
cppu/source/LogBridge/LogBridge.cxx
View File

@@ -112,18 +112,18 @@ int LogBridge::v_isValid(rtl::OUString * pReason)
int result = m_count > 0;
if (!result)
{
*pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered"));
*pReason = rtl::OUString("not entered");
}
else
{
result = m_threadId == osl_getThreadIdentifier(NULL);
if (!result)
*pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong thread"));
*pReason = rtl::OUString("wrong thread");
}
if (result)
*pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OK"));
*pReason = rtl::OUString("OK");
return result;
}

6
cppu/source/UnsafeBridge/UnsafeBridge.cxx
View File

@@ -121,18 +121,18 @@ int UnsafeBridge::v_isValid(rtl::OUString * pReason)
int result = m_count > 0;
if (!result)
{
*pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered"));
*pReason = rtl::OUString("not entered");
}
else
{
result = m_threadId == osl_getThreadIdentifier(NULL);
if (!result)
*pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong thread"));
*pReason = rtl::OUString("wrong thread");
}
if (result)
*pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OK"));
*pReason = rtl::OUString("OK");
return result;
}

2
cppu/source/typelib/typelib.cxx
View File

@@ -2183,7 +2183,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_getByName(
{
// Check for derived interface member type:
sal_Int32 i1 = name.lastIndexOf(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":@")));
rtl::OUString(":@"));
if (i1 >= 0) {
sal_Int32 i2 = i1 + RTL_CONSTASCII_LENGTH(":@");
sal_Int32 i3 = name.indexOf(',', i2);

2
cppu/source/uno/lbenv.cxx
View File

@@ -1122,7 +1122,7 @@ static uno_Environment * initDefaultEnvironment(
if (!envPurpose.isEmpty())
{
rtl::OUString libStem = envPurpose.copy(envPurpose.lastIndexOf(':') + 1);
libStem += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_uno_uno") );
libStem += rtl::OUString("_uno_uno");
if(!loadEnv(libStem, pEnv))
{