Author: hdu
Date: Fri Jul 12 09:10:27 2013
New Revision: 1502489
URL: http://svn.apache.org/r1502489
Log:
#i120788# remove unused members from PyUNO_callable_Internals
Patch by: Tsutomu Uchino <hanya.r...@gmail.com>
Modified:
openoffice/trunk/main/pyuno/source/module/pyuno.cxx
openoffice/trunk/main/pyuno/source/module/pyuno_callable.cxx
openoffice/trunk/main/pyuno/source/module/pyuno_impl.hxx
Modified: openoffice/trunk/main/pyuno/source/module/pyuno.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/pyuno/source/module/pyuno.cxx?rev=1502489&r1=1502488&r2=1502489&view=diff
==============================================================================
--- openoffice/trunk/main/pyuno/source/module/pyuno.cxx (original)
+++ openoffice/trunk/main/pyuno/source/module/pyuno.cxx Fri Jul 12 09:10:27 2013
@@ -357,8 +357,6 @@ PyObject *PyUNO_invoke( PyObject *object
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,
//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();
Modified: openoffice/trunk/main/pyuno/source/module/pyuno_callable.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/pyuno/source/module/pyuno_callable.cxx?rev=1502489&r1=1502488&r2=1502489&view=diff
==============================================================================
--- openoffice/trunk/main/pyuno/source/module/pyuno_callable.cxx (original)
+++ openoffice/trunk/main/pyuno/source/module/pyuno_callable.cxx Fri Jul 12
09:10:27 2013
@@ -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 );
Modified: openoffice/trunk/main/pyuno/source/module/pyuno_impl.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/pyuno/source/module/pyuno_impl.hxx?rev=1502489&r1=1502488&r2=1502489&view=diff
==============================================================================
--- openoffice/trunk/main/pyuno/source/module/pyuno_impl.hxx (original)
+++ openoffice/trunk/main/pyuno/source/module/pyuno_impl.hxx Fri Jul 12
09:10:27 2013
@@ -158,8 +158,6 @@ com::sun::star::uno::TypeClass StringToT
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 );
