You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by st...@apache.org on 2013/02/01 09:46:35 UTC
svn commit: r1441343 [19/35] - in /openoffice/branches/ia2: ./
ext_libraries/apr-util/ ext_libraries/apr/ ext_sources/
extras/l10n/source/ast/ extras/l10n/source/da/ extras/l10n/source/eu/
extras/l10n/source/gd/ extras/l10n/source/ko/ extras/l10n/sourc...
Modified: openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs (original)
+++ openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs Fri Feb 1 08:46:00 2013
@@ -1298,10 +1298,10 @@
<!-- UIHints: Tools - Options - Text document - Layout - [Section] Lines -->
<info>
<author>OS</author>
- <desc>Displays the control points as simple squares without a 3D effect.</desc>
+ <desc>Specifies whether control points are displayed simple or enhanced.</desc>
<label>Simple control points</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="LargeControlPoint" oor:type="xs:boolean">
<!-- OldPath: Writer/Layout/Lines -->
@@ -1309,16 +1309,25 @@
<!-- UIHints: Tools - Options - Text document - Layout - [Section] Lines -->
<info>
<author>OS</author>
- <desc>Displays larger control points.</desc>
+ <desc>Specifies whether control points are displayed as larger than the default size.</desc>
<label>Large control points</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
</group>
<group oor:name="Window">
<info>
<desc>Contains various window settings such as scrollbars, rules, etc.</desc>
</info>
+ <prop oor:name="ShowScrollBarTips" oor:type="xs:boolean">
+ <!-- UIHints: Not accessible via user interface -->
+ <info>
+ <author>arielch</author>
+ <desc>Enables the user to prevent the display of help tips on the scrollbars programmatically.</desc>
+ <label>Prevent scrollbars help tips</label>
+ </info>
+ <value>true</value>
+ </prop>
<prop oor:name="HorizontalScroll" oor:type="xs:boolean">
<!-- OldPath: Writer/Layout/Window -->
<!-- OldLocation: Soffice.cfg -->
@@ -4817,6 +4826,11 @@
<desc>KeyRight</desc>
</info>
</enumeration>
+ <enumeration oor:value="1282"> <!-- 0x502 -->
+ <info>
+ <desc>KeyTab</desc>
+ </info>
+ </enumeration>
<enumeration oor:value="1284"> <!-- 0x504 -->
<info>
<desc>KeySpace</desc>
Modified: openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs (original)
+++ openoffice/branches/ia2/main/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs Fri Feb 1 08:46:00 2013
@@ -212,10 +212,10 @@
<!-- UIHints: Tools - Option - HTML-Document - Layout - [Section] Lines -->
<info>
<author>OS</author>
- <desc>Displays the control points as simple squares without a 3D effect.</desc>
+ <desc>Specifies whether control points are displayed simple or enhanced.</desc>
<label>Simple control points</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="LargeControlPoint" oor:type="xs:boolean">
<!-- OldPath: HTML_Editor/Layout/Lines -->
@@ -223,10 +223,10 @@
<!-- UIHints: Tools - Option - HTML-Document - Layout - [Section] Lines -->
<info>
<author>OS</author>
- <desc>Displays larger control points.</desc>
+ <desc>Specifies whether control points are displayed as larger than the default size.</desc>
<label>Large control points</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
</group>
<group oor:name="Window">
Modified: openoffice/branches/ia2/main/oox/source/ole/axcontrol.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/oox/source/ole/axcontrol.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/oox/source/ole/axcontrol.cxx (original)
+++ openoffice/branches/ia2/main/oox/source/ole/axcontrol.cxx Fri Feb 1 08:46:00 2013
@@ -454,12 +454,12 @@ void ControlConverter::convertAxPicture(
convertPicture( rPropMap, rPicData );
// picture scale mode
- sal_Int16 nScaleMode = ImageScaleMode::None;
+ sal_Int16 nScaleMode = ImageScaleMode::NONE;
switch( nPicSizeMode )
{
- case AX_PICSIZE_CLIP: nScaleMode = ImageScaleMode::None; break;
- case AX_PICSIZE_STRETCH: nScaleMode = ImageScaleMode::Anisotropic; break;
- case AX_PICSIZE_ZOOM: nScaleMode = ImageScaleMode::Isotropic; break;
+ case AX_PICSIZE_CLIP: nScaleMode = ImageScaleMode::NONE; break;
+ case AX_PICSIZE_STRETCH: nScaleMode = ImageScaleMode::ISOTROPIC; break;
+ case AX_PICSIZE_ZOOM: nScaleMode = ImageScaleMode::ANISOTROPIC; break;
default: OSL_ENSURE( false, "ControlConverter::convertAxPicture - unknown picture size mode" );
}
rPropMap.setProperty( PROP_ScaleMode, nScaleMode );
Modified: openoffice/branches/ia2/main/padmin/source/rtsetup.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/padmin/source/rtsetup.src?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/padmin/source/rtsetup.src (original)
+++ openoffice/branches/ia2/main/padmin/source/rtsetup.src Fri Feb 1 08:46:00 2013
@@ -194,7 +194,7 @@ TabPage RID_RTS_DEVICEPAGE
< "PostScript (Level from driver)" ; 1; > ;
< "PostScript Level 1" ; 2; > ;
< "PostScript Level 2"; 3; > ;
- < "PostScript Level 3"; 3; > ;
+ < "PostScript Level 3"; 4; > ;
< "PDF"; 10; > ;
};
};
Modified: openoffice/branches/ia2/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/postprocess/packcomponents/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/branches/ia2/main/postprocess/packcomponents/makefile.mk Fri Feb 1 08:46:00 2013
@@ -190,7 +190,7 @@ my_components += component/vcl/vcl.unx
my_components += updchk.uno
.END
-.IF "$(BUILD_SPECIAL)" != ""
+.IF "$(ENABLE_OOOIMPROVEMENT)" != ""
my_components += oooimprovement
.END
@@ -311,7 +311,7 @@ my_components += \
fps \
ftransl \
java_uno_accessbridge \
- smplmail \
+ sysmail \
sysdtrans \
winaccessibility \
wininetbe1
Modified: openoffice/branches/ia2/main/postprocess/rebase/coffbase.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/postprocess/rebase/coffbase.txt?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/postprocess/rebase/coffbase.txt (original)
+++ openoffice/branches/ia2/main/postprocess/rebase/coffbase.txt Fri Feb 1 08:46:00 2013
@@ -253,7 +253,7 @@ slideshow.uno.dll 0x000000005ec60000 0x0
slideshowtestmi.dll 0x000000005e8b0000 0x003a0000
smdmi.dll 0x000000005e890000 0x00010000
smmi.dll 0x000000005e7f0000 0x00090000
-smplmail.uno.dll 0x000000005e7d0000 0x00010000
+sysmail.uno.dll 0x000000005e7d0000 0x00010000
sn_tools.dll 0x000000005e7a0000 0x00020000
so_activex.dll 0x000000005e770000 0x00020000
socomp.dll 0x000000005e750000 0x00010000
Modified: openoffice/branches/ia2/main/postprocess/rebase/no_rebase.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/postprocess/rebase/no_rebase.txt?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/postprocess/rebase/no_rebase.txt (original)
+++ openoffice/branches/ia2/main/postprocess/rebase/no_rebase.txt Fri Feb 1 08:46:00 2013
@@ -31,3 +31,5 @@ msvcr80.dll
msvcr90d.dll
msvcr90.dll
msvcr100.dll
+msvcr100d.dll
+dbghelp.dll
Modified: openoffice/branches/ia2/main/pyuno/source/module/pyuno.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/pyuno/source/module/pyuno.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/pyuno/source/module/pyuno.cxx (original)
+++ openoffice/branches/ia2/main/pyuno/source/module/pyuno.cxx Fri Feb 1 08:46:00 2013
@@ -342,7 +342,7 @@ PyObject *PyUNO_invoke( PyObject *object
Runtime runtime;
PyRef paras,callable;
- if( PyObject_IsInstance( object, getPyUnoClass( runtime ).get() ) )
+ if( PyObject_IsInstance( object, getPyUnoClass().get() ) )
{
PyUNO* me = (PyUNO*) object;
OUString attrName = OUString::createFromAscii(name);
@@ -441,19 +441,30 @@ PyObject *PyUNO_str( PyObject * self )
buf.append( OUStringToOString(s,RTL_TEXTENCODING_ASCII_US) );
}
- return PyBytes_FromString( buf.getStr());
+ return PYSTR_FROMSTR( buf.getStr() );
}
+#if PY_MAJOR_VERSION >= 3
+PyObject* PyUNO_getattr (PyObject* self, PyObject* attr_name)
+#else
PyObject* PyUNO_getattr (PyObject* self, char* name)
+#endif
{
PyUNO* me;
+#if PY_VERSION_HEX >= 0x03030000
+ char *name = PyUnicode_AsUTF8(attr_name);
+#elif PY_MAJOR_VERSION >= 3
+ PyRef pUtf8(PyUnicode_AsUTF8String(attr_name), SAL_NO_ACQUIRE);
+ char *name = PyBytes_AsString(pUtf8.get());
+#endif
try
{
Runtime runtime;
me = (PyUNO*) self;
+#if PY_MAJOR_VERSION < 3
//Handle Python dir () stuff first...
if (strcmp (name, "__members__") == 0)
{
@@ -469,17 +480,20 @@ PyObject* PyUNO_getattr (PyObject* self,
}
return member_list;
}
-
+#endif
+
if (strcmp (name, "__dict__") == 0)
{
Py_INCREF (Py_None);
return Py_None;
}
+#if PY_MAJOR_VERSION < 3
if (strcmp (name, "__methods__") == 0)
{
Py_INCREF (Py_None);
return Py_None;
}
+#endif
if (strcmp (name, "__class__") == 0)
{
if( me->members->wrappedObject.getValueTypeClass() ==
@@ -550,10 +564,20 @@ PyObject* PyUNO_getattr (PyObject* self,
return NULL;
}
+#if PY_MAJOR_VERSION >= 3
+int PyUNO_setattr (PyObject* self, PyObject* attr_name, PyObject* value)
+#else
int PyUNO_setattr (PyObject* self, char* name, PyObject* value)
+#endif
{
PyUNO* me;
+#if PY_VERSION_HEX >= 0x03030000
+ char *name = PyUnicode_AsUTF8(attr_name);
+#elif PY_MAJOR_VERSION >= 3
+ PyRef pUtf8(PyUnicode_AsUTF8String(attr_name), SAL_NO_ACQUIRE);
+ char *name = PyBytes_AsString(pUtf8.get());
+#endif
me = (PyUNO*) self;
try
{
@@ -594,6 +618,99 @@ int PyUNO_setattr (PyObject* self, char*
return 1; //as above.
}
+#if PY_MAJOR_VERSION >= 3
+static PyObject *PyUNO_dir( PyObject *self, PyObject *that )
+{
+ PyUNO* me;
+ PyObject* member_list;
+ Sequence<OUString> oo_member_list;
+
+ me = (PyUNO*) self;
+ oo_member_list = me->members->xInvocation->getMemberNames ();
+ member_list = PyList_New (oo_member_list.getLength ());
+ for (int i = 0; i < oo_member_list.getLength (); i++)
+ {
+ // setitem steals a reference
+ PyList_SetItem (member_list, i, ustring2PyUnicode(oo_member_list[i]).getAcquired() );
+ }
+ return member_list;
+}
+
+static PyObject *PyUNO_richcompare( PyObject *self, PyObject *that, int op )
+{
+ switch (op)
+ {
+ case Py_EQ:
+ case Py_NE:
+ if( self == that )
+ {
+ if (op == Py_EQ)
+ Py_RETURN_TRUE;
+ else
+ Py_RETURN_FALSE;
+ }
+ try
+ {
+ Runtime runtime;
+ if( PyObject_IsInstance( that, getPyUnoClass().get() ) )
+ {
+ PyUNO *me = reinterpret_cast< PyUNO*> ( self );
+ PyUNO *other = reinterpret_cast< PyUNO *> (that );
+ com::sun::star::uno::TypeClass tcMe = me->members->wrappedObject.getValueTypeClass();
+ com::sun::star::uno::TypeClass tcOther = other->members->wrappedObject.getValueTypeClass();
+
+ if( tcMe == tcOther )
+ {
+ if( tcMe == com::sun::star::uno::TypeClass_STRUCT ||
+ tcMe == com::sun::star::uno::TypeClass_EXCEPTION )
+ {
+ Reference< XMaterialHolder > xMe( me->members->xInvocation,UNO_QUERY);
+ Reference< XMaterialHolder > xOther( other->members->xInvocation,UNO_QUERY );
+ if( xMe->getMaterial() == xOther->getMaterial() )
+ {
+ if (op == Py_EQ)
+ Py_RETURN_TRUE;
+ else
+ Py_RETURN_FALSE;
+ }
+ }
+ else if( tcMe == com::sun::star::uno::TypeClass_INTERFACE )
+ {
+ if( me->members->wrappedObject == other->members->wrappedObject )
+ {
+ if (op == Py_EQ)
+ Py_RETURN_TRUE;
+ else
+ Py_RETURN_FALSE;
+ }
+ }
+ }
+ }
+ if (op == Py_EQ)
+ Py_RETURN_FALSE;
+ else
+ Py_RETURN_TRUE;
+ }
+ catch( com::sun::star::uno::RuntimeException & e)
+ {
+ raisePyExceptionWithAny( makeAny( e ) );
+ }
+ break;
+ default:
+ PyErr_SetString(Py_NotImplemented, "not implemented");
+ break;
+ }
+
+ return NULL;
+}
+
+
+static struct PyMethodDef PyUNO_methods[] = {
+ { "__dir__", (PyCFunction)PyUNO_dir, METH_VARARGS, NULL},
+ { NULL, NULL }
+};
+
+#else
// ensure object identity and struct equality
static int PyUNO_cmp( PyObject *self, PyObject *that )
{
@@ -603,7 +720,7 @@ static int PyUNO_cmp( PyObject *self, Py
try
{
Runtime runtime;
- if( PyObject_IsInstance( that, getPyUnoClass( runtime ).get() ) )
+ if( PyObject_IsInstance( that, getPyUnoClass().get() ) )
{
PyUNO *me = reinterpret_cast< PyUNO*> ( self );
@@ -636,6 +753,7 @@ static int PyUNO_cmp( PyObject *self, Py
}
return retDefault;
}
+#endif
static PyTypeObject PyUNOType =
{
@@ -645,9 +763,15 @@ static PyTypeObject PyUNOType =
0,
(destructor) PyUNO_del,
(printfunc) 0,
- (getattrfunc) PyUNO_getattr,
- (setattrfunc) PyUNO_setattr,
- PyUNO_cmp,
+#if PY_MAJOR_VERSION >= 3
+ (getattrfunc) 0,
+ (setattrfunc) 0,
+ 0,
+#else
+ (getattrfunc) PyUNO_getattr, /* tp_getattr */
+ (setattrfunc) PyUNO_setattr, /* tp_setattr */
+ (cmpfunc) PyUNO_cmp,
+#endif
(reprfunc) PyUNO_repr,
0,
0,
@@ -655,18 +779,31 @@ static PyTypeObject PyUNOType =
(hashfunc) 0,
(ternaryfunc) 0,
(reprfunc) PyUNO_str,
+#if PY_MAJOR_VERSION >= 3
+ (getattrofunc)PyUNO_getattr, /* tp_getattro */
+ (setattrofunc)PyUNO_setattr, /* tp_setattro */
+#else
(getattrofunc)0,
(setattrofunc)0,
+#endif
NULL,
0,
NULL,
(traverseproc)0,
(inquiry)0,
+#if PY_MAJOR_VERSION >= 3
+ PyUNO_richcompare, /* tp_richcompare */
+#else
(richcmpfunc)0,
+#endif
0,
(getiterfunc)0,
(iternextfunc)0,
+#if PY_MAJOR_VERSION >= 3
+ PyUNO_methods, /* tp_methods */
+#else
NULL,
+#endif
NULL,
NULL,
NULL,
@@ -690,7 +827,7 @@ static PyTypeObject PyUNOType =
#endif
};
-PyRef getPyUnoClass( const Runtime &)
+PyRef getPyUnoClass()
{
return PyRef( reinterpret_cast< PyObject * > ( &PyUNOType ) );
}
Modified: openoffice/branches/ia2/main/pyuno/source/module/pyuno_adapter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/pyuno/source/module/pyuno_adapter.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/pyuno/source/module/pyuno_adapter.cxx (original)
+++ openoffice/branches/ia2/main/pyuno/source/module/pyuno_adapter.cxx Fri Feb 1 08:46:00 2013
@@ -246,7 +246,7 @@ Any Adapter::invoke( const OUString &aFu
buf.appendAscii( "pyuno::Adapater: Method " ).append( aFunctionName );
buf.appendAscii( " is not implemented at object " );
PyRef str( PyObject_Repr( mWrappedObject.get() ), SAL_NO_ACQUIRE );
- buf.appendAscii( PyBytes_AsString( str.get() ));
+ buf.append( pyString2ustring( str.get() ) );
throw IllegalArgumentException( buf.makeStringAndClear(), Reference< XInterface > (),0 );
}
Modified: openoffice/branches/ia2/main/pyuno/source/module/pyuno_callable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/pyuno/source/module/pyuno_callable.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/pyuno/source/module/pyuno_callable.cxx (original)
+++ openoffice/branches/ia2/main/pyuno/source/module/pyuno_callable.cxx Fri Feb 1 08:46:00 2013
@@ -199,7 +199,11 @@ static PyTypeObject PyUNO_callable_Type
(printfunc) 0,
(getattrfunc) 0,
(setattrfunc) 0,
+#if PY_MAJOR_VERSION >= 3
+ 0,
+#else
(cmpfunc) 0,
+#endif
(reprfunc) 0,
0,
0,
Modified: openoffice/branches/ia2/main/pyuno/source/module/pyuno_except.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/pyuno/source/module/pyuno_except.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/pyuno/source/module/pyuno_except.cxx (original)
+++ openoffice/branches/ia2/main/pyuno/source/module/pyuno_except.cxx Fri Feb 1 08:46:00 2013
@@ -142,7 +142,7 @@ static PyRef createClass( const OUString
}
PyRef args( PyTuple_New( 3 ), SAL_NO_ACQUIRE );
- PyRef pyTypeName = ustring2PyString( name /*.replace( '.', '_' )*/ );
+ PyRef pyTypeName = USTR_TO_PYSTR( name /*.replace( '.', '_' )*/ );
PyRef bases;
if( base.is() )
@@ -162,7 +162,7 @@ static PyRef createClass( const OUString
PyTuple_SetItem( args.get(), 2, PyDict_New() );
PyRef ret(
- PyObject_CallObject(reinterpret_cast<PyObject *>(&PyClass_Type) , args.get()),
+ PyObject_CallObject(reinterpret_cast<PyObject *>(&PyType_Type) , args.get()),
SAL_NO_ACQUIRE );
// now overwrite ctor and attrib functions
@@ -170,7 +170,7 @@ static PyRef createClass( const OUString
{
PyObject_SetAttrString(
ret.get(), const_cast< char * >("__pyunointerface__"),
- ustring2PyString(name).get() );
+ USTR_TO_PYSTR(name).get() );
}
else
{
@@ -179,13 +179,16 @@ static PyRef createClass( const OUString
PyRef getter = getObjectFromUnoModule( runtime,"_uno_struct__getattr__" );
PyRef repr = getObjectFromUnoModule( runtime,"_uno_struct__repr__" );
PyRef eq = getObjectFromUnoModule( runtime,"_uno_struct__eq__" );
+#if PY_MAJOR_VERSION >= 3
+ PyRef dir = getObjectFromUnoModule( runtime, "_uno_struct__dir__" );
+#endif
PyObject_SetAttrString(
ret.get(), const_cast< char * >("__pyunostruct__"),
- ustring2PyString(name).get() );
+ USTR_TO_PYSTR(name).get() );
PyObject_SetAttrString(
ret.get(), const_cast< char * >("typeName"),
- ustring2PyString(name).get() );
+ USTR_TO_PYSTR(name).get() );
PyObject_SetAttrString(
ret.get(), const_cast< char * >("__init__"), ctor.get() );
PyObject_SetAttrString(
@@ -198,6 +201,10 @@ static PyRef createClass( const OUString
ret.get(), const_cast< char * >("__str__"), repr.get() );
PyObject_SetAttrString(
ret.get(), const_cast< char * >("__eq__"), eq.get() );
+#if PY_MAJOR_VERSION >= 3
+ PyObject_SetAttrString(
+ ret.get(), const_cast< char * >("__dir__"), dir.get() );
+#endif
}
return ret;
}
@@ -233,7 +240,7 @@ PyRef getClass( const OUString & name ,
PyObject_SetAttrString(
ret.get(), const_cast< char * >("__pyunointerface__"),
- ustring2PyString(name).get() );
+ USTR_TO_PYSTR(name).get() );
}
else
{
Modified: openoffice/branches/ia2/main/pyuno/source/module/pyuno_impl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/pyuno/source/module/pyuno_impl.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/pyuno/source/module/pyuno_impl.hxx (original)
+++ openoffice/branches/ia2/main/pyuno/source/module/pyuno_impl.hxx Fri Feb 1 08:46:00 2013
@@ -43,6 +43,19 @@
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weakref.hxx>
+//
+// Local workarounds for compatibility issues
+//
+#if PY_MAJOR_VERSION >= 3
+ #define PYSTR_FROMSTR PyUnicode_FromString
+ #define USTR_TO_PYSTR ustring2PyUnicode
+ #define PYSTR_CHECK PyUnicode_Check
+#else
+ #define PYSTR_FROMSTR PyBytes_FromString
+ #define USTR_TO_PYSTR ustring2PyString
+ #define PYSTR_CHECK PyBytes_Check
+#endif
+
namespace pyuno
{
@@ -161,7 +174,7 @@ PyRef getEnumClass( const Runtime &);
PyRef getBoolClass( const Runtime &);
PyRef getCharClass( const Runtime &);
PyRef getByteSequenceClass( const Runtime & );
-PyRef getPyUnoClass( const Runtime &);
+PyRef getPyUnoClass();
PyRef getClass( const rtl::OUString & name , const Runtime & runtime );
PyRef getAnyClass( const Runtime &);
PyObject *PyUNO_invoke( PyObject *object, const char *name , PyObject *args );
Modified: openoffice/branches/ia2/main/pyuno/source/module/pyuno_module.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/pyuno/source/module/pyuno_module.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/pyuno/source/module/pyuno_module.cxx (original)
+++ openoffice/branches/ia2/main/pyuno/source/module/pyuno_module.cxx Fri Feb 1 08:46:00 2013
@@ -225,7 +225,11 @@ PyObject * extractOneStringArg( PyObject
return NULL;
}
PyObject *obj = PyTuple_GetItem( args, 0 );
+#if PY_MAJOR_VERSION >= 3
+ if( ! PyUnicode_Check(obj) )
+#else
if( !PyBytes_Check( obj ) && ! PyUnicode_Check(obj))
+#endif
{
OStringBuffer buf;
buf.append( funcName ).append( ": expecting one string argument" );
@@ -248,11 +252,11 @@ static PyObject *createUnoStructHelper(P
PyObject *structName = PyTuple_GetItem( args,0 );
PyObject *initializer = PyTuple_GetItem( args ,1 );
- if( PyBytes_Check( structName ) )
+ if( PYSTR_CHECK( structName ) )
{
if( PyTuple_Check( initializer ) )
{
- OUString typeName( OUString::createFromAscii(PyBytes_AsString(structName)));
+ OUString typeName( pyString2ustring( structName ) );
RuntimeCargo *c = runtime.getImpl()->cargo;
Reference<XIdlClass> idl_class ( c->xCoreReflection->forName (typeName),UNO_QUERY);
if (idl_class.is ())
@@ -287,7 +291,7 @@ static PyObject *createUnoStructHelper(P
{
OStringBuffer buf;
buf.append( "UNO struct " );
- buf.append( PyBytes_AsString(structName) );
+ buf.append( OUStringToOString( typeName, RTL_TEXTENCODING_ASCII_US ) );
buf.append( " is unkown" );
PyErr_SetString (PyExc_RuntimeError, buf.getStr());
}
@@ -462,9 +466,7 @@ static PyObject *getClass( PyObject *, P
try
{
Runtime runtime;
- PyRef ret = getClass(
- OUString( PyBytes_AsString( obj), strlen(PyBytes_AsString(obj)),RTL_TEXTENCODING_ASCII_US),
- runtime );
+ PyRef ret = getClass( pyString2ustring(obj), runtime );
Py_XINCREF( ret.get() );
return ret.get();
}
@@ -603,9 +605,16 @@ static PyObject * invoke ( PyObject *, P
{
PyObject *object = PyTuple_GetItem( args, 0 );
- if( PyBytes_Check( PyTuple_GetItem( args, 1 ) ) )
+ if( PYSTR_CHECK( PyTuple_GetItem( args, 1 ) ) )
{
+#if PY_VERSION_HEX >= 0x03030000
+ const char *name = PyUnicode_AsUTF8( PyTuple_GetItem( args, 1 ) );
+#elif PY_MAJOR_VERSION >= 3
+ PyRef pUtf8(PyUnicode_AsUTF8String( PyTuple_GetItem( args, 1 ) ), SAL_NO_ACQUIRE);
+ const char *name = PyBytes_AsString( pUtf8.get() );
+#else
const char *name = PyBytes_AsString( PyTuple_GetItem( args, 1 ) );
+#endif
if( PyTuple_Check( PyTuple_GetItem( args , 2 )))
{
ret = PyUNO_invoke( object, name , PyTuple_GetItem( args, 2 ) );
@@ -614,7 +623,11 @@ static PyObject * invoke ( PyObject *, P
{
OStringBuffer buf;
buf.append( "uno.invoke expects a tuple as 3rd argument, got " );
+#if PY_MAJOR_VERSION >= 3
+ buf.append( OUStringToOString( pyString2ustring( PyTuple_GetItem( args, 2 ) ), RTL_TEXTENCODING_ASCII_US) );
+#else
buf.append( PyBytes_AsString( PyObject_Str( PyTuple_GetItem( args, 2) ) ) );
+#endif
PyErr_SetString( PyExc_RuntimeError, buf.makeStringAndClear() );
}
}
@@ -622,7 +635,11 @@ static PyObject * invoke ( PyObject *, P
{
OStringBuffer buf;
buf.append( "uno.invoke expected a string as 2nd argument, got " );
+#if PY_MAJOR_VERSION >= 3
+ buf.append( OUStringToOString( pyString2ustring( PyTuple_GetItem( args, 1 ) ), RTL_TEXTENCODING_ASCII_US ) );
+#else
buf.append( PyBytes_AsString( PyObject_Str( PyTuple_GetItem( args, 1) ) ) );
+#endif
PyErr_SetString( PyExc_RuntimeError, buf.makeStringAndClear() );
}
}
@@ -672,7 +689,11 @@ static PyObject *setCurrentContext( PyOb
{
OStringBuffer buf;
buf.append( "uno.setCurrentContext expects an XComponentContext implementation, got " );
+#if PY_MAJOR_VERSION >= 3
+ buf.append( OUStringToOString( pyString2ustring( PyTuple_GetItem( args, 0 ) ), RTL_TEXTENCODING_ASCII_US ) );
+#else
buf.append( PyBytes_AsString( PyObject_Str( PyTuple_GetItem( args, 0) ) ) );
+#endif
PyErr_SetString( PyExc_RuntimeError, buf.makeStringAndClear() );
}
}
@@ -694,26 +715,52 @@ static PyObject *setCurrentContext( PyOb
struct PyMethodDef PyUNOModule_methods [] =
{
- {const_cast< char * >("getComponentContext"), getComponentContext, 1, NULL},
- {const_cast< char * >("_createUnoStructHelper"), createUnoStructHelper, 2, NULL},
- {const_cast< char * >("getTypeByName"), getTypeByName, 1, NULL},
- {const_cast< char * >("getConstantByName"), getConstantByName,1, NULL},
- {const_cast< char * >("getClass"), getClass,1, NULL},
- {const_cast< char * >("checkEnum"), checkEnum, 1, NULL},
- {const_cast< char * >("checkType"), checkType, 1, NULL},
- {const_cast< char * >("generateUuid"), generateUuid,0, NULL},
- {const_cast< char * >("systemPathToFileUrl"),systemPathToFileUrl,1, NULL},
- {const_cast< char * >("fileUrlToSystemPath"),fileUrlToSystemPath,1, NULL},
- {const_cast< char * >("absolutize"),absolutize,2, NULL},
- {const_cast< char * >("isInterface"),isInterface,1, NULL},
- {const_cast< char * >("invoke"),invoke, 2, NULL},
- {const_cast< char * >("setCurrentContext"),setCurrentContext,1, NULL},
- {const_cast< char * >("getCurrentContext"),getCurrentContext,1, NULL},
+ {const_cast< char * >("getComponentContext"), getComponentContext, METH_NOARGS, NULL},
+ {const_cast< char * >("_createUnoStructHelper"), createUnoStructHelper, METH_VARARGS, NULL},
+ {const_cast< char * >("getTypeByName"), getTypeByName, METH_VARARGS, NULL},
+ {const_cast< char * >("getConstantByName"), getConstantByName, METH_VARARGS, NULL},
+ {const_cast< char * >("getClass"), getClass, METH_VARARGS, NULL},
+ {const_cast< char * >("checkEnum"), checkEnum, METH_VARARGS, NULL},
+ {const_cast< char * >("checkType"), checkType, METH_VARARGS, NULL},
+ {const_cast< char * >("generateUuid"), generateUuid, METH_NOARGS, NULL},
+ {const_cast< char * >("systemPathToFileUrl"), systemPathToFileUrl, METH_VARARGS, NULL},
+ {const_cast< char * >("fileUrlToSystemPath"), fileUrlToSystemPath, METH_VARARGS, NULL},
+ {const_cast< char * >("absolutize"), absolutize, METH_VARARGS, NULL},
+ {const_cast< char * >("isInterface"), isInterface, METH_VARARGS, NULL},
+ {const_cast< char * >("invoke"), invoke, METH_VARARGS, NULL},
+ {const_cast< char * >("setCurrentContext"), setCurrentContext, METH_VARARGS, NULL},
+ {const_cast< char * >("getCurrentContext"), getCurrentContext, METH_NOARGS, NULL},
{NULL, NULL, 0, NULL}
};
+#if PY_MAJOR_VERSION >= 3
+static struct PyModuleDef PyUNOModule =
+{
+ PyModuleDef_HEAD_INIT,
+ const_cast< char * >("pyuno"),
+ NULL,
+ -1,
+ PyUNOModule_methods
+};
+#endif
}
+#if PY_MAJOR_VERSION >= 3
+extern "C" PyMODINIT_FUNC PyInit_pyuno(void)
+{
+ PyObject *m;
+
+ PyEval_InitThreads();
+
+ m = PyModule_Create(&PyUNOModule);
+ if (m == NULL)
+ return NULL;
+
+ if (PyType_Ready((PyTypeObject *)getPyUnoClass().get()))
+ return NULL;
+ return m;
+}
+#else
extern "C" PY_DLLEXPORT void initpyuno()
{
// noop when called already, otherwise needed to allow multiple threads
@@ -721,3 +768,4 @@ extern "C" PY_DLLEXPORT void initpyuno()
PyEval_InitThreads();
Py_InitModule (const_cast< char * >("pyuno"), PyUNOModule_methods);
}
+#endif
Modified: openoffice/branches/ia2/main/pyuno/source/module/pyuno_runtime.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/pyuno/source/module/pyuno_runtime.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/pyuno/source/module/pyuno_runtime.cxx (original)
+++ openoffice/branches/ia2/main/pyuno/source/module/pyuno_runtime.cxx Fri Feb 1 08:46:00 2013
@@ -73,7 +73,11 @@ static PyTypeObject RuntimeImpl_Type =
(printfunc) 0,
(getattrfunc) 0,
(setattrfunc) 0,
+#if PY_MAJOR_VERSION >= 3
+ 0,
+#else
(cmpfunc) 0,
+#endif
(reprfunc) 0,
0,
0,
@@ -154,8 +158,9 @@ static PyRef importUnoModule( ) throw (
OUStringBuffer buf;
buf.appendAscii( "python object raised an unknown exception (" );
PyRef valueRep( PyObject_Repr( excValue.get() ), SAL_NO_ACQUIRE );
- buf.appendAscii( PyBytes_AsString( valueRep.get())).appendAscii( ", traceback follows\n" );
- buf.appendAscii( PyBytes_AsString( str.get() ) );
+
+ buf.append( pyString2ustring( valueRep.get() ) ).appendAscii( ", traceback follows\n" );
+ buf.append( pyString2ustring( str.get() ) );
throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface > () );
}
PyRef dict( PyModule_GetDict( module.get() ) );
@@ -544,7 +549,7 @@ PyRef Runtime::any2PyObject (const Any &
// assuming that the Message is always the first member, wuuuu
void *pData = (void*)a.getValue();
OUString message = *(OUString * )pData;
- PyRef pymsg = ustring2PyString( message );
+ PyRef pymsg = USTR_TO_PYSTR( message );
PyTuple_SetItem( args.get(), 0 , pymsg.getAcquired() );
// the exception base functions want to have an "args" tuple,
// which contains the message
@@ -662,7 +667,21 @@ Any Runtime::pyObject2Any ( const PyRef
{
}
-#if PY_MAJOR_VERSION < 3 // Python 3 has no PyInt
+#if PY_MAJOR_VERSION >= 3 // Python 3 has no PyInt
+ else if (PyBool_Check(o))
+ {
+ if( o == Py_True )
+ {
+ sal_Bool b = sal_True;
+ a = Any( &b, getBooleanCppuType() );
+ }
+ else
+ {
+ sal_Bool b = sal_False;
+ a = Any( &b, getBooleanCppuType() );
+ }
+ }
+#else
else if (PyInt_Check (o))
{
if( o == Py_True )
@@ -724,8 +743,10 @@ Any Runtime::pyObject2Any ( const PyRef
double d = PyFloat_AsDouble (o);
a <<= d;
}
+#if PY_MAJOR_VERSION < 3
else if (PyBytes_Check (o))
a <<= pyString2ustring(o);
+#endif
else if( PyUnicode_Check( o ) )
a <<= pyString2ustring(o);
else if (PyTuple_Check (o))
@@ -750,6 +771,13 @@ Any Runtime::pyObject2Any ( const PyRef
seq = Sequence<sal_Int8 > (
(sal_Int8*) PyBytes_AsString(str.get()), PyBytes_Size(str.get()));
}
+#if PY_MAJOR_VERSION >= 3
+ else if ( PyByteArray_Check( str.get() ) )
+ {
+ seq = Sequence< sal_Int8 >(
+ (sal_Int8 *) PyByteArray_AS_STRING(str.get()), PyByteArray_GET_SIZE(str.get()));
+ }
+#endif
a <<= seq;
}
else
@@ -776,7 +804,7 @@ Any Runtime::pyObject2Any ( const PyRef
Reference< XInterface > () );
}
}
- else if( PyObject_IsInstance( o, getPyUnoClass( runtime ).get() ) )
+ else if( PyObject_IsInstance( o, getPyUnoClass().get() ) )
{
PyUNO* o_pi;
o_pi = (PyUNO*) o;
@@ -881,7 +909,7 @@ Any Runtime::pyObject2Any ( const PyRef
OUStringBuffer buf;
buf.appendAscii( "Couldn't convert " );
PyRef reprString( PyObject_Str( o ) , SAL_NO_ACQUIRE );
- buf.appendAscii( PyBytes_AsString( reprString.get() ) );
+ buf.append( pyString2ustring( reprString.get() ) );
buf.appendAscii( " to a UNO type" );
throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface > () );
}
@@ -939,7 +967,7 @@ Any Runtime::extractUnoException( const
PyRef typeName( PyObject_Str( excType.get() ), SAL_NO_ACQUIRE );
if( typeName.is() )
{
- buf.appendAscii( PyBytes_AsString( typeName.get() ) );
+ buf.append( pyString2ustring( typeName.get() ) );
}
else
{
@@ -949,7 +977,7 @@ Any Runtime::extractUnoException( const
PyRef valueRep( PyObject_Str( excValue.get() ), SAL_NO_ACQUIRE );
if( valueRep.is() )
{
- buf.appendAscii( PyBytes_AsString( valueRep.get()));
+ buf.append( pyString2ustring( valueRep.get()));
}
else
{
@@ -958,7 +986,7 @@ Any Runtime::extractUnoException( const
buf.appendAscii( ", traceback follows\n" );
if( str.is() )
{
- buf.appendAscii( PyBytes_AsString( str.get() ) );
+ buf.append( pyString2ustring( str.get() ) );
}
else
{
Modified: openoffice/branches/ia2/main/pyuno/source/module/pyuno_type.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/pyuno/source/module/pyuno_type.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/pyuno/source/module/pyuno_type.cxx (original)
+++ openoffice/branches/ia2/main/pyuno/source/module/pyuno_type.cxx Fri Feb 1 08:46:00 2013
@@ -156,8 +156,11 @@ sal_Unicode PyChar2Unicode( PyObject *ob
USTR_ASCII( "uno.Char contains an empty unicode string" ),
Reference< XInterface > () );
}
-
+#if PY_VERSION_HEX >= 0x03030000
+ sal_Unicode c = (sal_Unicode)PyUnicode_ReadChar( value.get(), 0 );
+#else
sal_Unicode c = (sal_Unicode)PyUnicode_AsUnicode( value.get() )[0];
+#endif
return c;
}
@@ -166,23 +169,23 @@ Any PyEnum2Enum( PyObject *obj ) throw (
Any ret;
PyRef typeName( PyObject_GetAttrString( obj,const_cast< char * >("typeName") ), SAL_NO_ACQUIRE);
PyRef value( PyObject_GetAttrString( obj, const_cast< char * >("value") ), SAL_NO_ACQUIRE);
- if( !PyBytes_Check( typeName.get() ) || ! PyBytes_Check( value.get() ) )
+ if( !PYSTR_CHECK( typeName.get() ) || ! PYSTR_CHECK( value.get() ) )
{
throw RuntimeException(
USTR_ASCII( "attributes typeName and/or value of uno.Enum are not strings" ),
Reference< XInterface > () );
}
- OUString strTypeName( OUString::createFromAscii( PyBytes_AsString( typeName.get() ) ) );
- char *stringValue = PyBytes_AsString( value.get() );
-
+ OUString strTypeName( pyString2ustring( typeName.get() ) );
+ OUString strValue( pyString2ustring( value.get() ) );
+
TypeDescription desc( strTypeName );
if( desc.is() )
{
if(desc.get()->eTypeClass != typelib_TypeClass_ENUM )
{
OUStringBuffer buf;
- buf.appendAscii( "pyuno.checkEnum: " ).append(strTypeName).appendAscii( "is a " );
+ buf.appendAscii( "pyuno.checkEnum: " ).append( strTypeName ).appendAscii( " is a " );
buf.appendAscii(
typeClassToString( (com::sun::star::uno::TypeClass) desc.get()->eTypeClass));
buf.appendAscii( ", expected ENUM" );
@@ -195,7 +198,7 @@ Any PyEnum2Enum( PyObject *obj ) throw (
int i = 0;
for( i = 0; i < pEnumDesc->nEnumValues ; i ++ )
{
- if( (*((OUString *)&pEnumDesc->ppEnumNames[i])).compareToAscii( stringValue ) == 0 )
+ if( (*((OUString *)&pEnumDesc->ppEnumNames[i])).compareTo( strValue ) == 0 )
{
break;
}
@@ -203,8 +206,8 @@ Any PyEnum2Enum( PyObject *obj ) throw (
if( i == pEnumDesc->nEnumValues )
{
OUStringBuffer buf;
- buf.appendAscii( "value " ).appendAscii( stringValue ).appendAscii( "is unknown in enum " );
- buf.appendAscii( PyBytes_AsString( typeName.get() ) );
+ buf.appendAscii( "value " ).append( strValue ).appendAscii( " is unknown in enum " );
+ buf.append( strTypeName );
throw RuntimeException( buf.makeStringAndClear(), Reference<XInterface> () );
}
ret = Any( &pEnumDesc->pEnumValues[i], desc.get()->pWeakRef );
@@ -212,7 +215,7 @@ Any PyEnum2Enum( PyObject *obj ) throw (
else
{
OUStringBuffer buf;
- buf.appendAscii( "enum " ).appendAscii( PyBytes_AsString(typeName.get()) ).appendAscii( " is unknown" );
+ buf.appendAscii( "enum " ).append( strTypeName ).appendAscii( " is unknown" );
throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface> () );
}
return ret;
@@ -222,7 +225,7 @@ Any PyEnum2Enum( PyObject *obj ) throw (
Type PyType2Type( PyObject * o ) throw(RuntimeException )
{
PyRef pyName( PyObject_GetAttrString( o, const_cast< char * >("typeName") ), SAL_NO_ACQUIRE);
- if( !PyBytes_Check( pyName.get() ) )
+ if( !PYSTR_CHECK( pyName.get() ) )
{
throw RuntimeException(
USTR_ASCII( "type object does not have typeName property" ),
@@ -232,7 +235,7 @@ Type PyType2Type( PyObject * o ) throw(R
PyRef pyTC( PyObject_GetAttrString( o, const_cast< char * >("typeClass") ), SAL_NO_ACQUIRE );
Any enumValue = PyEnum2Enum( pyTC.get() );
- OUString name( OUString::createFromAscii( PyBytes_AsString( pyName.get() ) ) );
+ OUString name( pyString2ustring( pyName.get() ) );
TypeDescription desc( name );
if( ! desc.is() )
{
@@ -276,10 +279,22 @@ PyObject *importToGlobal(PyObject *str,
Py_INCREF( typesModule.get() );
PyDict_SetItemString( dict, "unotypes" , typesModule.get() );
}
+#if PY_VERSION_HEX >= 0x03030000
+ const char *targetName = PyUnicode_AsUTF8( target );
+ const char *typeName = PyUnicode_AsUTF8( str );
+#elif PY_MAJOR_VERSION > 3
+ PyRef pUtf8( PyUnicode_AsUTF8String( target ), SAL_NO_ACQUIRE );
+ const char *targetName = PyBytes_AsString( pUtf8.get() );
+ PyRef pTypeName( PyUnicode_AsUTF8String( str ), SAL_NO_ACQUIRE );
+ const char *typeName = PyBytes_AsString( pTypeName.get() );
+#else
+ /*const*/ char *targetName = PyBytes_AsString( target );
+ const char *typeName = PyBytes_AsString( str );
+#endif
PyModule_AddObject(
typesModule.get(),
- PyBytes_AsString( target ),
- PyUNO_Type_new( PyBytes_AsString(str),tc,runtime ) );
+ targetName,
+ PyUNO_Type_new( typeName, tc, runtime ) );
if( com::sun::star::uno::TypeClass_EXCEPTION == tc ||
com::sun::star::uno::TypeClass_STRUCT == tc )
@@ -296,9 +311,17 @@ PyObject *importToGlobal(PyObject *str,
{
OString enumElementName(
OUStringToOString( pDesc->ppEnumNames[i], RTL_TEXTENCODING_ASCII_US) );
+#if PY_VERSION_HEX >= 0x03030000
+ const char *name = PyUnicode_AsUTF8(str);
+#elif PY_MAJOR_VERSION > 3
+ PyRef *pUtf8( PyUnicode_AsUTF8String( str ), SAL_NO_ACQUIRE );
+ const char *name = PyBytes_AsString( pUtf8.get() );
+#else
+ const char *name = PyBytes_AsString(str);
+#endif
PyDict_SetItemString(
dict, (char*)enumElementName.getStr(),
- PyUNO_Enum_new(PyBytes_AsString(str) , enumElementName.getStr(), runtime ) );
+ PyUNO_Enum_new(name, enumElementName.getStr(), runtime ) );
}
}
Py_INCREF( Py_None );
@@ -318,9 +341,11 @@ PyObject *importToGlobal(PyObject *str,
}
else
{
- OStringBuffer buf;
- buf.append( "constant " ).append(PyBytes_AsString(str)).append( " unknown" );
- PyErr_SetString( PyExc_RuntimeError, buf.getStr() );
+ OUStringBuffer buf;
+ buf.appendAscii( "constant " ).append(pyString2ustring(str)).appendAscii( " unknown" );
+ PyErr_SetString(
+ PyExc_RuntimeError,
+ OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr() );
}
}
else
@@ -379,8 +404,8 @@ static PyObject* callCtor( const Runtime
PyObject *PyUNO_Enum_new( const char *enumBase, const char *enumValue, const Runtime &r )
{
PyRef args( PyTuple_New( 2 ), SAL_NO_ACQUIRE );
- PyTuple_SetItem( args.get() , 0 , PyBytes_FromString( enumBase ) );
- PyTuple_SetItem( args.get() , 1 , PyBytes_FromString( enumValue ) );
+ PyTuple_SetItem( args.get() , 0 , PYSTR_FROMSTR( enumBase ) );
+ PyTuple_SetItem( args.get() , 1 , PYSTR_FROMSTR( enumValue ) );
return callCtor( r, "Enum" , args );
}
@@ -391,7 +416,7 @@ PyObject* PyUNO_Type_new (const char *ty
// retrieve type object
PyRef args( PyTuple_New( 2 ), SAL_NO_ACQUIRE );
- PyTuple_SetItem( args.get() , 0 , PyBytes_FromString( typeName ) );
+ PyTuple_SetItem( args.get() , 0 , PYSTR_FROMSTR( typeName ) );
PyObject *typeClass = PyUNO_Enum_new( "com.sun.star.uno.TypeClass" , typeClassToString(t), r );
if( ! typeClass )
return NULL;
@@ -405,10 +430,16 @@ PyObject* PyUNO_char_new ( sal_Unicode v
// retrieve type object
PyRef args( PyTuple_New( 1 ), SAL_NO_ACQUIRE );
+#if PY_VERSION_HEX >= 0x03030000
+ Py_UCS2 u[1];
+ u[0] = val;
+ PyTuple_SetItem( args.get(), 0, PyUnicode_FromKindAndData( PyUnicode_2BYTE_KIND, u, 1 ) );
+#else
Py_UNICODE u[2];
u[0] = val;
u[1] = 0;
PyTuple_SetItem( args.get() , 0 , PyUnicode_FromUnicode( u ,1) );
+#endif
return callCtor( r, "Char" , args );
}
Modified: openoffice/branches/ia2/main/pyuno/source/module/pyuno_util.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/pyuno/source/module/pyuno_util.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/pyuno/source/module/pyuno_util.cxx (original)
+++ openoffice/branches/ia2/main/pyuno/source/module/pyuno_util.cxx Fri Feb 1 08:46:00 2013
@@ -61,6 +61,7 @@ namespace pyuno
PyRef ustring2PyUnicode( const OUString & str )
{
PyRef ret;
+
#if Py_UNICODE_SIZE == 2
// YD force conversion since python/2 uses wchar_t
ret = PyRef( PyUnicode_FromUnicode( (const Py_UNICODE*)str.getStr(), str.getLength() ), SAL_NO_ACQUIRE );
@@ -85,10 +86,16 @@ OUString pyString2ustring( PyObject *pys
#if Py_UNICODE_SIZE == 2
ret = OUString( (sal_Unicode * ) PyUnicode_AS_UNICODE( pystr ) );
#else
+#if PY_VERSION_HEX >= 0x03030000
+ Py_ssize_t size;
+ char *pUtf8 = PyUnicode_AsUTF8AndSize(pystr, &size);
+ ret = OUString(pUtf8, size, RTL_TEXTENCODING_UTF8);
+#else
PyObject* pUtf8 = PyUnicode_AsUTF8String(pystr);
ret = OUString(PyBytes_AsString(pUtf8), PyBytes_Size(pUtf8), RTL_TEXTENCODING_UTF8);
Py_DECREF(pUtf8);
#endif
+#endif
}
else
{
Modified: openoffice/branches/ia2/main/pyuno/source/module/uno.py
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/pyuno/source/module/uno.py?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/pyuno/source/module/uno.py (original)
+++ openoffice/branches/ia2/main/pyuno/source/module/uno.py Fri Feb 1 08:46:00 2013
@@ -21,13 +21,24 @@
import sys
import pyuno
-import __builtin__
+try:
+ import __builtin__ as builtins
+except:
+ import builtins
+
+try:
+ unicode
+ bytes = str
+ bytearray = str
+except NameError:
+ unicode = str
+
import socket # since on Windows sal3.dll no longer calls WSAStartup
# all functions and variables starting with a underscore (_) must be considered private
# and can be changed at any time. Don't use them
_g_ctx = pyuno.getComponentContext( )
-_g_delegatee = __builtin__.__dict__["__import__"]
+_g_delegatee = builtins.__dict__["__import__"]
def getComponentContext():
""" returns the UNO component context, that was used to initialize the python runtime.
@@ -171,23 +182,9 @@ class Char:
return self.value == that.value
return False
-# Suggested by Christian, but still some open problems which need to be solved first
-#
-#class ByteSequence(str):
-#
-# def __repr__(self):
-# return "<ByteSequence instance %s>" % str.__repr__(self)
-
- # for a little bit compatibility; setting value is not possible as
- # strings are immutable
-# def _get_value(self):
-# return self
-#
-# value = property(_get_value)
-
class ByteSequence:
def __init__(self, value):
- if isinstance(value, str):
+ if isinstance(value, (bytes, bytearray)):
self.value = value
elif isinstance(value, ByteSequence):
self.value = value.value
@@ -200,7 +197,7 @@ class ByteSequence:
def __eq__(self, that):
if isinstance( that, ByteSequence):
return self.value == that.value
- if isinstance(that, str):
+ elif isinstance(that, (bytes, bytearray)):
return self.value == that
return False
@@ -214,7 +211,7 @@ class ByteSequence:
return self.value.__iter__()
def __add__( self , b ):
- if isinstance( b, str ):
+ if isinstance( b, (bytes, bytearray) ):
return ByteSequence( self.value + b )
elif isinstance( b, ByteSequence ):
return ByteSequence( self.value + b.value )
@@ -259,7 +256,7 @@ def _uno_import( name, *optargs, **kwarg
else:
mod = pyuno.__class__(x) # How to create a module ??
d = mod.__dict__
-
+
RuntimeException = pyuno.getClass( "com.sun.star.uno.RuntimeException" )
for x in fromlist:
if x not in d:
@@ -286,16 +283,7 @@ def _uno_import( name, *optargs, **kwarg
return mod
# hook into the __import__ chain
-__builtin__.__dict__["__import__"] = _uno_import
-
-# private function, don't use
-def _impl_extractName(name):
- r = list(range(len(name)-1,0,-1))
- for i in r:
- if name[i] == ".":
- name = name[i+1:len(name)]
- break
- return name
+builtins.__dict__["__import__"] = _uno_import
# private, referenced from the pyuno shared library
def _uno_struct__init__(self,*args):
@@ -306,11 +294,11 @@ def _uno_struct__init__(self,*args):
# private, referenced from the pyuno shared library
def _uno_struct__getattr__(self,name):
- return __builtin__.getattr(self.__dict__["value"],name)
+ return getattr(self.__dict__["value"],name)
# private, referenced from the pyuno shared library
def _uno_struct__setattr__(self,name,value):
- return __builtin__.setattr(self.__dict__["value"],name,value)
+ return setattr(self.__dict__["value"],name,value)
# private, referenced from the pyuno shared library
def _uno_struct__repr__(self):
@@ -325,6 +313,10 @@ def _uno_struct__eq__(self,cmp):
return self.__dict__["value"] == cmp.__dict__["value"]
return False
+def _uno_struct__dir__(self):
+ return dir(self.__dict__["value"]) + list(self.__dict__.keys()) + \
+ list(self.__class__.__dict__.keys())
+
# referenced from pyuno shared lib and pythonscript.py
def _uno_extract_printable_stacktrace( trace ):
mod = None
Modified: openoffice/branches/ia2/main/qadevOOo/build.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/build.xml?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/build.xml (original)
+++ openoffice/branches/ia2/main/qadevOOo/build.xml Fri Feb 1 08:46:00 2013
@@ -39,7 +39,8 @@
<!-- target for building the runner -->
<target name="qadevOOo_runner_build">
- <javac srcdir="${qadevOOo.runner}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}" source="${build.source}">
+ <javac srcdir="${qadevOOo.runner}" destdir="${qadevOOo.class}" includes="**/*.java"
+ debug="${debug}" source="${build.source}" includeantruntime="false">
<classpath>
<pathelement location="${qadevOOo.class}"/>
<fileset dir="${qadevOOo.office_jars}">
@@ -55,7 +56,8 @@
<!-- target for building the tests -->
<target name="qadevOOo_tests_build" depends="qadevOOo_runner_build">
- <javac srcdir="${qadevOOo.tests}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}" source="${build.source}">
+ <javac srcdir="${qadevOOo.tests}" destdir="${qadevOOo.class}" includes="**/*.java"
+ debug="${debug}" source="${build.source}" includeantruntime="false">
<classpath>
<pathelement location="${qadevOOo.class}"/>
<fileset dir="${qadevOOo.office_jars}">
Modified: openoffice/branches/ia2/main/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java Fri Feb 1 08:46:00 2013
@@ -128,8 +128,6 @@ public class GraphicalDifferenceCheck
*
* @param _sInputFile the original document
* @param _sReferencePath the directory where the document will print as file or export as pdf.
- *
- * @throws ConvWatchException if the are problems, see containing message
*/
public static boolean isReferenceExists(String _sInputFile, String _sReferencePath, GraphicalTestArguments _aGTA)
{
@@ -146,7 +144,7 @@ public class GraphicalDifferenceCheck
* needed very much disk space (up to 10MB per page).
* The path _sOutputPath must be writeable.
* @param _sReferencePath the directory where the document will print as file or export as pdf.
- * @param _GTA Helper class for lot of parameter to control the office.
+ * @param _aGTA Helper class for lot of parameter to control the office.
*
* Disadvantage: stops rest if one test file has a problem.
*/
@@ -165,7 +163,7 @@ public class GraphicalDifferenceCheck
* needed very much disk space (up to 10MB per page).
* The path _sOutputPath must be writeable.
* @param _sDiffPath Path to older differences.
- * @param _GTA Helper class for lot of parameter to control the office.
+ * @param _aGTA Helper class for lot of parameter to control the office.
*
*
* Stops all, if one creation of reference fails
@@ -268,10 +266,10 @@ public class GraphicalDifferenceCheck
* These documents need sufficient disk space (up to 10MB per page).
* A directory structure will be created, which is a mirrored from input path.
*
- * @param resultDocName Name by which the xComponent shall be saved as OpenOffice.org XML document.
+ * @param _resultDocName Name by which the xComponent shall be saved as OpenOffice.org XML document.
* If provided without suffix, the suffix will be derived from the export filter.
* @param _sReferencePath the directory where the document will print as file or export as pdf.
- * @param _GTA Helper class for lot of parameter to control the office.
+ * @param _aGTA Helper class for lot of parameter to control the office.
*/
public static boolean checkOneFile(XComponent xComponent, String _sOutputPath, String _resultDocName, String _sReferencePath, GraphicalTestArguments _aGTA ) throws ConvWatchException
{
Modified: openoffice/branches/ia2/main/qadevOOo/runner/convwatch/ReportDesignerTest.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/runner/convwatch/ReportDesignerTest.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/runner/convwatch/ReportDesignerTest.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/runner/convwatch/ReportDesignerTest.java Fri Feb 1 08:46:00 2013
@@ -117,7 +117,7 @@ class PropertyHelper
{
/**
Create a PropertyValue[] from a ArrayList
- @param _aArrayList
+ @param _aPropertyList
@return a PropertyValue[]
*/
public static PropertyValue[] createPropertyValueArrayFormArrayList(ArrayList _aPropertyList)
Modified: openoffice/branches/ia2/main/qadevOOo/runner/graphical/JPEGComparator.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/runner/graphical/JPEGComparator.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/runner/graphical/JPEGComparator.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/runner/graphical/JPEGComparator.java Fri Feb 1 08:46:00 2013
@@ -398,7 +398,6 @@ public class JPEGComparator extends Enha
* @param _sDocumentName
* @param _sResult
* @param _aParams
- * @return 0=no difference !=0 both files differ
*/
private void compareJPEG(String _sDocumentName, String _sResult, ParameterHelper _aParams)
{
Modified: openoffice/branches/ia2/main/qadevOOo/runner/helper/ConfigurationRead.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/runner/helper/ConfigurationRead.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/runner/helper/ConfigurationRead.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/runner/helper/ConfigurationRead.java Fri Feb 1 08:46:00 2013
@@ -127,7 +127,7 @@ public class ConfigurationRead {
/**
* Get contents of a node by its hierarchical name.
- * @param The hierarchical name of the node.
+ * @param name The hierarchical name of the node.
* @return The contents as an object
*/
public Object getByHierarchicalName(String name) throws NoSuchElementException {
Modified: openoffice/branches/ia2/main/qadevOOo/runner/helper/ObjectInspectorModelImpl.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/runner/helper/ObjectInspectorModelImpl.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/runner/helper/ObjectInspectorModelImpl.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/runner/helper/ObjectInspectorModelImpl.java Fri Feb 1 08:46:00 2013
@@ -99,14 +99,14 @@ public class ObjectInspectorModelImpl im
*/
public int getMinHelpTextLines() {
return 3;
- };
+ }
/** returns maximum number of lines in the help text section.
@return 8
*/
public int getMaxHelpTextLines() {
return 8;
- };
+ }
/** returns whether or not the inspector's UI should be read-only
*/
Modified: openoffice/branches/ia2/main/qadevOOo/runner/helper/PropertyHandlerImpl.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/runner/helper/PropertyHandlerImpl.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/runner/helper/PropertyHandlerImpl.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/runner/helper/PropertyHandlerImpl.java Fri Feb 1 08:46:00 2013
@@ -39,7 +39,7 @@ public class PropertyHandlerImpl impleme
}
/**
- * This method currently do nothig
+ * This method currently does nothing
* @param ActuatingPropertyName the id of the actuating property.
* @param NewValue the new value of the property
* @param OldValue the old value of the property
@@ -60,14 +60,14 @@ public class PropertyHandlerImpl impleme
}
/**
- * This method currently do nothig
+ * This method currently does nothing
* @param xEventListener the listener to notify about changes
*/
public void addEventListener(com.sun.star.lang.XEventListener xEventListener) {
}
/**
- * This method currently do nothig
+ * This method currently does nothing
* @param xPropertyChangeListener the listener to notify about property changes
* @throws com.sun.star.lang.NullPointerException com::sun::star::lang::NullPointerException if the listener is NULL
*/
@@ -75,7 +75,7 @@ public class PropertyHandlerImpl impleme
}
/**
- * This method currently do nothig
+ * This method currently does nothing
* @param PropertyName The name of the property whose value is to be converted.
* @param PropertyValue The to-be-converted property value.
* @param ControlValueType The target type of the conversion. This type is determined by the control which is used to display the property, which in turn is determined by the handler itself in describePropertyLine .
@@ -93,7 +93,7 @@ public class PropertyHandlerImpl impleme
}
/**
- * This method currently do nothig
+ * This method currently does nothing
* @param PropertyName The name of the conversion's target property.
* @param ControlValue The to-be-converted control value. This value has been obtained from an XPropertyControl , using its Value attribute.
* @throws com.sun.star.beans.UnknownPropertyException ::com::sun::star::beans::UnknownPropertyException if the given property is not supported by the property handler
@@ -104,9 +104,8 @@ public class PropertyHandlerImpl impleme
}
/**
- * This method currently do nothig
+ * This method currently does nothing
* @param PropertyName the name of the property whose user interface is to be described
- * @param out_Descriptor the descriptor of the property line, to be filled by the XPropertyHandler implementation
* @param ControlFactory a factory for creating XPropertyControl instances. Must not be NULL .
* @throws com.sun.star.beans.UnknownPropertyException ::com::sun::star::beans::UnknownPropertyException if the given property is not supported by this handler
*
@@ -121,13 +120,13 @@ public class PropertyHandlerImpl impleme
}
/**
- * This method currently do nothig
+ * This method currently does nothing
*/
public void dispose() {
}
/**
- * This method currently do nothig
+ * This method currently does nothing
* @return null
*/
public String[] getActuatingProperties() {
@@ -135,7 +134,7 @@ public class PropertyHandlerImpl impleme
}
/**
- * This method currently do nothig
+ * This method currently does nothing
* @param PropertyName the name of the property whose state is to be retrieved
* @throws com.sun.star.beans.UnknownPropertyException ::com::sun::star::beans::UnknownPropertyException if the given property is not supported by the property handler
* @return null
@@ -146,7 +145,7 @@ public class PropertyHandlerImpl impleme
}
/**
- * This method currently do nothig
+ * This method currently does nothing
* @param PropertyName the name of the property whose value is to be retrieved
* @throws com.sun.star.beans.UnknownPropertyException ::com::sun::star::beans::UnknownPropertyException if the given property is not supported by the property handler
* @return null
@@ -156,7 +155,7 @@ public class PropertyHandlerImpl impleme
}
/**
- * This method currently do nothig
+ * This method currently does nothing
* @return null
*/
public String[] getSupersededProperties() {
@@ -164,7 +163,7 @@ public class PropertyHandlerImpl impleme
}
/**
- * This method currently do nothig
+ * This method currently does nothing
* @return null
*/
public com.sun.star.beans.Property[] getSupportedProperties() {
@@ -172,7 +171,7 @@ public class PropertyHandlerImpl impleme
}
/**
- * This method currently do nothig
+ * This method currently does nothing
* @param Component the component to inspect. Must not be NULL
* @throws com.sun.star.lang.NullPointerException com::sun::star::lang::NullPointerException if the component is NULL
*/
@@ -180,7 +179,7 @@ public class PropertyHandlerImpl impleme
}
/**
- * This method currently do nothig
+ * This method currently does nothing
* @param PropertyName the name of the property whose composability is to be determined
* @throws com.sun.star.beans.UnknownPropertyException ::com::sun::star::beans::UnknownPropertyException if the given property is not supported by the property handler
*
@@ -192,7 +191,7 @@ public class PropertyHandlerImpl impleme
}
/**
- * This method currently do nothig
+ * This method currently does nothing
* @param PropertyName The name of the property whose browse button has been clicked
* @param Primary true if and only if the primary button has been clicked, false otherwise
* @param out_Data If the method returns InteractiveSelectionResult::ObtainedValue , then _rData contains the value which has been interactively obtained from the user, and which still needs to be set at the inspected component.
@@ -213,21 +212,21 @@ public class PropertyHandlerImpl impleme
}
/**
- * This method currently do nothig
+ * This method currently does nothing
* @param xEventListener the listener to be revoked
*/
public void removeEventListener(com.sun.star.lang.XEventListener xEventListener) {
}
/**
- * This method currently do nothig
+ * This method currently does nothing
* @param xPropertyChangeListener the listener to be revoke
*/
public void removePropertyChangeListener(com.sun.star.beans.XPropertyChangeListener xPropertyChangeListener) {
}
/**
- * This method currently do nothig
+ * This method currently does nothing
* @param PropertyName the name of the property whose value is to be set
* @param Value the property value to set
* @throws com.sun.star.beans.UnknownPropertyException ::com::sun::star::beans::UnknownPropertyException if the given property is not supported by the property handler
@@ -236,7 +235,7 @@ public class PropertyHandlerImpl impleme
}
/**
- * This method currently do nothig
+ * This method currently does nothing
* @param Suspend Whether the handler is to be suspended true or reactivated ( false ). The latter happens if a handler was successfully suspended, but an external instance vetoed the whole suspension process.
* @return false
*/
@@ -245,7 +244,7 @@ public class PropertyHandlerImpl impleme
}
/**
- * This method currently do nothig
+ * This method currently does nothing
*/
public void describePropertyLine(String string, LineDescriptor[] lineDescriptor, XPropertyControlFactory xPropertyControlFactory) throws UnknownPropertyException, com.sun.star.lang.NullPointerException {
Modified: openoffice/branches/ia2/main/qadevOOo/runner/helper/PropertyHelper.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/runner/helper/PropertyHelper.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/runner/helper/PropertyHelper.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/runner/helper/PropertyHelper.java Fri Feb 1 08:46:00 2013
@@ -31,7 +31,7 @@ public class PropertyHelper
{
/**
Create a PropertyValue[] from a ArrayList
- @param _aArrayList
+ @param _aPropertyList
@return a PropertyValue[]
*/
public static PropertyValue[] createPropertyValueArrayFormArrayList(ArrayList _aPropertyList)
Modified: openoffice/branches/ia2/main/qadevOOo/runner/helper/URLHelper.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/runner/helper/URLHelper.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/runner/helper/URLHelper.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/runner/helper/URLHelper.java Fri Feb 1 08:46:00 2013
@@ -242,7 +242,7 @@ public class URLHelper
* used for further purposes. One parameter define the start directory,
* another one describe the url protocol, which the return URL names should have.
*
- * @param sDir
+ * @param sStartDir
* the start directory, which should include all test files
*
* @return [Vector]
Modified: openoffice/branches/ia2/main/qadevOOo/runner/lib/MultiPropertyTest.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/runner/lib/MultiPropertyTest.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/runner/lib/MultiPropertyTest.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/runner/lib/MultiPropertyTest.java Fri Feb 1 08:46:00 2013
@@ -59,7 +59,7 @@ import com.sun.star.uno.Type;
*
* @see MultiMethodTest
* @see #testProperty(String)
- * @see #testProperty(String, Propertytester)
+ * @see #testProperty(String, PropertyTester)
* @see #getNewValue
* @see #compare
* @see #toString(Object)
@@ -105,7 +105,7 @@ public class MultiPropertyTest extends M
* calls testProperty method for the method. Otherwise calls
* super.invokeTestMethod().
*
- * @see #MultiMethodTest.invokeTestMethod()
+ * @see MultiMethodTest#invokeTestMethod
*/
protected void invokeTestMethod(Method meth, String methName)
{
@@ -258,11 +258,11 @@ public class MultiPropertyTest extends M
/**
* The method checks result of setting a new value to the
* property based o the following arguments:
- * @propName - the property to test
- * @oldValue - the old value of the property, before changing it.
- * @newValue - the new value the property has been set with
- * @resValue - the value of the property after having changed it
- * @exception - if not null - the exception thrown by
+ * @param propName - the property to test
+ * @param oldValue - the old value of the property, before changing it.
+ * @param newValue - the new value the property has been set with
+ * @param resValue - the value of the property after having changed it
+ * @param exception - if not null - the exception thrown by
* XPropertySet.setPropertyValue, else indicates
* normal method completion.
*
@@ -509,9 +509,9 @@ public class MultiPropertyTest extends M
* specified as parameters.
*
* @param val1 Not <code>null</code> value for the property
- * tested.
- * @param val1 Not <code>null</code> value for the property
- * tested which differs from the first value.
+ * tested.
+ * @param val2 Not <code>null</code> value for the property
+ * tested which differs from the first value.
*/
public PropertyValueSwitcher(Object val1, Object val2)
{
@@ -560,7 +560,7 @@ public class MultiPropertyTest extends M
* Tests the property using <code>PropertyValueSwitcher</code>
* tester and two values for this property.
*
- * @see #PropertyValueSwitcher
+ * @see PropertyValueSwitcher
*/
protected void testProperty(String propName, Object val1, Object val2)
{
Modified: openoffice/branches/ia2/main/qadevOOo/runner/lib/Status.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/runner/lib/Status.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/runner/lib/Status.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/runner/lib/Status.java Fri Feb 1 08:46:00 2013
@@ -43,8 +43,8 @@ public class Status extends SimpleStatus
/**
* Construct a status: use runState and state
- * @param runState: either PASSED, SKIPPED, etc.
- * @param state: OK or FAILED.
+ * @param runState either PASSED, SKIPPED, etc.
+ * @param state OK or FAILED.
*/
public Status(int runState, boolean state ) {
super(runState, state);
@@ -52,7 +52,7 @@ public class Status extends SimpleStatus
/**
* Construct a status: use own message and state.
- * @parame messaeg An own message for the status.
+ * @parame message An own message for the status.
* @param state: OK or FAILED.
*/
public Status(String message, boolean state) {
@@ -116,7 +116,7 @@ public class Status extends SimpleStatus
* "FAILED.The getLabel works wrong", "PASSED.OK".
*/
public String toString() {
- String str = getRunStateString() + "." + getStateString();;
+ String str = getRunStateString() + "." + getStateString();
return str;
}
Modified: openoffice/branches/ia2/main/qadevOOo/runner/lib/TestCase.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/runner/lib/TestCase.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/runner/lib/TestCase.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/runner/lib/TestCase.java Fri Feb 1 08:46:00 2013
@@ -83,7 +83,7 @@ public abstract class TestCase {
* @param tParam test parameters
* @param log writer to log information while testing
*
- * @see #initializeTestCase()
+ * @see #initializeTestCase
*/
protected void initialize( TestParameters tParam, PrintWriter log ) {
}
@@ -119,7 +119,7 @@ public abstract class TestCase {
*
* @return the created <code>TestEnvironment</code>
*
- * @see #createTestEnvironment()
+ * @see #createTestEnvironment
* @see lib.TestEnvironment
*/
public synchronized TestEnvironment getTestEnvironment( TestParameters tParam ) {
@@ -162,7 +162,7 @@ public abstract class TestCase {
* @param log writer to log information while testing
*
* @see TestEnvironment
- * @see #getTestEnvironment()
+ * @see #getTestEnvironment
*/
protected abstract TestEnvironment createTestEnvironment(
TestParameters tParam, PrintWriter log );
Modified: openoffice/branches/ia2/main/qadevOOo/runner/lib/TestResult.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/runner/lib/TestResult.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/runner/lib/TestResult.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/runner/lib/TestResult.java Fri Feb 1 08:46:00 2013
@@ -59,7 +59,7 @@ public class TestResult {
* The method makes the method tested with the status, i.e. it adds the
* status to its state and makes it completed.
*
- * @param method reffers to the method whoch was tested
+ * @param method refers to the method which was tested
* @param status describes the result of testing the method
* @return <tt>true</tt> if status is OK, <tt>false</tt> otherwise.
*
@@ -99,4 +99,4 @@ public class TestResult {
return (Status)testedMethods.get( method );
}
-}
\ No newline at end of file
+}
Modified: openoffice/branches/ia2/main/qadevOOo/runner/stats/OutProducerFactory.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/runner/stats/OutProducerFactory.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/runner/stats/OutProducerFactory.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/runner/stats/OutProducerFactory.java Fri Feb 1 08:46:00 2013
@@ -38,7 +38,7 @@ public class OutProducerFactory {
* <li>DataBaseOut - If set to true, a database outproducer is created.
* <li>OutProducer - The value of this parameter names the class that is created.
* </ul>
- * @param Parameters of the test.
+ * @param param Parameters of the test.
* @return The created out producer.
*/
public static LogWriter createOutProducer(Hashtable param) {
Modified: openoffice/branches/ia2/main/qadevOOo/runner/util/DBTools.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/runner/util/DBTools.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/runner/util/DBTools.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/runner/util/DBTools.java Fri Feb 1 08:46:00 2013
@@ -412,9 +412,8 @@ public class DBTools {
/**
* Performs connection to DataSource specified.
* @param dbSource <code>com.sun.star.sdb.DataSource</code> service
- * specified data source which must be already registered in the
- * <code>DatabaseContext</code> service.
- * @param dbSource Data source to be connected to.
+ * specified data source which must be already registered in the
+ * <code>DatabaseContext</code> service.
* @return Connection to the data source.
*/
public XConnection connectToSource(Object dbSource)
@@ -763,7 +762,7 @@ public class DBTools {
* are declared for column index fast find.
* @param statement object used for executing a static SQL
* statement and obtaining the results produced by it.
- * @param table Test table name.
+ * @param tbl_name Test table name.
*/
protected void createMySQLTable(Statement statement, String tbl_name)
throws java.sql.SQLException {
@@ -811,7 +810,7 @@ public class DBTools {
* Drops table.
* @param statement object used for executing a static SQL
* statement and obtaining the results produced by it.
- * @param table Test table name.
+ * @param tbl_name Test table name.
*/
protected void dropMySQLTable(Statement statement, String tbl_name)
throws java.sql.SQLException {
Modified: openoffice/branches/ia2/main/qadevOOo/runner/util/PropertyName.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/runner/util/PropertyName.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/runner/util/PropertyName.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/runner/util/PropertyName.java Fri Feb 1 08:46:00 2013
@@ -133,8 +133,8 @@ public interface PropertyName {
final public static String CYGWIN = "Cygwin";
/**
* parameter name: "NoCwsAttach"<p>
- * If this paraeter is set to "true" , a status of CWS-UnoAPI-Tests was not attached to EIS<p>
- * @see tests.complex.unoapi.CheckModuleAPI
+ * If this parameter is set to "true" , a status of CWS-UnoAPI-Tests was not attached to EIS<p>
+ * @see complex.unoapi.CheckModuleAPI
*/
final public static String NO_CWS_ATTACH = "NoCwsAttach";
/**
Modified: openoffice/branches/ia2/main/qadevOOo/runner/util/SOfficeFactory.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/runner/util/SOfficeFactory.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/runner/util/SOfficeFactory.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/runner/util/SOfficeFactory.java Fri Feb 1 08:46:00 2013
@@ -414,7 +414,6 @@ public class SOfficeFactory {
int i;
for (i = 0; oNameAccess.hasByName(prefix + i); i++) {
}
- ;
return prefix + i;
}
@@ -622,4 +621,4 @@ public class SOfficeFactory {
}
return null;
} // finish queryXServiceInfo
-}
\ No newline at end of file
+}
Modified: openoffice/branches/ia2/main/qadevOOo/runner/util/WaitUnreachable.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/runner/util/WaitUnreachable.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/runner/util/WaitUnreachable.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/runner/util/WaitUnreachable.java Fri Feb 1 08:46:00 2013
@@ -113,7 +113,7 @@ public final class WaitUnreachable {
}
private final WaitUnreachable unreachable;
- };
+ }
new WaitThread(obj).start();
}
Modified: openoffice/branches/ia2/main/qadevOOo/runner/util/XMLTools.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/runner/util/XMLTools.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/runner/util/XMLTools.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/runner/util/XMLTools.java Fri Feb 1 08:46:00 2013
@@ -908,7 +908,7 @@ public class XMLTools {
* @param xDoc Target document to be imported.
* @param docType Type of document (for example 'Calc', 'Writer', 'Draw')
* The type must start with <b>capital</b> letter.
- * @param exportType The type of export specifies if the whole
+ * @param importType The type of export specifies if the whole
* document will be exported or one of its parts (Meta info, Styles, etc.).
* The following types supported (it hardly depends of XML data in file) :
* "" (empty string) - for the whole document ;
@@ -932,4 +932,4 @@ public class XMLTools {
xImp.setTargetDocument(xDoc) ;
parseXMLFile(xMSF, fileURL, xDocHandImp) ;
}
-}
\ No newline at end of file
+}
Modified: openoffice/branches/ia2/main/qadevOOo/runner/util/utils.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/runner/util/utils.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/runner/util/utils.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/runner/util/utils.java Fri Feb 1 08:46:00 2013
@@ -439,7 +439,7 @@ public class utils {
/**
* converts a fileURL to a system URL
- * @param a file URL
+ * @param fileURL a file URL
* @return a system URL
*/
public static String getSystemURL(String fileURL) {
@@ -490,7 +490,7 @@ public class utils {
/**
* This method deletes via office the given file URL. It checks the existance
* of <CODE>fileURL</CODE>. If exists it will be deletet.
- * @param msf the multiservice factory
+ * @param xMsf the multiservice factory
* @param fileURL the file to delete
* @return true if the file could be deletet or the file does not exist
*/
@@ -515,9 +515,9 @@ public class utils {
/**
* This method copies via office a given file to a new one
- * @param msf the multi service factory
- * @param oldF the source file
- * @param newF the destination file
+ * @param xMsf the multi service factory
+ * @param source the source file
+ * @param destinaion the destination file
* @return true at success
*/
public static boolean copyFile(XMultiServiceFactory xMsf, String source, String destinaion) {
@@ -897,7 +897,7 @@ public class utils {
* @param expand the string to expand
* @throws java.lang.Exception was thrown on any exception
* @return return the expanded string
- * @see com.sun.star.util.theMacroExpander
+ * @see com.sun.star.util.XMacroExpander
*/
public static String expandMacro(XMultiServiceFactory xMSF, String expand) throws java.lang.Exception {
try {
@@ -964,7 +964,7 @@ public class utils {
/**
* dispatches given <CODE>URL</CODE> to the <CODE>XController</CODE>
* @param xMSF the <CODE>XMultiServiceFactory</CODE>
- * @param xComp the <CODE>XController</CODE> to query for a XDispatchProvider
+ * @param xCont the <CODE>XController</CODE> to query for a XDispatchProvider
* @param URL the <CODE>URL</CODE> to dispatch
* @throws java.lang.Exception throws <CODE>java.lang.Exception</CODE> on any error
*/
Modified: openoffice/branches/ia2/main/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java Fri Feb 1 08:46:00 2013
@@ -172,7 +172,7 @@ public class MyPersistObject implements
/**
- * Fuction to get information about the property set.
+ * Function to get information about the property set.
* @return The information
* @see com.sun.star.io.XPropertySet
*/
Modified: openoffice/branches/ia2/main/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java Fri Feb 1 08:46:00 2013
@@ -85,8 +85,6 @@ public class _XAccessibleComponent exten
curX++;
}
- ;
-
//if ((bounds.X <= curX) && (curX < bounds.Width+bounds.X)) {
if (curX < bounds.Width) {
log.println("Upper bound of box containsPoint point (" + curX +
@@ -107,8 +105,6 @@ public class _XAccessibleComponent exten
curX++;
}
- ;
-
//if ((bounds.X <= curX) && (curX < bounds.Width+bounds.X)) {
if (curX < bounds.Width) {
log.println("Lower bound of box containsPoint point (" + curX +
@@ -127,8 +123,6 @@ public class _XAccessibleComponent exten
curY++;
}
- ;
-
//if ((bounds.Y <= curY) && (curY < bounds.Height+bounds.Y)) {
if (curY < bounds.Height) {
log.println("Left bound of box containsPoint point (0," + curY +
@@ -148,8 +142,6 @@ public class _XAccessibleComponent exten
curY++;
}
- ;
-
//if ((bounds.Y <= curY) && (curY < bounds.Height + bounds.Y)) {
if (curY < bounds.Height) {
log.println("Right bound of box containsPoint point (" +
@@ -273,8 +265,6 @@ public class _XAccessibleComponent exten
curY--;
}
- ;
-
if ((curX == chBnd.Width) && isShowing) {
log.println("Couldn't find a point with containsPoint");
@@ -644,4 +634,4 @@ public class _XAccessibleComponent exten
}
return Covered;
}
-}
\ No newline at end of file
+}
Modified: openoffice/branches/ia2/main/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java (original)
+++ openoffice/branches/ia2/main/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java Fri Feb 1 08:46:00 2013
@@ -74,7 +74,7 @@ public class _XAccessibleSelection exten
* Retrieves the interface <code>XAccessibleContext</code>
* and object relation.
* @see com.sun.star.accessibility.XAccessibleContext
- * @see ifc.accessibility.XAccessibleContext
+ * @see ifc.accessibility._XAccessibleContext
*/
protected void before() {
xAC = (XAccessibleContext) UnoRuntime.queryInterface(
@@ -593,4 +593,4 @@ public class _XAccessibleSelection exten
} catch (InterruptedException ex) {
}
}
-}
\ No newline at end of file
+}