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 /pyuno | |
| 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 'pyuno')
| -rw-r--r-- | pyuno/source/module/pyuno.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx index 3ec1316b123c..7020004afb88 100644 --- a/pyuno/source/module/pyuno.cxx +++ b/pyuno/source/module/pyuno.cxx @@ -513,7 +513,7 @@ PyObject* PyUNO_getattr (PyObject* self, char* name) } catch( const com::sun::star::reflection::InvocationTargetException & e ) { - raisePyExceptionWithAny( makeAny(e.TargetException) ); + raisePyExceptionWithAny( e.TargetException ); } catch( const com::sun::star::beans::UnknownPropertyException & e ) { @@ -557,7 +557,7 @@ int PyUNO_setattr (PyObject* self, char* name, PyObject* value) } catch( const com::sun::star::reflection::InvocationTargetException & e ) { - raisePyExceptionWithAny( makeAny(e.TargetException) ); + raisePyExceptionWithAny( e.TargetException ); return 1; } catch( const com::sun::star::beans::UnknownPropertyException & e ) |