strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fdo#46926: PyUNO_cmp: return acquired reference

Browse source
This commit is contained in:
David Bolen 2012-03-16 22:10:24 +01:00 committed by Michael Stahl
parent 3c4cd1deaf
commit 742dca7366
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pyuno/source/module/pyuno.cxx
View file

@ -595,6 +595,8 @@ int PyUNO_setattr (PyObject* self, char* name, PyObject* value)
// ensure object identity and struct equality
static PyObject* PyUNO_cmp( PyObject *self, PyObject *that, int op )
{
PyObject *result;
if(op != Py_EQ && op != Py_NE)
{
PyErr_SetString(PyExc_TypeError, "only '==' and '!=' comparisions are defined");
@ -602,7 +604,9 @@ static PyObject* PyUNO_cmp( PyObject *self, PyObject *that, int op )
}
if( self == that )
{
return (op == Py_EQ ? Py_True : Py_False);
result = (op == Py_EQ ? Py_True : Py_False);
Py_INCREF(result);
return result;
}
try
{
@ -624,14 +628,18 @@ static PyObject* PyUNO_cmp( PyObject *self, PyObject *that, int op )
Reference< XMaterialHolder > xOther( other->members->xInvocation,UNO_QUERY );
if( xMe->getMaterial() == xOther->getMaterial() )
{
return (op == Py_EQ ? Py_True : Py_False);
result = (op == Py_EQ ? Py_True : Py_False);
Py_INCREF(result);
return result;
}
}
else if( tcMe == com::sun::star::uno::TypeClass_INTERFACE )
{
if( me->members->wrappedObject == other->members->wrappedObject )
{
return (op == Py_EQ ? Py_True : Py_False);
result = (op == Py_EQ ? Py_True : Py_False);
Py_INCREF(result);
return result;
}
}
}
@ -641,7 +649,10 @@ static PyObject* PyUNO_cmp( PyObject *self, PyObject *that, int op )
{
raisePyExceptionWithAny( makeAny( e ) );
}
return (op == Py_EQ ? Py_False : Py_True);
result = (op == Py_EQ ? Py_False : Py_True);
Py_INCREF(result);
return result;
}
/* Python 2 has a tp_flags value for rich comparisons. Python 3 does not (on by default) */