mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Just use Any ctor instead of makeAny in testtools

Browse Source 
Change-Id: Ib895b2269805656a23a93c7e794e097a712bd401
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133762
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2022-05-03 16:05:47 +02:00
parent 54725f6e5f
commit 82b9af26a6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
testtools/source/bridgetest/cppobj.cxx
View File

@@ -747,7 +747,7 @@ void Test_Impl::setRuntimeException( sal_Int32 )
RuntimeException aExc; RuntimeException aExc;
aExc.Message = _aData.String; aExc.Message = _aData.String;
aExc.Context = _aData.Interface; aExc.Context = _aData.Interface;
throwException( makeAny( aExc ) ); throwException( Any( aExc ) );
} }
// XBridgeTest2 ------------------------------------------------------------- // XBridgeTest2 -------------------------------------------------------------
@@ -989,7 +989,7 @@ void Test_Impl::testConstructorsService(
'X', 'X',
"test", "test",
UnoType< Any >::get(), UnoType< Any >::get(),
makeAny(true), Any(true),
arg14, arg14,
arg15, arg15,
arg16, arg16,
@@ -1014,7 +1014,7 @@ void Test_Impl::testConstructorsService(
TestEnum_TWO, TestEnum_TWO,
TestStruct(10), TestStruct(10),
TestPolyStruct< sal_Bool >(true), TestPolyStruct< sal_Bool >(true),
TestPolyStruct< Any >(makeAny(true)), TestPolyStruct< Any >(Any(true)),
Reference< XInterface >(nullptr)); Reference< XInterface >(nullptr));
Sequence< Any > args{ Sequence< Any > args{
Any(true), Any(true),
@@ -1055,7 +1055,7 @@ void Test_Impl::testConstructorsService(
Any(TestEnum_TWO), Any(TestEnum_TWO),
Any(TestStruct(10)), Any(TestStruct(10)),
Any(TestPolyStruct< sal_Bool >(true)), Any(TestPolyStruct< sal_Bool >(true)),
Any(TestPolyStruct< Any >(makeAny(true))), Any(TestPolyStruct< Any >(Any(true))),
Any(Reference< XInterface >(nullptr)) Any(Reference< XInterface >(nullptr))
}; };
assert(args.getLength() == 40); assert(args.getLength() == 40);

2
testtools/source/bridgetest/currentcontextchecker.cxx
View File

@@ -56,7 +56,7 @@ CurrentContext::CurrentContext() {}
css::uno::Any CurrentContext::getValueByName(OUString const & Name) css::uno::Any CurrentContext::getValueByName(OUString const & Name)
{ {
return Name == KEY ? css::uno::makeAny(OUString(VALUE)) : css::uno::Any(); return Name == KEY ? css::uno::Any(OUString(VALUE)) : css::uno::Any();
} }
} }