summaryrefslogtreecommitdiff
path: root/testtools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-04 08:29:36 +0200
committerNoel Grandin <noel@peralex.com>2015-11-04 14:10:44 +0200
commit59b072e22b0610abc7ffdbc75873ef5cbba58de7 (patch)
tree663c2d01a983508f9b22ec87fae29b16ab5a1683 /testtools
parentbaa411b59c3840a4dddf5447a0b4583eb5edea74 (diff)
yyyyy
Change-Id: I9a947beefd2dfe21da8239e841ea3fb416bd1548
Diffstat (limited to 'testtools')
-rw-r--r--testtools/source/bridgetest/bridgetest.cxx2
-rw-r--r--testtools/source/bridgetest/cppobj.cxx4
-rw-r--r--testtools/source/bridgetest/multi.cxx24
3 files changed, 13 insertions, 17 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index 6eb89778ff92..679dce605d9a 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -1268,7 +1268,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
Reference< XInterface > xFactory(
createSingleComponentFactory(
bridge_test::TestBridgeImpl_create,
- OUString( IMPLNAME ),
+ IMPLNAME,
bridge_test::getSupportedServiceNames() ) );
if (xFactory.is())
diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx
index eee2194febd4..57b7b4750824 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -962,7 +962,7 @@ void Test_Impl::testConstructorsService(
0.123f,
0.456,
'X',
- OUString("test"),
+ "test",
UnoType< Any >::get(),
makeAny(true),
arg14,
@@ -1189,7 +1189,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
{
Reference< XSingleServiceFactory > xFactory( createSingleFactory(
static_cast< XMultiServiceFactory * >( pServiceManager ),
- OUString( IMPLNAME ),
+ IMPLNAME,
bridge_object::Test_Impl_create,
bridge_object::getSupportedServiceNames() ) );
diff --git a/testtools/source/bridgetest/multi.cxx b/testtools/source/bridgetest/multi.cxx
index 0c20128345a0..15aef4d18593 100644
--- a/testtools/source/bridgetest/multi.cxx
+++ b/testtools/source/bridgetest/multi.cxx
@@ -127,29 +127,27 @@ OUString testMulti(
OUString("12" "abc"),
css::uno::Reference< test::testtools::bridgetest::XMultiBase1 >(
multi, css::uno::UNO_QUERY_THROW)->fn12(
- OUString("abc")));
+ "abc"));
checkEqual(
OUString("12" "abc-2"),
static_cast< test::testtools::bridgetest::XMultiBase2 * >(
- multi.get())->fn12(OUString("abc-2")));
+ multi.get())->fn12("abc-2"));
checkEqual(
OUString("12" "abc-2"),
css::uno::Reference< test::testtools::bridgetest::XMultiBase2 >(
- multi, css::uno::UNO_QUERY_THROW)->fn12(
- OUString("abc-2")));
+ multi, css::uno::UNO_QUERY_THROW)->fn12("abc-2"));
checkEqual(
OUString("12" "abc-5"),
static_cast< test::testtools::bridgetest::XMultiBase5 * >(
- multi.get())->fn12(OUString("abc-5")));
+ multi.get())->fn12("abc-5"));
checkEqual(
OUString("12" "abc-5"),
css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
- multi, css::uno::UNO_QUERY_THROW)->fn12(
- OUString("abc-5")));
+ multi, css::uno::UNO_QUERY_THROW)->fn12("abc-5"));
checkEqual< sal_Int32 >(21 * 2, multi->fn21(2));
checkEqual(
OUString("22" "de"),
- multi->fn22(OUString("de")));
+ multi->fn22("de"));
checkEqual< sal_Int32 >(
31 * 3,
css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >(
@@ -191,17 +189,15 @@ OUString testMulti(
checkEqual(
OUString("32" "f"),
css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >(
- multi, css::uno::UNO_QUERY_THROW)->fn32(
- OUString("f")));
+ multi, css::uno::UNO_QUERY_THROW)->fn32("f"));
checkEqual(
OUString("32" "f-5"),
static_cast< test::testtools::bridgetest::XMultiBase5 * >(
- multi.get())->fn32(OUString("f-5")));
+ multi.get())->fn32("f-5"));
checkEqual(
OUString("32" "f-5"),
css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
- multi, css::uno::UNO_QUERY_THROW)->fn32(
- OUString("f-5")));
+ multi, css::uno::UNO_QUERY_THROW)->fn32("f-5"));
checkEqual< sal_Int32 >(
33,
css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >(
@@ -222,7 +218,7 @@ OUString testMulti(
checkEqual< sal_Int32 >(71 * 7, multi->fn71(7));
checkEqual(
OUString("72" "g"),
- multi->fn72(OUString("g")));
+ multi->fn72("g"));
checkEqual< sal_Int32 >(73, multi->fn73());
} catch (CheckFailed const & f) {
return f.message;