diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-08 17:45:08 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-08 17:45:08 +0200 |
| commit | 9222f5d065bb2aafcfef93e77c58a82672a9ad22 (patch) | |
| tree | 0dfad9f13099a73ecf3893e9cbdd5020b55cd7b3 /basic | |
| parent | c4dca26eafd60dc4c4f19e0be0b8e086108b3048 (diff) | |
A UNO Any can't contain an Any
...and css::uno::makeAny<css::uno::Any>() was never meant to be used. Introduce
css::uno::toAny for the (template-code) cases that shall return an Any for both
Any and non-Any inputs.
Change-Id: Ifa977d73f1da71b2fedde7e8140b19497c4a0257
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/classes/sbxmod.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index cbeac3c979ce..c2b0e793df8a 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -2206,7 +2206,7 @@ SbObjModule::SetUnoObject( const uno::Any& aObj ) throw ( uno::RuntimeException SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,(SbxVariable*)pDocObject); if ( pUnoObj && pUnoObj->getUnoAny() == aObj ) // object is equal, nothing to do return; - pDocObject = new SbUnoObject( GetName(), uno::makeAny( aObj ) ); + pDocObject = new SbUnoObject( GetName(), aObj ); com::sun::star::uno::Reference< com::sun::star::lang::XServiceInfo > xServiceInfo( aObj, com::sun::star::uno::UNO_QUERY_THROW ); if( xServiceInfo->supportsService( "ooo.vba.excel.Worksheet" ) ) |