diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 14:01:33 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 14:01:33 +0000 |
| commit | c1d933aca8e4b574c9cc0f1b0e0f0640915ad828 (patch) | |
| tree | 4f667de9d7a525e537ceebf884ce240a7a661390 /pyuno | |
| parent | 886759084d96beb15231f43cc77b0f9b5387844b (diff) | |
INTEGRATION: CWS geordi2q01 (1.1.14); FILE MERGED
2003/08/18 13:04:06 hr 1.1.14.1: #i18350#: join changes from CWS ooo11rc3
Diffstat (limited to 'pyuno')
| -rwxr-xr-x | pyuno/source/module/pyuno.flt | 20 | ||||
| -rw-r--r-- | pyuno/source/module/pyuno_except.cxx | 6 |
2 files changed, 14 insertions, 12 deletions
diff --git a/pyuno/source/module/pyuno.flt b/pyuno/source/module/pyuno.flt index 921433f66ca0..e62a3fcb6b36 100755 --- a/pyuno/source/module/pyuno.flt +++ b/pyuno/source/module/pyuno.flt @@ -1,10 +1,10 @@ -??_R0?AVException@uno@star@sun@com@@@8??0Exception@uno@star@sun@com@@QAE@ABV01234@@Z8
-??_R0?AVIllegalArgumentException@lang@star@sun@com@@@8??0IllegalArgumentException@lang@star@sun@com@@QAE@ABV01234@@Z12
-??_R0?AVInvocationTargetException@reflection@star@sun@com@@@8??0InvocationTargetException@reflection@star@sun@com@@QAE@ABV01234@@Z20
-??_R0?AVRuntimeException@uno@star@sun@com@@@8??0RuntimeException@uno@star@sun@com@@QAE@ABV01234@@Z8
-??_R0?AVUnknownPropertyException@beans@star@sun@com@@@8??0UnknownPropertyException@beans@star@sun@com@@QAE@ABV01234@@Z8
-??_R0?AVWrappedTargetException@lang@star@sun@com@@@8??0WrappedTargetException@lang@star@sun@com@@QAE@ABV01234@@Z20
-?AVIllegalArgumentException@lang@star@sun@com@@
-?AVRuntimeException@uno@star@sun@com@@
-?AVUnknownPropertyException@beans@star@sun@com@@
-?AVInvocationTargetException@reflection@star@sun@com@@
+??_R0?AVException@uno@star@sun@com@@@8??0Exception@uno@star@sun@com@@QAE@ABV01234@@Z8 +??_R0?AVIllegalArgumentException@lang@star@sun@com@@@8??0IllegalArgumentException@lang@star@sun@com@@QAE@ABV01234@@Z12 +??_R0?AVInvocationTargetException@reflection@star@sun@com@@@8??0InvocationTargetException@reflection@star@sun@com@@QAE@ABV01234@@Z20 +??_R0?AVRuntimeException@uno@star@sun@com@@@8??0RuntimeException@uno@star@sun@com@@QAE@ABV01234@@Z8 +??_R0?AVUnknownPropertyException@beans@star@sun@com@@@8??0UnknownPropertyException@beans@star@sun@com@@QAE@ABV01234@@Z8 +??_R0?AVWrappedTargetException@lang@star@sun@com@@@8??0WrappedTargetException@lang@star@sun@com@@QAE@ABV01234@@Z20 +?AVIllegalArgumentException@lang@star@sun@com@@ +?AVRuntimeException@uno@star@sun@com@@ +?AVUnknownPropertyException@beans@star@sun@com@@ +?AVInvocationTargetException@reflection@star@sun@com@@ diff --git a/pyuno/source/module/pyuno_except.cxx b/pyuno/source/module/pyuno_except.cxx index 17bec3a53a8b..05147434617f 100644 --- a/pyuno/source/module/pyuno_except.cxx +++ b/pyuno/source/module/pyuno_except.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pyuno_except.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: jbu $ $Date: 2003-03-23 12:12:57 $ + * last change: $Author: hjs $ $Date: 2003-08-18 15:01:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -185,7 +185,9 @@ static PyRef createClass( const OUString & name, const Runtime &runtime ) PyRef bases; if( base.is() ) { + { // for CC, keeping ref-count being 1 bases = PyRef( PyTuple_New( 1 ), SAL_NO_ACQUIRE ); + } PyTuple_SetItem( bases.get(), 0 , base.getAcquired() ); } else |