summaryrefslogtreecommitdiff
path: root/pyuno/source/module
diff options
context:
space:
mode:
authorHerbert Dürr <hdu@apache.org>2013-07-12 09:10:27 +0000
committerHerbert Dürr <hdu@apache.org>2013-07-12 09:10:27 +0000
commit5e2c3fd88906494965979bd20ca852391bee3bac (patch)
tree04c60261d8505e41255c1b233a8fd1232c22abc3 /pyuno/source/module
parent9dc7f72febe9d294304f70cc7b9cdeab1c67dc8b (diff)
#i120788# remove unused members from PyUNO_callable_Internals
Patch by: Tsutomu Uchino <hanya.runo@gmail.com>
Notes
Diffstat (limited to 'pyuno/source/module')
-rw-r--r--pyuno/source/module/pyuno.cxx6
-rw-r--r--pyuno/source/module/pyuno_callable.cxx6
-rw-r--r--pyuno/source/module/pyuno_impl.hxx2
3 files changed, 1 insertions, 13 deletions
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index e0dd930f9717..dc329b0fcbbe 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -357,8 +357,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;
}
@@ -515,9 +513,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 174cbdbac4ac..057b10e476ad 100644
--- a/pyuno/source/module/pyuno_callable.cxx
+++ b/pyuno/source/module/pyuno_callable.cxx
@@ -44,8 +44,6 @@ namespace pyuno
typedef struct
{
Reference<XInvocation2> xInvocation;
- Reference<XSingleServiceFactory> xInvocationFactory;
- Reference<XTypeConverter> xTypeConverter;
OUString methodName;
ConversionMode mode;
} PyUNO_callable_Internals;
@@ -249,8 +247,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;
@@ -262,8 +258,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 348a646d2747..fefaefa290f7 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -158,8 +158,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 rtl::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 );