diff options
Diffstat (limited to 'pyuno/source/module')
-rw-r--r-- | pyuno/source/module/pyuno.cxx | 6 | ||||
-rw-r--r-- | pyuno/source/module/pyuno_callable.cxx | 6 | ||||
-rw-r--r-- | pyuno/source/module/pyuno_impl.hxx | 2 |
3 files changed, 1 insertions, 13 deletions
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx index 4c6191d4da30..58579ebe3105 100644 --- a/pyuno/source/module/pyuno.cxx +++ b/pyuno/source/module/pyuno.cxx @@ -342,8 +342,6 @@ PyObject *PyUNO_invoke( PyObject *object, const char *name , PyObject *args ) callable = PyUNO_callable_new ( me->members->xInvocation, attrName, - runtime.getImpl()->cargo->xInvocation, - runtime.getImpl()->cargo->xTypeConverter, ACCEPT_UNO_ANY); paras = args; } @@ -486,9 +484,7 @@ PyObject* PyUNO_getattr (PyObject* self, char* name) //Create a callable object to invoke this... PyRef ret = PyUNO_callable_new ( me->members->xInvocation, - attrName, - runtime.getImpl()->cargo->xInvocation, - runtime.getImpl()->cargo->xTypeConverter); + attrName); Py_XINCREF( ret.get() ); return ret.get(); diff --git a/pyuno/source/module/pyuno_callable.cxx b/pyuno/source/module/pyuno_callable.cxx index 4175c8066e76..24cae2cf9ad6 100644 --- a/pyuno/source/module/pyuno_callable.cxx +++ b/pyuno/source/module/pyuno_callable.cxx @@ -38,8 +38,6 @@ namespace pyuno typedef struct { Reference<XInvocation2> xInvocation; - Reference<XSingleServiceFactory> xInvocationFactory; - Reference<XTypeConverter> xTypeConverter; OUString methodName; ConversionMode mode; } PyUNO_callable_Internals; @@ -240,8 +238,6 @@ static PyTypeObject PyUNO_callable_Type = PyRef PyUNO_callable_new ( const Reference<XInvocation2> &my_inv, const OUString & methodName, - const Reference<XSingleServiceFactory> &xInvocationFactory, - const Reference<XTypeConverter> &tc, enum ConversionMode mode ) { PyUNO_callable* self; @@ -255,8 +251,6 @@ PyRef PyUNO_callable_new ( self->members = new PyUNO_callable_Internals; self->members->xInvocation = my_inv; self->members->methodName = methodName; - self->members->xInvocationFactory = xInvocationFactory; - self->members->xTypeConverter = tc; self->members->mode = mode; return PyRef( (PyObject*)self, SAL_NO_ACQUIRE ); diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx index 95245230fb5a..b114b3c68bbf 100644 --- a/pyuno/source/module/pyuno_impl.hxx +++ b/pyuno/source/module/pyuno_impl.hxx @@ -227,8 +227,6 @@ com::sun::star::uno::TypeClass StringToTypeClass (char* string); PyRef PyUNO_callable_new ( const com::sun::star::uno::Reference<com::sun::star::script::XInvocation2> &xInv, const OUString &methodName, - const com::sun::star::uno::Reference<com::sun::star::lang::XSingleServiceFactory> &ssf, - const com::sun::star::uno::Reference<com::sun::star::script::XTypeConverter> &tc, ConversionMode mode = REJECT_UNO_ANY ); PyObject* PyUNO_Type_new (const char *typeName , com::sun::star::uno::TypeClass t , const Runtime &r ); |