[Libreoffice-commits] core.git: testtools/source

[Stephan Bergmann (via logerrit)]

 testtools/source/bridgetest/cppobj.cxx                |    8 ++++----
 testtools/source/bridgetest/currentcontextchecker.cxx |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 82b9af26a64cd91173dbec43c1805bc069dd9f71
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue May 3 16:05:47 2022 +0200
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue May 3 20:02:54 2022 +0200

    Just use Any ctor instead of makeAny in testtools
    
    Change-Id: Ib895b2269805656a23a93c7e794e097a712bd401
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133762
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/testtools/source/bridgetest/cppobj.cxx 
b/testtools/source/bridgetest/cppobj.cxx
index 5bb4a3084ad8..13eb1e6440aa 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -747,7 +747,7 @@ void Test_Impl::setRuntimeException( sal_Int32 )
     RuntimeException aExc;
     aExc.Message          = _aData.String;
     aExc.Context          = _aData.Interface;
-    throwException( makeAny( aExc ) );
+    throwException( Any( aExc ) );
 }
 
 // XBridgeTest2 -------------------------------------------------------------
@@ -989,7 +989,7 @@ void Test_Impl::testConstructorsService(
         'X',
         "test",
         UnoType< Any >::get(),
-        makeAny(true),
+        Any(true),
         arg14,
         arg15,
         arg16,
@@ -1014,7 +1014,7 @@ void Test_Impl::testConstructorsService(
         TestEnum_TWO,
         TestStruct(10),
         TestPolyStruct< sal_Bool >(true),
-        TestPolyStruct< Any >(makeAny(true)),
+        TestPolyStruct< Any >(Any(true)),
         Reference< XInterface >(nullptr));
     Sequence< Any > args{
         Any(true),
@@ -1055,7 +1055,7 @@ void Test_Impl::testConstructorsService(
         Any(TestEnum_TWO),
         Any(TestStruct(10)),
         Any(TestPolyStruct< sal_Bool >(true)),
-        Any(TestPolyStruct< Any >(makeAny(true))),
+        Any(TestPolyStruct< Any >(Any(true))),
         Any(Reference< XInterface >(nullptr))
     };
     assert(args.getLength() == 40);
diff --git a/testtools/source/bridgetest/currentcontextchecker.cxx 
b/testtools/source/bridgetest/currentcontextchecker.cxx
index c00e8b76ee84..5852f85b9cbe 100644
--- a/testtools/source/bridgetest/currentcontextchecker.cxx
+++ b/testtools/source/bridgetest/currentcontextchecker.cxx
@@ -56,7 +56,7 @@ CurrentContext::CurrentContext() {}
 
 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();
 }
 
 }