diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 11:39:07 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 10:48:30 +0000 |
commit | 39d45390f4fab1e9e85f211d74ed2c08fda5b652 (patch) | |
tree | ac4b224a66a18429cd4722a61ee3d401f8e9951c /sal | |
parent | coverity#982271 Copy-paste error (diff) | |
download | core-39d45390f4fab1e9e85f211d74ed2c08fda5b652.tar.gz core-39d45390f4fab1e9e85f211d74ed2c08fda5b652.zip |
removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations
s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/$1\($2\)/gms
Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b
Reviewed-on: https://gerrit.libreoffice.org/2835
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sal')
-rw-r--r-- | sal/osl/unx/file_url.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/process.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/process_impl.cxx | 2 | ||||
-rw-r--r-- | sal/qa/rtl/ostring/rtl_string.cxx | 2 | ||||
-rw-r--r-- | sal/rtl/logfile.cxx | 2 | ||||
-rw-r--r-- | sal/test/testbootstrap.cxx | 4 | ||||
-rw-r--r-- | sal/test/unloading/unloadTest.cxx | 16 |
7 files changed, 15 insertions, 15 deletions
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx index e800a598a0c9..03de113eb335 100644 --- a/sal/osl/unx/file_url.cxx +++ b/sal/osl/unx/file_url.cxx @@ -764,7 +764,7 @@ namespace /* private */ bool find_in_PATH(const rtl::OUString& file_path, rtl::OUString& result) { bool bfound = false; - rtl::OUString path(RTL_CONSTASCII_USTRINGPARAM("PATH")); + rtl::OUString path("PATH"); rtl::OUString env_path; if (osl_Process_E_None == osl_getEnvironment(path.pData, &env_path.pData)) diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx index aa71c36b0258..810ad5d4855a 100644 --- a/sal/osl/unx/process.cxx +++ b/sal/osl/unx/process.cxx @@ -254,7 +254,7 @@ static void ChildStatusProc(void *pData) if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0)) OSL_TRACE("Failed to change uid and guid, errno=%d (%s)", errno, strerror(errno)); - const rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("HOME")); + const rtl::OUString envVar("HOME"); osl_clearEnvironment(envVar.pData); } diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index 723d10bcd436..bd1e5a2f9726 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -234,7 +234,7 @@ void SAL_CALL osl_setCommandArgs (int argc, char ** argv) /* see @ osl_getExecutableFile(). */ if (rtl_ustr_indexOfChar (rtl_uString_getStr(ppArgs[0]), sal_Unicode('/')) == -1) { - const rtl::OUString PATH (RTL_CONSTASCII_USTRINGPARAM("PATH")); + const rtl::OUString PATH ("PATH"); rtl_uString * pSearchPath = 0; osl_getEnvironment (PATH.pData, &pSearchPath); diff --git a/sal/qa/rtl/ostring/rtl_string.cxx b/sal/qa/rtl/ostring/rtl_string.cxx index 0356e9e397f5..bdf50f0441e3 100644 --- a/sal/qa/rtl/ostring/rtl_string.cxx +++ b/sal/qa/rtl/ostring/rtl_string.cxx @@ -108,7 +108,7 @@ namespace rtl_string void convertUStringToString_001() { - rtl::OUString suString(RTL_CONSTASCII_USTRINGPARAM("Hello")); + rtl::OUString suString("Hello"); rtl::OString sString; sal_Bool bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS); diff --git a/sal/rtl/logfile.cxx b/sal/rtl/logfile.cxx index c5396a7ac1a8..c33eb5800ae8 100644 --- a/sal/rtl/logfile.cxx +++ b/sal/rtl/logfile.cxx @@ -113,7 +113,7 @@ void init() { MutexGuard guard( getLogMutex() ); if( ! g_bHasBeenCalled ) { - OUString name( RTL_CONSTASCII_USTRINGPARAM( "RTL_LOGFILE" ) ); + OUString name( "RTL_LOGFILE" ); OUString value; if( rtl_bootstrap_get( name.pData, &value.pData, 0 ) ) { diff --git a/sal/test/testbootstrap.cxx b/sal/test/testbootstrap.cxx index 5de39f01de26..151b03a33cb1 100644 --- a/sal/test/testbootstrap.cxx +++ b/sal/test/testbootstrap.cxx @@ -69,8 +69,8 @@ int main( int argc, char *argv[] ) Bootstrap bootstrap(iniName); - OUString name( RTL_CONSTASCII_USTRINGPARAM( "MYBOOTSTRAPTESTVALUE" )); - OUString myDefault( RTL_CONSTASCII_USTRINGPARAM("$Default")); + OUString name( "MYBOOTSTRAPTESTVALUE" ); + OUString myDefault("$Default"); OUString value; sal_Bool useDefault; diff --git a/sal/test/unloading/unloadTest.cxx b/sal/test/unloading/unloadTest.cxx index 39ced7a05af9..b822f8ecba06 100644 --- a/sal/test/unloading/unloadTest.cxx +++ b/sal/test/unloading/unloadTest.cxx @@ -198,7 +198,7 @@ sal_Bool test1() rtl_unloadUnusedModules( NULL); // Try to get a symbol, must fail - OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sSymbol("component_getFactory"); void* pSymbol= osl_getSymbol( handleMod, sSymbol.pData); if( !pSymbol) @@ -242,7 +242,7 @@ sal_Bool test2() rtl_unloadUnusedModules( NULL); // Try to get a symbol, must fail - OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sSymbol("component_getFactory"); void* pSymbol= osl_getSymbol( handleMod, sSymbol.pData); if( !pSymbol) @@ -286,7 +286,7 @@ sal_Bool test3() rtl_unloadUnusedModules( NULL); // Try to get a symbol, must succeed - OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sSymbol("component_getFactory"); void* pSymbol= osl_getSymbol( handleMod, sSymbol.pData); if( pSymbol) @@ -334,7 +334,7 @@ sal_Bool test4() rtl_unloadUnusedModules( NULL); // Try to get a symbol, must fail - OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sSymbol("component_getFactory"); void* pSymbol= osl_getSymbol( handleMod1, sSymbol.pData); void* pSymbol2= osl_getSymbol( handleMod2, sSymbol.pData); @@ -354,7 +354,7 @@ sal_Bool test5() sal_Bool btest1= sal_False; OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1)); OUString lib2Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY2)); - OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sSymbol("component_getFactory"); { Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( OUString("applicat.rdb")); @@ -423,7 +423,7 @@ sal_Bool test6() oslModule handleMod2=0; OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1)); OUString lib2Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY2)); - OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sSymbol("component_getFactory"); { Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( OUString("applicat.rdb")); @@ -520,7 +520,7 @@ sal_Bool test8() printf("Test 8 ####################################################\n"); oslModule handleMod1=0; OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1)); - OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sSymbol("component_getFactory"); sal_Bool b_ifaceSupported=sal_False; sal_Bool b_instances_identical= sal_False; @@ -630,7 +630,7 @@ sal_Bool test9() // the service manager is still alive rtl_unloadUnusedModules( NULL); // Try to get a symbol, must fail - OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sSymbol("component_getFactory"); void* pSymbol= osl_getSymbol( handleMod, sSymbol.pData); if( pSymbol) |