summaryrefslogtreecommitdiff
path: root/testtools
diff options
context:
space:
mode:
authorGert Faller <gertfaller@aliceadsl.fr>2010-11-25 23:50:06 +0100
committerGert Faller <gertfaller@aliceadsl.fr>2010-11-25 23:50:06 +0100
commitb50f9fc50ba1e6b276ade74df612a81eba5e8bc8 (patch)
treee2cff1e3313962d69b24b34c19480591ab75b07a /testtools
parent85cc754593797bed25f2f31dbc8243db2d79c5b1 (diff)
RTL_CONSTASCII_USTRINGPARAM in testing
Notes
split repo tag: testing_LIBREOFFICE_PRE_BOOTSTRAP_BUILD
Diffstat (limited to 'testtools')
-rw-r--r--testtools/source/bridgetest/multi.cxx44
1 files changed, 22 insertions, 22 deletions
diff --git a/testtools/source/bridgetest/multi.cxx b/testtools/source/bridgetest/multi.cxx
index dd8558a29867..3437cd24b290 100644
--- a/testtools/source/bridgetest/multi.cxx
+++ b/testtools/source/bridgetest/multi.cxx
@@ -132,32 +132,32 @@ rtl::OUString testMulti(
css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
multi, css::uno::UNO_QUERY_THROW)->fn11(5));
checkEqual(
- rtl::OUString::createFromAscii("12" "abc"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc")),
css::uno::Reference< test::testtools::bridgetest::XMultiBase1 >(
multi, css::uno::UNO_QUERY_THROW)->fn12(
- rtl::OUString::createFromAscii("abc")));
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc"))));
checkEqual(
- rtl::OUString::createFromAscii("12" "abc-2"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-2")),
static_cast< test::testtools::bridgetest::XMultiBase2 * >(
- multi.get())->fn12(rtl::OUString::createFromAscii("abc-2")));
+ multi.get())->fn12(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-2"))));
checkEqual(
- rtl::OUString::createFromAscii("12" "abc-2"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-2")),
css::uno::Reference< test::testtools::bridgetest::XMultiBase2 >(
multi, css::uno::UNO_QUERY_THROW)->fn12(
- rtl::OUString::createFromAscii("abc-2")));
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-2"))));
checkEqual(
- rtl::OUString::createFromAscii("12" "abc-5"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-5")),
static_cast< test::testtools::bridgetest::XMultiBase5 * >(
- multi.get())->fn12(rtl::OUString::createFromAscii("abc-5")));
+ multi.get())->fn12(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-5"))));
checkEqual(
- rtl::OUString::createFromAscii("12" "abc-5"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-5")),
css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
multi, css::uno::UNO_QUERY_THROW)->fn12(
- rtl::OUString::createFromAscii("abc-5")));
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-5"))));
checkEqual< sal_Int32 >(21 * 2, multi->fn21(2));
checkEqual(
- rtl::OUString::createFromAscii("22" "de"),
- multi->fn22(rtl::OUString::createFromAscii("de")));
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("22" "de")),
+ multi->fn22(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de"))));
checkEqual< sal_Int32 >(
31 * 3,
css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >(
@@ -197,19 +197,19 @@ rtl::OUString testMulti(
css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
multi, css::uno::UNO_QUERY_THROW)->getatt3());
checkEqual(
- rtl::OUString::createFromAscii("32" "f"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("32" "f")),
css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >(
multi, css::uno::UNO_QUERY_THROW)->fn32(
- rtl::OUString::createFromAscii("f")));
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("f"))));
checkEqual(
- rtl::OUString::createFromAscii("32" "f-5"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("32" "f-5")),
static_cast< test::testtools::bridgetest::XMultiBase5 * >(
- multi.get())->fn32(rtl::OUString::createFromAscii("f-5")));
+ multi.get())->fn32(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("f-5"))));
checkEqual(
- rtl::OUString::createFromAscii("32" "f-5"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("32" "f-5")),
css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
multi, css::uno::UNO_QUERY_THROW)->fn32(
- rtl::OUString::createFromAscii("f-5")));
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("f-5"))));
checkEqual< sal_Int32 >(
33,
css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >(
@@ -225,12 +225,12 @@ rtl::OUString testMulti(
checkEqual< sal_Int32 >(41 * 4, multi->fn41(4));
checkEqual< sal_Int32 >(61 * 6, multi->fn61(6));
checkEqual(
- rtl::OUString::createFromAscii("62" ""),
- multi->fn62(rtl::OUString::createFromAscii("")));
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("62" "")),
+ multi->fn62(rtl::OUString()));
checkEqual< sal_Int32 >(71 * 7, multi->fn71(7));
checkEqual(
- rtl::OUString::createFromAscii("72" "g"),
- multi->fn72(rtl::OUString::createFromAscii("g")));
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("72" "g")),
+ multi->fn72(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("g"))));
checkEqual< sal_Int32 >(73, multi->fn73());
} catch (CheckFailed const & f) {
return f.message;