diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:22:44 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:00:26 +0000 |
| commit | 8b27d78b4afaa9c47ca0fda144c8060f2f14046b (patch) | |
| tree | 2dbddceebf0f96492adc5652697e8efce8a8ba06 /cppu/source | |
| parent | fe8eba5faa59ddf9ee82f3eb009daac72a0ec846 (diff) | |
automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
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>
Diffstat (limited to 'cppu/source')
| -rw-r--r-- | cppu/source/AffineBridge/AffineBridge.cxx | 6 | ||||
| -rw-r--r-- | cppu/source/LogBridge/LogBridge.cxx | 6 | ||||
| -rw-r--r-- | cppu/source/UnsafeBridge/UnsafeBridge.cxx | 6 | ||||
| -rw-r--r-- | cppu/source/typelib/typelib.cxx | 2 | ||||
| -rw-r--r-- | cppu/source/uno/lbenv.cxx | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx index 86d79f1f7564..1495f56adcc2 100644 --- a/cppu/source/AffineBridge/AffineBridge.cxx +++ b/cppu/source/AffineBridge/AffineBridge.cxx @@ -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; } diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index a1cacf442db8..a7c768fd42ea 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -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; } diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx index 382ed3e36f7f..6a5f4831f282 100644 --- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx +++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx @@ -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; } diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index b1e9cca1388c..d17299aba5af 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -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); diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 1909274c5d2a..93b5bf107562 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -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)) { |