summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2022-05-04 22:33:03 +0200
committerStephan Bergmann <sbergman@redhat.com>2022-05-05 07:13:54 +0200
commitb5ab864096c6b099e6a79587f881f287234278f9 (patch)
treea4cd8ca99bda1cbdfe9d0ba12e0d556982b9049b /basic
parent3db0b7549e198ac0719ff52bff38a3d79e212083 (diff)
Just use Any ctor instead of makeAny in basic
Change-Id: I21d9679064c4e68a1492d3550f083c3c91b5b43b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133848 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'basic')
-rw-r--r--basic/qa/cppunit/test_vba.cxx4
-rw-r--r--basic/source/classes/sbxmod.cxx6
-rw-r--r--basic/source/runtime/methods1.cxx108
-rw-r--r--basic/source/uno/namecont.cxx2
4 files changed, 60 insertions, 60 deletions
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 68d9bbaf2570..6ac6974fc081 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -236,8 +236,8 @@ void VBATest::testMiscOLEStuff()
uno::Sequence< uno::Any > aArgs
{
- uno::makeAny(sPath),
- uno::makeAny(OUString(o3tl::toU(pODBCDriverName)))
+ uno::Any(sPath),
+ uno::Any(OUString(o3tl::toU(pODBCDriverName)))
};
for ( sal_uInt32 i=0; i<std::size( macroSource ); ++i )
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 93feaf984d4d..67bf03ef9ecb 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -2616,9 +2616,9 @@ void SbUserFormModule::InitObject()
uno::Sequence< uno::Any > aArgs
{
uno::Any(),
- makeAny(m_xDialog),
- makeAny(m_xModel),
- makeAny(GetParent()->GetName())
+ Any(m_xDialog),
+ Any(m_xModel),
+ Any(GetParent()->GetName())
};
pDocObject = new SbUnoObject( GetName(), uno::Any( xVBAFactory->createInstanceWithArguments( "ooo.vba.msforms.UserForm", aArgs ) ) );
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 8fbe9ff65a7f..6ce744dbe034 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -2446,10 +2446,10 @@ void SbRtl_SYD(StarBASIC *, SbxArray & rPar, bool)
Sequence< Any > aParams
{
- makeAny(rPar.Get(1)->GetDouble()),
- makeAny(rPar.Get(2)->GetDouble()),
- makeAny(rPar.Get(3)->GetDouble()),
- makeAny(rPar.Get(4)->GetDouble())
+ Any(rPar.Get(1)->GetDouble()),
+ Any(rPar.Get(2)->GetDouble()),
+ Any(rPar.Get(3)->GetDouble()),
+ Any(rPar.Get(4)->GetDouble())
};
CallFunctionAccessFunction(aParams, "SYD", rPar.Get(0));
@@ -2469,9 +2469,9 @@ void SbRtl_SLN(StarBASIC *, SbxArray & rPar, bool)
Sequence< Any > aParams
{
- makeAny(rPar.Get(1)->GetDouble()),
- makeAny(rPar.Get(2)->GetDouble()),
- makeAny(rPar.Get(3)->GetDouble())
+ Any(rPar.Get(1)->GetDouble()),
+ Any(rPar.Get(2)->GetDouble()),
+ Any(rPar.Get(3)->GetDouble())
};
CallFunctionAccessFunction(aParams, "SLN", rPar.Get(0));
@@ -2511,11 +2511,11 @@ void SbRtl_Pmt(StarBASIC *, SbxArray & rPar, bool)
Sequence< Any > aParams
{
- makeAny(rate),
- makeAny(nper),
- makeAny(pmt),
- makeAny(fv),
- makeAny(type)
+ Any(rate),
+ Any(nper),
+ Any(pmt),
+ Any(fv),
+ Any(type)
};
CallFunctionAccessFunction(aParams, "Pmt", rPar.Get(0));
@@ -2556,12 +2556,12 @@ void SbRtl_PPmt(StarBASIC *, SbxArray & rPar, bool)
Sequence< Any > aParams
{
- makeAny(rate),
- makeAny(per),
- makeAny(nper),
- makeAny(pv),
- makeAny(fv),
- makeAny(type)
+ Any(rate),
+ Any(per),
+ Any(nper),
+ Any(pv),
+ Any(fv),
+ Any(type)
};
CallFunctionAccessFunction(aParams, "PPmt", rPar.Get(0));
@@ -2601,11 +2601,11 @@ void SbRtl_PV(StarBASIC *, SbxArray & rPar, bool)
Sequence< Any > aParams
{
- makeAny(rate),
- makeAny(nper),
- makeAny(pmt),
- makeAny(fv),
- makeAny(type)
+ Any(rate),
+ Any(nper),
+ Any(pmt),
+ Any(fv),
+ Any(type)
};
CallFunctionAccessFunction(aParams, "PV", rPar.Get(0));
@@ -2631,7 +2631,7 @@ void SbRtl_NPV(StarBASIC *, SbxArray & rPar, bool)
Sequence< Any > aParams
{
- makeAny(rPar.Get(1)->GetDouble()),
+ Any(rPar.Get(1)->GetDouble()),
aValues
};
@@ -2672,11 +2672,11 @@ void SbRtl_NPer(StarBASIC *, SbxArray & rPar, bool)
Sequence< Any > aParams
{
- makeAny(rate),
- makeAny(pmt),
- makeAny(pv),
- makeAny(fv),
- makeAny(type)
+ Any(rate),
+ Any(pmt),
+ Any(pv),
+ Any(fv),
+ Any(type)
};
CallFunctionAccessFunction(aParams, "NPer", rPar.Get(0));
@@ -2705,8 +2705,8 @@ void SbRtl_MIRR(StarBASIC *, SbxArray & rPar, bool)
Sequence< Any > aParams
{
aValues,
- makeAny(rPar.Get(2)->GetDouble()),
- makeAny(rPar.Get(3)->GetDouble())
+ Any(rPar.Get(2)->GetDouble()),
+ Any(rPar.Get(3)->GetDouble())
};
CallFunctionAccessFunction(aParams, "MIRR", rPar.Get(0));
@@ -2742,7 +2742,7 @@ void SbRtl_IRR(StarBASIC *, SbxArray & rPar, bool)
Sequence< Any > aParams
{
aValues,
- makeAny(guess)
+ Any(guess)
};
CallFunctionAccessFunction(aParams, "IRR", rPar.Get(0));
@@ -2783,12 +2783,12 @@ void SbRtl_IPmt(StarBASIC *, SbxArray & rPar, bool)
Sequence< Any > aParams
{
- makeAny(rate),
- makeAny(per),
- makeAny(nper),
- makeAny(pv),
- makeAny(fv),
- makeAny(type)
+ Any(rate),
+ Any(per),
+ Any(nper),
+ Any(pv),
+ Any(fv),
+ Any(type)
};
CallFunctionAccessFunction(aParams, "IPmt", rPar.Get(0));
@@ -2828,11 +2828,11 @@ void SbRtl_FV(StarBASIC *, SbxArray & rPar, bool)
Sequence< Any > aParams
{
- makeAny(rate),
- makeAny(nper),
- makeAny(pmt),
- makeAny(pv),
- makeAny(type)
+ Any(rate),
+ Any(nper),
+ Any(pmt),
+ Any(pv),
+ Any(type)
};
CallFunctionAccessFunction(aParams, "FV", rPar.Get(0));
@@ -2866,11 +2866,11 @@ void SbRtl_DDB(StarBASIC *, SbxArray & rPar, bool)
Sequence< Any > aParams
{
- makeAny(cost),
- makeAny(salvage),
- makeAny(life),
- makeAny(period),
- makeAny(factor)
+ Any(cost),
+ Any(salvage),
+ Any(life),
+ Any(period),
+ Any(factor)
};
CallFunctionAccessFunction(aParams, "DDB", rPar.Get(0));
@@ -2923,12 +2923,12 @@ void SbRtl_Rate(StarBASIC *, SbxArray & rPar, bool)
Sequence< Any > aParams
{
- makeAny(nper),
- makeAny(pmt),
- makeAny(pv),
- makeAny(fv),
- makeAny(type),
- makeAny(guess)
+ Any(nper),
+ Any(pmt),
+ Any(pv),
+ Any(fv),
+ Any(type),
+ Any(guess)
};
CallFunctionAccessFunction(aParams, "Rate", rPar.Get(0));
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index d9a479b7bb99..86b7d699fe9a 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -2887,7 +2887,7 @@ void SAL_CALL SfxLibraryContainer::setPropertyValue(const OUString& aPropertyNam
css::uno::Any SAL_CALL SfxLibraryContainer::getPropertyValue(const OUString& aPropertyName)
{
if (aPropertyName == sVBATextEncodingPropName)
- return uno::makeAny(meVBATextEncoding);
+ return uno::Any(meVBATextEncoding);
throw UnknownPropertyException(aPropertyName, static_cast<uno::XWeak*>(this));
}