summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
Diffstat (limited to 'basic')
-rw-r--r--basic/qa/cppunit/test_vba.cxx4
-rw-r--r--basic/source/basmgr/basicmanagerrepository.cxx4
-rw-r--r--basic/source/basmgr/basmgr.cxx4
-rw-r--r--basic/source/classes/errobject.cxx6
-rw-r--r--basic/source/classes/eventatt.cxx4
-rw-r--r--basic/source/classes/sb.cxx2
-rw-r--r--basic/source/classes/sbxmod.cxx4
-rw-r--r--basic/source/runtime/methods1.cxx20
-rw-r--r--basic/source/uno/namecont.cxx16
-rw-r--r--basic/source/uno/scriptcont.cxx4
10 files changed, 34 insertions, 34 deletions
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index a0f3f3208cd1..e493c20a89b1 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -142,8 +142,8 @@ void VBATest::testMiscOLEStuff()
OUString sPath = m_directories.getPathFromSrc("/basic/qa/vba_tests/data/ADODBdata.xls");
sPath = sPath.replaceAll( "/", "\\" );
- aArgs[ 0 ] = uno::makeAny( sPath );
- aArgs[ 1 ] = uno::makeAny( OUString(pODBCDriverName) );
+ aArgs[ 0 ] <<= sPath;
+ aArgs[ 1 ] <<= OUString(pODBCDriverName);
for ( sal_uInt32 i=0; i<SAL_N_ELEMENTS( macroSource ); ++i )
{
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index 03d730985b2c..f7bff18bfc2f 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -309,7 +309,7 @@ namespace basic
// StarDesktop
Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext();
- pBasicManager->SetGlobalUNOConstant( "StarDesktop", makeAny( Desktop::create(xContext)));
+ pBasicManager->SetGlobalUNOConstant( "StarDesktop", css::uno::Any( Desktop::create(xContext)));
// (BasicLibraries and DialogLibraries have automatically been added in SetLibraryContainerInfo)
@@ -474,7 +474,7 @@ namespace basic
_out_rpBasicManager->GetLib(0)->SetParent( pAppBasic );
// global properties in the document's Basic
- _out_rpBasicManager->SetGlobalUNOConstant( "ThisComponent", makeAny( _rxDocumentModel ) );
+ _out_rpBasicManager->SetGlobalUNOConstant( "ThisComponent", css::uno::Any( _rxDocumentModel ) );
// notify
impl_notifyCreationListeners( _rxDocumentModel, *_out_rpBasicManager );
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index de6381071a73..9b0c92a850fc 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -608,8 +608,8 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo )
}
}
- SetGlobalUNOConstant( "BasicLibraries", makeAny( mpImpl->maContainerInfo.mxScriptCont ) );
- SetGlobalUNOConstant( "DialogLibraries", makeAny( mpImpl->maContainerInfo.mxDialogCont ) );
+ SetGlobalUNOConstant( "BasicLibraries", uno::Any( mpImpl->maContainerInfo.mxScriptCont ) );
+ SetGlobalUNOConstant( "DialogLibraries", uno::Any( mpImpl->maContainerInfo.mxDialogCont ) );
}
BasicManager::BasicManager( StarBASIC* pSLib, OUString* pLibPath, bool bDocMgr ) : mbDocMgr( bDocMgr )
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index baad83868410..d6fb2cca2866 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -78,7 +78,7 @@ ErrObject::setNumber( ::sal_Int32 _number )
{
GetSbData()->pInst->setErrorVB( _number, OUString() );
OUString _description = GetSbData()->pInst->GetErrorMsg();
- setData( uno::makeAny( _number ), uno::Any(), uno::makeAny( _description ), uno::Any(), uno::Any() );
+ setData( uno::Any( _number ), uno::Any(), uno::Any( _description ), uno::Any(), uno::Any() );
}
::sal_Int32 SAL_CALL
@@ -192,7 +192,7 @@ SbxErrObject::getUnoErrObject()
SbxVariableRef const &
SbxErrObject::getErrObject()
{
- static SbxVariableRef pGlobErr = new SbxErrObject( "Err", uno::makeAny( uno::Reference< vba::XErrObject >( new ErrObject() ) ) );
+ static SbxVariableRef pGlobErr = new SbxErrObject( "Err", uno::Any( uno::Reference< vba::XErrObject >( new ErrObject() ) ) );
return pGlobErr;
}
@@ -200,7 +200,7 @@ void SbxErrObject::setNumberAndDescription( ::sal_Int32 _number, const OUString&
{
if( m_pErrObject != nullptr )
{
- m_pErrObject->setData( uno::makeAny( _number ), uno::Any(), uno::makeAny( _description ), uno::Any(), uno::Any() );
+ m_pErrObject->setData( uno::Any( _number ), uno::Any(), uno::Any( _description ), uno::Any(), uno::Any() );
}
}
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 49a0163d26bf..05df7986ddfe 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -471,8 +471,8 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, bool bWrite )
aDecorationAny >>= bDecoration;
if( !bDecoration )
{
- xDlgModPropSet->setPropertyValue( aDecorationPropName, makeAny( true ) );
- xDlgModPropSet->setPropertyValue( "Title", makeAny( OUString() ) );
+ xDlgModPropSet->setPropertyValue( aDecorationPropName, Any( true ) );
+ xDlgModPropSet->setPropertyValue( "Title", Any( OUString() ) );
}
}
catch(const UnknownPropertyException& )
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index fa5019e05e0a..60d71c79a445 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -454,7 +454,7 @@ SbxObject* SbiFactory::CreateObject( const OUString& rClass )
Reference< XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory(), UNO_SET_THROW );
OUString aServiceName("ooo.vba.FileSystemObject");
Reference< XInterface > xInterface( xFactory->createInstance( aServiceName ), UNO_SET_THROW );
- return new SbUnoObject( aServiceName, uno::makeAny( xInterface ) );
+ return new SbUnoObject( aServiceName, uno::Any( xInterface ) );
}
catch(const Exception& )
{
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index f964ef2dd32d..c9c7b739e8ce 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -2165,7 +2165,7 @@ SbObjModule::SbObjModule( const OUString& rName, const css::script::ModuleInfo&
}
else if ( mInfo.ModuleObject.is() )
{
- SetUnoObject( uno::makeAny( mInfo.ModuleObject ) );
+ SetUnoObject( uno::Any( mInfo.ModuleObject ) );
}
}
@@ -2654,7 +2654,7 @@ void SbUserFormModule::InitObject()
aArgs[ 1 ] <<= m_xDialog;
aArgs[ 2 ] <<= m_xModel;
aArgs[ 3 ] <<= OUString( GetParent()->GetName() );
- pDocObject = new SbUnoObject( GetName(), uno::makeAny( xVBAFactory->createInstanceWithArguments( "ooo.vba.msforms.UserForm", aArgs ) ) );
+ pDocObject = new SbUnoObject( GetName(), uno::Any( xVBAFactory->createInstanceWithArguments( "ooo.vba.msforms.UserForm", aArgs ) ) );
uno::Reference< lang::XComponent > xComponent( m_xDialog, uno::UNO_QUERY_THROW );
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index eee8de4a90aa..f24e4268293f 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -2694,10 +2694,10 @@ RTLFUNC(SYD)
// retrieve non-optional params
Sequence< Any > aParams( 4 );
- aParams[ 0 ] = makeAny( rPar.Get(1)->GetDouble() );
- aParams[ 1 ] = makeAny( rPar.Get(2)->GetDouble() );
- aParams[ 2 ] = makeAny( rPar.Get(3)->GetDouble() );
- aParams[ 3 ] = makeAny( rPar.Get(4)->GetDouble() );
+ aParams[ 0 ] <<= rPar.Get(1)->GetDouble();
+ aParams[ 1 ] <<= rPar.Get(2)->GetDouble();
+ aParams[ 2 ] <<= rPar.Get(3)->GetDouble();
+ aParams[ 3 ] <<= rPar.Get(4)->GetDouble();
CallFunctionAccessFunction( aParams, "SYD", rPar.Get( 0 ) );
}
@@ -2718,9 +2718,9 @@ RTLFUNC(SLN)
// retrieve non-optional params
Sequence< Any > aParams( 3 );
- aParams[ 0 ] = makeAny( rPar.Get(1)->GetDouble() );
- aParams[ 1 ] = makeAny( rPar.Get(2)->GetDouble() );
- aParams[ 2 ] = makeAny( rPar.Get(3)->GetDouble() );
+ aParams[ 0 ] <<= rPar.Get(1)->GetDouble();
+ aParams[ 1 ] <<= rPar.Get(2)->GetDouble();
+ aParams[ 2 ] <<= rPar.Get(3)->GetDouble();
CallFunctionAccessFunction( aParams, "SLN", rPar.Get( 0 ) );
}
@@ -2876,7 +2876,7 @@ RTLFUNC(NPV)
}
Sequence< Any > aParams( 2 );
- aParams[ 0 ] = makeAny( rPar.Get(1)->GetDouble() );
+ aParams[ 0 ] <<= rPar.Get(1)->GetDouble();
Any aValues = sbxToUnoValue( rPar.Get(2),
cppu::UnoType<Sequence<double>>::get() );
@@ -2960,8 +2960,8 @@ RTLFUNC(MIRR)
aValues <<= sValues;
aParams[ 0 ] = aValues;
- aParams[ 1 ] = makeAny( rPar.Get(2)->GetDouble() );
- aParams[ 2 ] = makeAny( rPar.Get(3)->GetDouble() );
+ aParams[ 1 ] <<= rPar.Get(2)->GetDouble();
+ aParams[ 2 ] <<= rPar.Get(3)->GetDouble();
CallFunctionAccessFunction( aParams, "MIRR", rPar.Get( 0 ) );
}
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index ae579545f74b..189eb642530c 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -530,7 +530,7 @@ void SAL_CALL SfxLibraryContainer::removeModifyListener( const Reference< XModif
Any SAL_CALL SfxLibraryContainer::getRootLocation()
{
LibraryContainerMethodGuard aGuard( *this );
- return makeAny( getRootStorage() );
+ return Any( getRootStorage() );
}
OUString SAL_CALL SfxLibraryContainer::getContainerLocationName()
@@ -1426,10 +1426,10 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
if ( xProps.is() )
{
- xProps->setPropertyValue("MediaType", uno::makeAny( aMime ) );
+ xProps->setPropertyValue("MediaType", uno::Any( aMime ) );
// #87671 Allow encryption
- xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::makeAny( true ) );
+ xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::Any( true ) );
Reference< XOutputStream > xOutput = xElementStream->getOutputStream();
Reference< XNameContainer > xLib( pLib );
@@ -1565,10 +1565,10 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib,
if ( xProps.is() )
{
OUString aMime("text/xml");
- xProps->setPropertyValue("MediaType", uno::makeAny( aMime ) );
+ xProps->setPropertyValue("MediaType", uno::Any( aMime ) );
// #87671 Allow encryption
- xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::makeAny( true ) );
+ xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::Any( true ) );
xOut = xInfoStream->getOutputStream();
}
@@ -2087,10 +2087,10 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
throw uno::RuntimeException();
}
OUString aMime( "text/xml" );
- xProps->setPropertyValue("MediaType", uno::makeAny( aMime ) );
+ xProps->setPropertyValue("MediaType", uno::Any( aMime ) );
// #87671 Allow encryption
- xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::makeAny( true ) );
+ xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::Any( true ) );
xOut = xInfoStream->getOutputStream();
}
@@ -3075,7 +3075,7 @@ void SfxLibrary::impl_checkLoaded()
throw WrappedTargetException(
OUString(),
*this,
- makeAny( LibraryNotLoadedException(
+ Any( LibraryNotLoadedException(
OUString(),
*this
) )
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 07f8935595e5..d78242de70fc 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -673,7 +673,7 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons
throw uno::RuntimeException();
}
OUString aMime( "text/xml" );
- xProps->setPropertyValue("MediaType", uno::makeAny( aMime ) );
+ xProps->setPropertyValue("MediaType", uno::Any( aMime ) );
// Set encryption key
setStreamKey( xSourceStream, pLib->maPassword );
@@ -818,7 +818,7 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons
throw uno::RuntimeException();
}
OUString aMime( "text/xml" );
- xProps->setPropertyValue("MediaType", uno::makeAny( aMime ) );
+ xProps->setPropertyValue("MediaType", uno::Any( aMime ) );
Reference< XOutputStream > xOut = xSourceStream->getOutputStream();
Reference< XNameContainer > xLib( pLib );