[Libreoffice-commits] core.git: pyuno/source

[Herbert Dürr]

 pyuno/source/module/pyuno.cxx          |    6 +-----
 pyuno/source/module/pyuno_callable.cxx |    6 ------
 pyuno/source/module/pyuno_impl.hxx     |    2 --
 3 files changed, 1 insertion(+), 13 deletions(-)

New commits:
commit 28a4496c76acdab6cb851387e78366bb611f130f
Author: Herbert Dürr <hdu at apache.org>
Date:   Fri Jul 12 09:10:27 2013 +0000

    Resolves: #i120788# remove unused members from PyUNO_callable_Internals
    
    Patch by: Tsutomu Uchino <hanya.runo at gmail.com>
    
    (cherry picked from commit 5e2c3fd88906494965979bd20ca852391bee3bac)
    
    Conflicts:
    	pyuno/source/module/pyuno_impl.hxx
    
    Change-Id: If73d5f7b799f04b79b5cc71d2d44c797851b18d0

diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 4c6191d..58579eb 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 4175c80..24cae2c 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 9524523..b114b3c 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 );