summaryrefslogtreecommitdiff
path: root/testtools/source/bridgetest
diff options
context:
space:
mode:
Diffstat (limited to 'testtools/source/bridgetest')
-rw-r--r--testtools/source/bridgetest/bridgetest.cxx19
-rw-r--r--testtools/source/bridgetest/constructors.cxx14
-rw-r--r--testtools/source/bridgetest/cppobj.cxx20
-rw-r--r--testtools/source/bridgetest/multi.hxx10
4 files changed, 29 insertions, 34 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index f14a641f1af7..4f268434d321 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -570,7 +570,7 @@ static sal_Bool performTest(
bRet &= check(tps1.member == 12345, "transportPolyHyper");
Sequence< Any > seq(2);
seq[0] <<= static_cast< sal_uInt32 >(33);
- seq[1] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ABC"));
+ seq[1] <<= rtl::OUString("ABC");
TestPolyStruct< Sequence< Any > > tps2(seq);
TestPolyStruct< Sequence< Any > > tps3;
xLBT->transportPolySequence(tps2, tps3);
@@ -595,8 +595,7 @@ static sal_Bool performTest(
bRet &= check(
(((nullAny.getValueTypeName() ==
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.uno.XInterface"))) &&
+ "com.sun.star.uno.XInterface")) &&
!static_cast< Reference< XInterface > const * >(
nullAny.getValue())->is())
|| nullAny == Any()),
@@ -658,9 +657,9 @@ static sal_Bool performTest(
float _arFloat[] = { 1.1f, 2.2f, 3.3f };
double _arDouble[] = { 1.11, 2.22, 3.33 };
OUString _arString[] = {
- OUString(RTL_CONSTASCII_USTRINGPARAM("String 1")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("String 2")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("String 3")) };
+ OUString("String 1"),
+ OUString("String 2"),
+ OUString("String 3") };
sal_Bool _aBool = true;
sal_Int32 _aInt = 0xBABEBABE;
float _aFloat = 3.14f;
@@ -1200,15 +1199,15 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs )
if (! xOriginal.is())
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "cannot get test object!") ),
+ OUString(
+ "cannot get test object!"),
Reference< XInterface >() );
}
Reference< XBridgeTest > xTest( xOriginal, UNO_QUERY );
if (! xTest.is())
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("test object does not implement XBridgeTest!") ),
+ OUString("test object does not implement XBridgeTest!"),
Reference< XInterface >() );
}
@@ -1223,7 +1222,7 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs )
if (! bRet)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("error: test failed!") ),
+ OUString("error: test failed!"),
Reference< XInterface >() );
}
}
diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx
index 400b44bdaac1..a4cf91077601 100644
--- a/testtools/source/bridgetest/constructors.cxx
+++ b/testtools/source/bridgetest/constructors.cxx
@@ -434,7 +434,7 @@ void Impl2::setatt1( double _att1 )throw (::com::sun::star::uno::RuntimeExceptio
::rtl::OUString Impl2::fn12( const ::rtl::OUString& arg )
throw (::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12")) + arg;
+ return ::rtl::OUString("12") + arg;
}
css::uno::Reference< css::uno::XInterface > SAL_CALL create(
@@ -447,14 +447,12 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create(
::rtl::OUString SAL_CALL getImplementationName() {
return ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "comp.test.testtools.bridgetest.Constructors"));
+ "comp.test.testtools.bridgetest.Constructors");
}
css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() {
css::uno::Sequence< ::rtl::OUString > s(1);
- s[0] = ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("test.testtools.bridgetest.Constructors"));
+ s[0] = ::rtl::OUString("test.testtools.bridgetest.Constructors");
return s;
}
@@ -468,14 +466,12 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create2(
::rtl::OUString SAL_CALL getImplementationName2() {
return ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "comp.test.testtools.bridgetest.Constructors2"));
+ "comp.test.testtools.bridgetest.Constructors2");
}
css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames2() {
css::uno::Sequence< ::rtl::OUString > s(1);
- s[0] = ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("test.testtools.bridgetest.Constructors2"));
+ s[0] = ::rtl::OUString("test.testtools.bridgetest.Constructors2");
return s;
}
diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx
index 58eae103cb91..9a0c0d7a6bfc 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -937,7 +937,7 @@ void Test_Impl::testConstructorsService(
Sequence< double > arg23(1); arg23[0] = 0.456;
Sequence< sal_Unicode > arg24(1); arg24[0] = 'X';
Sequence< OUString > arg25(1);
- arg25[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("test"));
+ arg25[0] = OUString("test");
Sequence< Type > arg26(1); arg26[0] = UnoType< Any >::get();
Sequence< Any > arg27(1); arg27[0] <<= true;
Sequence< Sequence< sal_Bool > > arg28(1);
@@ -961,7 +961,7 @@ void Test_Impl::testConstructorsService(
0.123f,
0.456,
'X',
- OUString(RTL_CONSTASCII_USTRINGPARAM("test")),
+ OUString("test"),
UnoType< Any >::get(),
makeAny(true),
arg14,
@@ -1003,7 +1003,7 @@ void Test_Impl::testConstructorsService(
args[9] <<= 0.456;
sal_Unicode arg10c = 'X';
args[10].setValue(&arg10c, UnoType< UnoCharType >::get());
- args[11] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("test"));
+ args[11] <<= OUString("test");
args[12] <<= UnoType< Any >::get();
args[13] <<= true;
args[14] <<= arg14;
@@ -1053,10 +1053,10 @@ void Test_Impl::testConstructorsService(
Sequence<TestPolyStruct<TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>,OUString> > > argSeq8(1);
argSeq8[0] = TestPolyStruct<TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>,OUString> > (
TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>,OUString>(
- TestPolyStruct2<sal_Unicode, Any>('X', Any(true)), OUString(RTL_CONSTASCII_USTRINGPARAM("test"))));
+ TestPolyStruct2<sal_Unicode, Any>('X', Any(true)), OUString("test")));
Sequence<TestPolyStruct2<OUString, TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> > > > argSeq9(1);
argSeq9[0] = TestPolyStruct2<OUString, TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> > >(
- OUString(RTL_CONSTASCII_USTRINGPARAM("test")), TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> >(
+ OUString("test"), TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> >(
'X', TestPolyStruct<Any>(Any(true))));
Sequence<TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>, TestPolyStruct<sal_Unicode> > > argSeq10(1);
argSeq10[0] = TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>, TestPolyStruct<sal_Unicode> >(
@@ -1072,11 +1072,11 @@ void Test_Impl::testConstructorsService(
argSeq13[0] = Sequence<TestPolyStruct<TestPolyStruct2<TestPolyStruct2<sal_Unicode,Any>,OUString> > >(1);
argSeq13[0][0] = TestPolyStruct<TestPolyStruct2<TestPolyStruct2<sal_Unicode,Any>,OUString> >(
TestPolyStruct2<TestPolyStruct2<sal_Unicode,Any>,OUString>(
- TestPolyStruct2<sal_Unicode,Any>('X', Any(true)), OUString(RTL_CONSTASCII_USTRINGPARAM("test"))));
+ TestPolyStruct2<sal_Unicode,Any>('X', Any(true)), OUString("test")));
Sequence<Sequence<TestPolyStruct2<OUString, TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> > > > > argSeq14(1);
argSeq14[0] = Sequence<TestPolyStruct2<OUString, TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> > > >(1);
argSeq14[0][0] = TestPolyStruct2<OUString, TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> > >(
- OUString(RTL_CONSTASCII_USTRINGPARAM("test")), TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> >(
+ OUString("test"), TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> >(
'X', TestPolyStruct<Any>(Any(true))));
Sequence<Sequence<TestPolyStruct2<TestPolyStruct2<sal_Unicode,Any>, TestPolyStruct<sal_Unicode> > > > argSeq15(1);
argSeq15[0] = Sequence<TestPolyStruct2<TestPolyStruct2<sal_Unicode,Any>, TestPolyStruct<sal_Unicode> > >(1);
@@ -1093,7 +1093,7 @@ void Test_Impl::testConstructorsService(
TestPolyStruct<sal_Int32>(SAL_MIN_INT32),
TestPolyStruct<sal_Int64>(SAL_MIN_INT64),
TestPolyStruct<sal_Unicode>('X'),
- TestPolyStruct<OUString>(OUString(RTL_CONSTASCII_USTRINGPARAM("test"))),
+ TestPolyStruct<OUString>(OUString("test")),
TestPolyStruct<float>(0.123f),
TestPolyStruct<double>(0.456),
TestPolyStruct<Reference<XInterface> >(static_cast<XBridgeTest2*>(this)),
@@ -1103,9 +1103,9 @@ void Test_Impl::testConstructorsService(
TestPolyStruct2<sal_Unicode, Any>('X', Any(true))),
TestPolyStruct<TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>,OUString> > (
TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>,OUString>(
- TestPolyStruct2<sal_Unicode, Any>('X', Any(true)), OUString(RTL_CONSTASCII_USTRINGPARAM("test")))),
+ TestPolyStruct2<sal_Unicode, Any>('X', Any(true)), OUString("test"))),
TestPolyStruct2<OUString, TestPolyStruct2<sal_Unicode,TestPolyStruct<Any> > >(
- OUString(RTL_CONSTASCII_USTRINGPARAM("test")),
+ OUString("test"),
TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> >('X', TestPolyStruct<Any>(Any(true)))),
TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>, TestPolyStruct<sal_Unicode> >(
TestPolyStruct2<sal_Unicode, Any>('X', Any(true)),
diff --git a/testtools/source/bridgetest/multi.hxx b/testtools/source/bridgetest/multi.hxx
index 0b306ed5fb7f..81f82af25fd5 100644
--- a/testtools/source/bridgetest/multi.hxx
+++ b/testtools/source/bridgetest/multi.hxx
@@ -50,7 +50,7 @@ public:
virtual rtl::OUString SAL_CALL fn12(rtl::OUString const & arg)
throw (com::sun::star::uno::RuntimeException)
- { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12")) + arg; }
+ { return rtl::OUString("12") + arg; }
virtual sal_Int32 SAL_CALL fn21(sal_Int32 arg)
throw (com::sun::star::uno::RuntimeException)
@@ -58,7 +58,7 @@ public:
virtual rtl::OUString SAL_CALL fn22(rtl::OUString const & arg)
throw (com::sun::star::uno::RuntimeException)
- { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("22")) + arg; }
+ { return rtl::OUString("22") + arg; }
virtual double SAL_CALL getatt3()
throw (com::sun::star::uno::RuntimeException)
@@ -74,7 +74,7 @@ public:
virtual rtl::OUString SAL_CALL fn32(rtl::OUString const & arg)
throw (com::sun::star::uno::RuntimeException)
- { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("32")) + arg; }
+ { return rtl::OUString("32") + arg; }
virtual sal_Int32 SAL_CALL fn33()
throw (com::sun::star::uno::RuntimeException)
@@ -90,7 +90,7 @@ public:
virtual rtl::OUString SAL_CALL fn62(rtl::OUString const & arg)
throw (com::sun::star::uno::RuntimeException)
- { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("62")) + arg; }
+ { return rtl::OUString("62") + arg; }
virtual sal_Int32 SAL_CALL fn71(sal_Int32 arg)
throw (com::sun::star::uno::RuntimeException)
@@ -98,7 +98,7 @@ public:
virtual rtl::OUString SAL_CALL fn72(rtl::OUString const & arg)
throw (com::sun::star::uno::RuntimeException)
- { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("72")) + arg; }
+ { return rtl::OUString("72") + arg; }
virtual sal_Int32 SAL_CALL fn73()
throw (com::sun::star::uno::RuntimeException)
generated by cgit (git 2.34.1) at 2025-03-21 10:42:49 +0000