summaryrefslogtreecommitdiffstats
path: root/sal
diff options
context:
space:
mode:
authorGert Faller <gertfaller@aliceadsl.fr>2010-12-10 23:43:43 +0100
committerGert Faller <gertfaller@aliceadsl.fr>2010-12-10 23:43:43 +0100
commitb6a70a0c13962d7c07b0af8fefca9f56e8e0b90b (patch)
tree65f833494776cbe8d5041b6dfaf73c5a6c3ecd56 /sal
parentRTL_CONSTASCII_USTRINGPARAM in ure 4 (diff)
downloadcore-b6a70a0c13962d7c07b0af8fefca9f56e8e0b90b.tar.gz
core-b6a70a0c13962d7c07b0af8fefca9f56e8e0b90b.zip
RTL_CONSTASCII_USTRINGPARAM in ure 5
Diffstat (limited to 'sal')
-rw-r--r--sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx2
-rw-r--r--sal/test/unloading/samplelib1.cxx8
-rw-r--r--sal/test/unloading/samplelib2.cxx6
-rw-r--r--sal/workben/t_osl_getVolInfo.cxx12
-rw-r--r--sal/workben/t_osl_joinProcess.cxx6
5 files changed, 17 insertions, 17 deletions
diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
index 0efb69351889..9c58f6c2f59a 100644
--- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
+++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
@@ -568,7 +568,7 @@ namespace rtl_Bootstrap
// ?? INHERITED_VALUE = ok now, which is set in set_001
printUString( suGetOrientValue );
- rtl::OUString suValue = rtl::OUString::createFromAscii( TESTSHL2_INI );
+ rtl::OUString suValue(RTL_CONSTASCII_USTRINGPARAM( TESTSHL2_INI ));
// set to another value
Bootstrap::set( suName, suValue );
rtl::OUString suGetValue;
diff --git a/sal/test/unloading/samplelib1.cxx b/sal/test/unloading/samplelib1.cxx
index 1988b7394174..5199e25a6078 100644
--- a/sal/test/unloading/samplelib1.cxx
+++ b/sal/test/unloading/samplelib1.cxx
@@ -148,24 +148,24 @@ extern "C" {
{
Reference< XRegistryKey > xNewKey(
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
- OUString::createFromAscii( "/" IMPLNAME1 "/UNO/SERVICES" ) ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME1 "/UNO/SERVICES" )) ) );
xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1)));
xNewKey=
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
- OUString::createFromAscii( "/" IMPLNAME2 "/UNO/SERVICES" ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME2 "/UNO/SERVICES" )) );
xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME2)));
xNewKey=
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
- OUString::createFromAscii( "/" IMPLNAME3 "/UNO/SERVICES" ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME3 "/UNO/SERVICES" )) );
xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME3)));
xNewKey=
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
- OUString::createFromAscii( "/" IMPLNAME4 "/UNO/SERVICES" ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME4 "/UNO/SERVICES" )) );
xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME4)));
return sal_True;
diff --git a/sal/test/unloading/samplelib2.cxx b/sal/test/unloading/samplelib2.cxx
index 616dc13503c8..621dace1db20 100644
--- a/sal/test/unloading/samplelib2.cxx
+++ b/sal/test/unloading/samplelib2.cxx
@@ -138,18 +138,18 @@ extern "C" {
{
Reference< XRegistryKey > xNewKey(
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
- OUString::createFromAscii( "/" IMPLNAME1 "/UNO/SERVICES" ) ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME1 "/UNO/SERVICES" )) ) );
xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1)));
xNewKey=
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
- OUString::createFromAscii( "/" IMPLNAME2 "/UNO/SERVICES" ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME2 "/UNO/SERVICES" )) );
xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME2)));
xNewKey=
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
- OUString::createFromAscii( "/" IMPLNAME3 "/UNO/SERVICES" ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME3 "/UNO/SERVICES" )) );
xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME3)));
diff --git a/sal/workben/t_osl_getVolInfo.cxx b/sal/workben/t_osl_getVolInfo.cxx
index 8b6e929156ae..7504cd8dfdff 100644
--- a/sal/workben/t_osl_getVolInfo.cxx
+++ b/sal/workben/t_osl_getVolInfo.cxx
@@ -88,28 +88,28 @@ public:
void test_osl_getVolumeInformation()
{
- rtl::OUString path = rtl::OUString::createFromAscii(TEST_PATH_1);
+ rtl::OUString path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_1));
rtl::OUString path_url;
osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
test_getVolumeInformation(path_url);
- path = rtl::OUString::createFromAscii(TEST_PATH_2);
+ path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_2));
osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
test_getVolumeInformation(path_url);
- path = rtl::OUString::createFromAscii(TEST_PATH_3);
+ path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_3));
osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
test_getVolumeInformation(path_url);
- path = rtl::OUString::createFromAscii(TEST_PATH_4);
+ path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_4));
osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
test_getVolumeInformation(path_url);
- path = rtl::OUString::createFromAscii(TEST_PATH_5);
+ path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_5));
osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
test_getVolumeInformation(path_url);
- path = rtl::OUString::createFromAscii(TEST_PATH_6);
+ path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_6));
osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
test_getVolumeInformation(path_url);
}
diff --git a/sal/workben/t_osl_joinProcess.cxx b/sal/workben/t_osl_joinProcess.cxx
index 2202040ae673..40d19fe50c41 100644
--- a/sal/workben/t_osl_joinProcess.cxx
+++ b/sal/workben/t_osl_joinProcess.cxx
@@ -36,12 +36,12 @@
#include <signal.h>
#ifdef WNT
- const rtl::OUString IMAGE_NAME = rtl::OUString::createFromAscii("ojpx.exe");
+ const rtl::OUString IMAGE_NAME(RTL_CONSTASCII_USTRINGPARAM("ojpx.exe"));
#else
- const rtl::OUString IMAGE_NAME = rtl::OUString::createFromAscii("ojpx");
+ const rtl::OUString IMAGE_NAME(RTL_CONSTASCII_USTRINGPARAM("ojpx"));
#endif
-const rtl::OUString CWD = rtl::OUString::createFromAscii(".");
+const rtl::OUString CWD(RTL_CONSTASCII_USTRINGPARAM("."));
class Test_osl_Process : public CppUnit::TestFixture
{