diff options
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/multi.cxx | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/testtools/source/bridgetest/multi.cxx b/testtools/source/bridgetest/multi.cxx index 4cb4080464fe..c3cdc08294b2 100644 --- a/testtools/source/bridgetest/multi.cxx +++ b/testtools/source/bridgetest/multi.cxx @@ -135,32 +135,32 @@ rtl::OUString testMulti( css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >( multi, css::uno::UNO_QUERY_THROW)->fn11(5)); checkEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc")), + rtl::OUString("12" "abc"), css::uno::Reference< test::testtools::bridgetest::XMultiBase1 >( multi, css::uno::UNO_QUERY_THROW)->fn12( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")))); + rtl::OUString("abc"))); checkEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-2")), + rtl::OUString("12" "abc-2"), static_cast< test::testtools::bridgetest::XMultiBase2 * >( - multi.get())->fn12(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-2")))); + multi.get())->fn12(rtl::OUString("abc-2"))); checkEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-2")), + rtl::OUString("12" "abc-2"), css::uno::Reference< test::testtools::bridgetest::XMultiBase2 >( multi, css::uno::UNO_QUERY_THROW)->fn12( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-2")))); + rtl::OUString("abc-2"))); checkEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-5")), + rtl::OUString("12" "abc-5"), static_cast< test::testtools::bridgetest::XMultiBase5 * >( - multi.get())->fn12(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-5")))); + multi.get())->fn12(rtl::OUString("abc-5"))); checkEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-5")), + rtl::OUString("12" "abc-5"), css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >( multi, css::uno::UNO_QUERY_THROW)->fn12( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-5")))); + rtl::OUString("abc-5"))); checkEqual< sal_Int32 >(21 * 2, multi->fn21(2)); checkEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("22" "de")), - multi->fn22(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")))); + rtl::OUString("22" "de"), + multi->fn22(rtl::OUString("de"))); checkEqual< sal_Int32 >( 31 * 3, css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >( @@ -200,19 +200,19 @@ rtl::OUString testMulti( css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >( multi, css::uno::UNO_QUERY_THROW)->getatt3()); checkEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("32" "f")), + rtl::OUString("32" "f"), css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >( multi, css::uno::UNO_QUERY_THROW)->fn32( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("f")))); + rtl::OUString("f"))); checkEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("32" "f-5")), + rtl::OUString("32" "f-5"), static_cast< test::testtools::bridgetest::XMultiBase5 * >( - multi.get())->fn32(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("f-5")))); + multi.get())->fn32(rtl::OUString("f-5"))); checkEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("32" "f-5")), + rtl::OUString("32" "f-5"), css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >( multi, css::uno::UNO_QUERY_THROW)->fn32( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("f-5")))); + rtl::OUString("f-5"))); checkEqual< sal_Int32 >( 33, css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >( @@ -228,12 +228,12 @@ rtl::OUString testMulti( checkEqual< sal_Int32 >(41 * 4, multi->fn41(4)); checkEqual< sal_Int32 >(61 * 6, multi->fn61(6)); checkEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("62" "")), + rtl::OUString("62" ""), multi->fn62(rtl::OUString())); checkEqual< sal_Int32 >(71 * 7, multi->fn71(7)); checkEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("72" "g")), - multi->fn72(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("g")))); + rtl::OUString("72" "g"), + multi->fn72(rtl::OUString("g"))); checkEqual< sal_Int32 >(73, multi->fn73()); } catch (CheckFailed const & f) { return f.message; |