summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2022-05-04 18:37:25 +0200
committerStephan Bergmann <sbergman@redhat.com>2022-05-04 21:45:59 +0200
commitcc6247a064360c943421a1cdcb996bf9a7324c2f (patch)
tree5a1d33bfd0d00898594555a0e2cc2d8da97e9fc9 /cppu
parent86132d8188e5e76623dc8053e5a43c1d69eb0831 (diff)
Just use Any ctor instead of makeAny in cppu
Change-Id: Ie178e13251b7cb1b69facbbc12e530f6dc4632ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133836 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'cppu')
-rw-r--r--cppu/qa/cppumaker/test_cppumaker.cxx6
-rw-r--r--cppu/qa/test_reference.cxx6
2 files changed, 6 insertions, 6 deletions
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
index 78097e26e854..a6d3e4942f06 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -475,7 +475,7 @@ void Test::testPolyStruct() {
CPPUNIT_ASSERT_EQUAL(
OUString(
"test.codemaker.cppumaker.Struct<char,short>"),
- (css::uno::makeAny(
+ (css::uno::Any(
test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()).
getValueType().getTypeName()));
@@ -494,7 +494,7 @@ void Test::testExceptions() {
test::codemaker::cppumaker::TestException1 e11(
"abc", nullptr, 1,
- css::uno::makeAny(123.0),
+ css::uno::Any(123.0),
test::codemaker::cppumaker::HelperEnum_ONE,
test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
test::codemaker::cppumaker::TestException1 e12(e11);
@@ -504,7 +504,7 @@ void Test::testExceptions() {
CPPUNIT_ASSERT_EQUAL(e11, e13);
test::codemaker::cppumaker::TestException2 e21(
"abc", nullptr, 1,
- css::uno::makeAny(123.0),
+ css::uno::Any(123.0),
test::codemaker::cppumaker::HelperEnum_ONE,
test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
test::codemaker::cppumaker::TestException2 e22(e21);
diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx
index 6ffb319077ed..698a8d5fe55a 100644
--- a/cppu/qa/test_reference.cxx
+++ b/cppu/qa/test_reference.cxx
@@ -49,12 +49,12 @@ public:
{
if (_type == cppu::UnoType<XInterface>::get())
{
- return css::uno::makeAny<css::uno::Reference<css::uno::XInterface>>(
- this);
+ return css::uno::Any(css::uno::Reference<css::uno::XInterface>(
+ this));
}
if (_type == cppu::UnoType<Interface1>::get())
{
- return css::uno::makeAny<css::uno::Reference<Interface1>>(this);
+ return css::uno::Any(css::uno::Reference<Interface1>(this));
}
return Any();