summaryrefslogtreecommitdiff
path: root/pyuno
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2007-10-11 10:52:28 +0000
committerKurt Zenker <kz@openoffice.org>2007-10-11 10:52:28 +0000
commitb5eecfbc5c00f1e1d8b485e5eee34af58b2e77d5 (patch)
tree6383ffa0b88910b9b04ea33345241b216c72ecf7 /pyuno
parentbaa877f9fa1c8ab1d484419a8b314e797423ac3c (diff)
INTEGRATION: CWS pyunofixes4 (1.10.22); FILE MERGED
2007/07/30 19:43:44 jbu 1.10.22.1: adding pythonpath import functionality, fixed a gc deadlock, fixed some minor issues
Diffstat (limited to 'pyuno')
-rw-r--r--pyuno/source/module/pyuno.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 7fc04d1d483d..1724520d5ac5 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: pyuno.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: ihi $ $Date: 2006-11-14 18:21:24 $
+ * last change: $Author: kz $ $Date: 2007-10-11 11:52:28 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -77,7 +77,10 @@ PyObject *PyUNO_str( PyObject * self );
void PyUNO_del (PyObject* self)
{
PyUNO* me = reinterpret_cast< PyUNO* > (self);
- delete me->members;
+ {
+ PyThreadDetach antiguard;
+ delete me->members;
+ }
PyObject_Del (self);
}