diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-05-30 14:31:24 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-05-30 14:31:24 +0200 |
commit | e630df7853a62225cd77fc4262689ef5607d2907 (patch) | |
tree | 7d9f994e96f9f2d14c26dccbca622ad147567a69 /testtools | |
parent | 46d5d475b114b93a76502d58637468e404a8562b (diff) |
Just use Any::operator <<= for sal_Unicode values
...now that sal_Unicode no longer clashes with sal_uInt16 on any platform (in
LIBO_INTERNAL_ONLY code), after e16fa715c43dcdf836ce8c400b6d54eae87b627d "Handle
wchar_t as native C++11 type on windows"
Change-Id: Id423dd6235bf14823fa5611b804c0974edbe64b3
Diffstat (limited to 'testtools')
-rw-r--r-- | testtools/source/bridgetest/bridgetest.cxx | 2 | ||||
-rw-r--r-- | testtools/source/bridgetest/cppobj.cxx | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index b4261947049c..207e1e398c3b 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -275,7 +275,7 @@ static bool performAnyTest( const Reference< XBridgeTest > &xLBT, const TestData } { - a.setValue( &(data.Char) , cppu::UnoType<cppu::UnoCharType>::get() ); + a <<= data.Char; OSL_ASSERT( xLBT->transportAny( a ) == a ); } diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index a5ca8bc61c21..8101f1efe11b 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -1003,8 +1003,7 @@ void Test_Impl::testConstructorsService( args[7] <<= SAL_MAX_UINT64; args[8] <<= 0.123f; args[9] <<= 0.456; - sal_Unicode arg10c = 'X'; - args[10].setValue(&arg10c, UnoType< UnoCharType >::get()); + args[10] <<= sal_Unicode('X'); args[11] <<= OUString("test"); args[12] <<= UnoType< Any >::get(); args[13] <<= true; @@ -1018,7 +1017,7 @@ void Test_Impl::testConstructorsService( args[21] <<= arg21; args[22] <<= arg22; args[23] <<= arg23; - args[24].setValue(&arg24, UnoType< UnoSequenceType< UnoCharType > >::get()); + args[24] <<= arg24; args[25] <<= arg25; args[26] <<= arg26; args[27] <<= arg27; |