diff options
author | Gert Faller <gertfaller@aliceadsl.fr> | 2010-12-10 19:09:53 +0100 |
---|---|---|
committer | Gert Faller <gertfaller@aliceadsl.fr> | 2010-12-10 19:09:53 +0100 |
commit | 94f0cc74ad22a94fc3bcb42bcbeaf0c4457567cc (patch) | |
tree | 7d2860b20cc88ce0d12b284e3ac5a81ac76d2e2f | |
parent | 76f15c814408af5a776683591600f70617557f62 (diff) |
RTL_CONSTASCII_USTRINGPARAM in ure 4
-rw-r--r-- | sal/osl/w32/procimpl.cxx | 2 | ||||
-rw-r--r-- | sal/qa/osl/file/osl_File.cxx | 2 | ||||
-rw-r--r-- | sal/qa/osl/file/test_cpy_wrt_file.cxx | 6 | ||||
-rw-r--r-- | sal/qa/osl/process/osl_process.cxx | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index 313fd0ec736b..87b47fe263a5 100644 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -63,7 +63,7 @@ extern "C" oslFileHandle SAL_CALL osl_createFileHandleFromOSHandle( HANDLE hFile const sal_Unicode NAME_VALUE_SEPARATOR = TEXT('='); const sal_Char* SPACE = " "; const rtl::OUString ENV_COMSPEC (RTL_CONSTASCII_USTRINGPARAM("COMSPEC")); -const rtl::OUString QUOTE = rtl::OUString::createFromAscii("\""); +const rtl::OUString QUOTE(RTL_CONSTASCII_USTRINGPARAM("\"")); namespace /* private */ { diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 4b02edb332f4..630bffc89b0c 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -6151,7 +6151,7 @@ namespace osl_Directory void with_relative_path() { FileBase::RC rc = Directory::createPath( - OUString::createFromAscii(TEST_PATH_POSTFIX)); + OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_POSTFIX))); CPPUNIT_ASSERT_MESSAGE ( diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx index 1796248d5f6a..77d1a44b1fb4 100644 --- a/sal/qa/osl/file/test_cpy_wrt_file.cxx +++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx @@ -52,10 +52,10 @@ public: void cp_file() { rtl::OUString src_url; - FileBase::getFileURLFromSystemPath(rtl::OUString::createFromAscii(COPY_SOURCE_PATH), src_url); + FileBase::getFileURLFromSystemPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(COPY_SOURCE_PATH)), src_url); rtl::OUString dest_url; - FileBase::getFileURLFromSystemPath(rtl::OUString::createFromAscii(COPY_DEST_PATH), dest_url); + FileBase::getFileURLFromSystemPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(COPY_DEST_PATH)), dest_url); FileBase::RC err = File::copy(src_url, dest_url); CPPUNIT_ASSERT_MESSAGE("Copy didn't recognized disk full", err != FileBase::E_None); @@ -79,7 +79,7 @@ public: void wrt_file() { rtl::OUString dest_url; - FileBase::getFileURLFromSystemPath(rtl::OUString::createFromAscii(WRITE_DEST_PATH), dest_url); + FileBase::getFileURLFromSystemPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(WRITE_DEST_PATH)), dest_url); File tmp_file(dest_url); rtl::OUString suErrorMsg = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("File creation failed: "))+ dest_url; diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index d3cea39002bc..b12657f7cba2 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -551,10 +551,10 @@ public: void osl_execProc_merged_child_environment() { rtl_uString* child_env[4]; - OUString env1 = OUString::createFromAscii(ENV1); - OUString env2 = OUString::createFromAscii(ENV2); - OUString env3 = OUString::createFromAscii(ENV3); - OUString env4 = OUString::createFromAscii(ENV4); + OUString env1(RTL_CONSTASCII_USTRINGPARAM(ENV1)); + OUString env2(RTL_CONSTASCII_USTRINGPARAM(ENV2)); + OUString env3(RTL_CONSTASCII_USTRINGPARAM(ENV3)); + OUString env4(RTL_CONSTASCII_USTRINGPARAM(ENV4)); child_env[0] = env1.pData; child_env[1] = env2.pData; |