comphelper/qa/unit/types_test.cxx | 12 ++++++------
comphelper/qa/unit/variadictemplates.cxx | 12 ++++++------
comphelper/source/misc/configuration.cxx | 4 ++--
include/comphelper/configuration.hxx | 4 ++--
include/comphelper/namedvaluecollection.hxx | 4 ++--
5 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit eae2e1d6d61e7096d3fc0220832a1d1705d70093
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed May 4 19:33:06 2022 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed May 4 22:30:38 2022 +0200
Just use Any ctor instead of makeAny in comphelper
Change-Id: Ib3edbef27c2d25dae8bac07e0199af071131170e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133839
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/comphelper/qa/unit/types_test.cxx
b/comphelper/qa/unit/types_test.cxx
index a0f136a5f49f..c69b07199127 100644
--- a/comphelper/qa/unit/types_test.cxx
+++ b/comphelper/qa/unit/types_test.cxx
@@ -42,7 +42,7 @@ public:
void TypesTest::testGetINT64()
{
- CPPUNIT_ASSERT_EQUAL(sal_Int64(1337),
::comphelper::getINT64(uno::makeAny(sal_Int64(1337))));
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(1337),
::comphelper::getINT64(uno::Any(sal_Int64(1337))));
uno::Any aValue;
CPPUNIT_ASSERT_EQUAL(sal_Int64(0), ::comphelper::getINT64(aValue));
@@ -50,7 +50,7 @@ void TypesTest::testGetINT64()
void TypesTest::testGetINT32()
{
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1337),
::comphelper::getINT32(uno::makeAny(sal_Int32(1337))));
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1337),
::comphelper::getINT32(uno::Any(sal_Int32(1337))));
uno::Any aValue;
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), ::comphelper::getINT32(aValue));
@@ -58,7 +58,7 @@ void TypesTest::testGetINT32()
void TypesTest::testGetINT16()
{
- CPPUNIT_ASSERT_EQUAL(sal_Int16(1337),
::comphelper::getINT16(uno::makeAny(sal_Int16(1337))));
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(1337),
::comphelper::getINT16(uno::Any(sal_Int16(1337))));
uno::Any aValue;
CPPUNIT_ASSERT_EQUAL(sal_Int16(0), ::comphelper::getINT16(aValue));
@@ -66,7 +66,7 @@ void TypesTest::testGetINT16()
void TypesTest::testGetDouble()
{
- CPPUNIT_ASSERT_EQUAL(1337.1337,
::comphelper::getDouble(uno::makeAny(1337.1337)));
+ CPPUNIT_ASSERT_EQUAL(1337.1337,
::comphelper::getDouble(uno::Any(1337.1337)));
uno::Any aValue;
CPPUNIT_ASSERT_EQUAL(0.0, ::comphelper::getDouble(aValue));
@@ -75,7 +75,7 @@ void TypesTest::testGetDouble()
void TypesTest::testGetFloat()
{
CPPUNIT_ASSERT_EQUAL(static_cast<float>(1337.0),
-
::comphelper::getFloat(uno::makeAny(static_cast<float>(1337.0))));
+
::comphelper::getFloat(uno::Any(static_cast<float>(1337.0))));
uno::Any aValue;
CPPUNIT_ASSERT_EQUAL(static_cast<float>(0.0),
::comphelper::getFloat(aValue));
@@ -83,7 +83,7 @@ void TypesTest::testGetFloat()
void TypesTest::testGetString()
{
- CPPUNIT_ASSERT_EQUAL(OUString("1337"),
::comphelper::getString(uno::makeAny(OUString("1337"))));
+ CPPUNIT_ASSERT_EQUAL(OUString("1337"),
::comphelper::getString(uno::Any(OUString("1337"))));
uno::Any aValue;
CPPUNIT_ASSERT_EQUAL(OUString(""), ::comphelper::getString(aValue));
diff --git a/comphelper/qa/unit/variadictemplates.cxx
b/comphelper/qa/unit/variadictemplates.cxx
index e729d76b24ed..6b62204f487c 100644
--- a/comphelper/qa/unit/variadictemplates.cxx
+++ b/comphelper/qa/unit/variadictemplates.cxx
@@ -91,22 +91,22 @@ void VariadicTemplatesTest::testUnwrapArgs() {
sal_Int32 tmp2 = 42;
sal_uInt32 tmp3 = 42;
::com::sun::star::uno::Any tmp6(
- ::com::sun::star::uno::makeAny( tmp1 )
+ tmp1
);
::com::sun::star::uno::Any tmp7(
- ::com::sun::star::uno::makeAny( tmp2 )
+ tmp2
);
::com::sun::star::uno::Any tmp8(
- ::com::sun::star::uno::makeAny( tmp3 )
+ tmp3
);
::com::sun::star::uno::Any tmp9(
- ::com::sun::star::uno::makeAny( OUString("Test2") )
+ OUString("Test2")
);
::std::optional< ::com::sun::star::uno::Any > tmp10(
- ::com::sun::star::uno::makeAny( OUString("Test3") )
+ OUString("Test3")
);
::std::optional< ::com::sun::star::uno::Any > tmp11(
- ::com::sun::star::uno::makeAny( tmp1 )
+ tmp1
);
// test equality with the baseline and template specialization with
diff --git a/comphelper/source/misc/configuration.cxx
b/comphelper/source/misc/configuration.cxx
index a8ef15ac9178..097eabb6a345 100644
--- a/comphelper/source/misc/configuration.cxx
+++ b/comphelper/source/misc/configuration.cxx
@@ -145,8 +145,8 @@
comphelper::detail::ConfigurationWrapper::ConfigurationWrapper():
// set root path
css::uno::Sequence< css::uno::Any > params {
- css::uno::makeAny( css::beans::NamedValue{ "nodepath",
css::uno::makeAny( OUString("/"))} ),
- css::uno::makeAny( css::beans::NamedValue{ "locale",
css::uno::makeAny( OUString("*"))} ) };
+ css::uno::Any( css::beans::NamedValue{ "nodepath", css::uno::Any(
OUString("/"))} ),
+ css::uno::Any( css::beans::NamedValue{ "locale", css::uno::Any(
OUString("*"))} ) };
css::uno::Reference< css::uno::XInterface > xCfg
=
xConfigProvider->createInstanceWithArguments(u"com.sun.star.configuration.ConfigurationAccess",
diff --git a/include/comphelper/configuration.hxx
b/include/comphelper/configuration.hxx
index 622c65e95e52..3b8f8f1f7e93 100644
--- a/include/comphelper/configuration.hxx
+++ b/include/comphelper/configuration.hxx
@@ -140,7 +140,7 @@ private:
/// @internal
template< typename T > struct Convert {
static css::uno::Any toAny(T const & value)
- { return css::uno::makeAny(value); }
+ { return css::uno::Any(value); }
static T fromAny(css::uno::Any const & value)
{ return value.get< T >(); }
@@ -158,7 +158,7 @@ template< typename T > struct Convert< std::optional< T > >
{
static css::uno::Any toAny(std::optional< T > const & value) {
return value
- ? css::uno::makeAny(*value)
+ ? css::uno::Any(*value)
: css::uno::Any();
}
diff --git a/include/comphelper/namedvaluecollection.hxx
b/include/comphelper/namedvaluecollection.hxx
index 21c4bef31d24..33b786437d15 100644
--- a/include/comphelper/namedvaluecollection.hxx
+++ b/include/comphelper/namedvaluecollection.hxx
@@ -181,7 +181,7 @@ namespace comphelper
template < typename VALUE_TYPE >
bool put( const OUString& _rValueName, const VALUE_TYPE& _rValue )
{
- return impl_put( _rValueName, css::uno::makeAny( _rValue ) );
+ return impl_put( _rValueName, css::uno::Any( _rValue ) );
}
bool put( const OUString& _rValueName, const css::uno::Any& _rValue )
@@ -280,7 +280,7 @@ namespace comphelper
const VALUE_TYPE* pV = aValues.getConstArray();
const sal_Int32 nLen = aValues.getLength();
for( sal_Int32 i = 0; i < nLen; ++i )
- *(pO++) = css::uno::makeAny<VALUE_TYPE>( *(pV++) );
+ *(pO++) = css::uno::Any( *(pV++) );
return aWrappedValues;
}
