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

INTEGRATION: CWS warnings01 (1.4.24); FILE MERGED

Browse source 
2006/03/01 10:01:16 sb 1.4.24.3: #i53898# Made code waring-free.
2005/09/23 02:09:34 sb 1.4.24.2: RESYNC: (1.4-1.5); FILE MERGED
2005/09/09 15:31:22 sb 1.4.24.1: #i53898# Made code warning-free.
This commit is contained in:
Jens-Heiner Rechtien 2006-06-20 04:04:33 +00:00
parent 5499aad3af
commit dae1234ede
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pyuno/source/module/pyuno_type.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: pyuno_type.cxx,v $ * $RCSfile: pyuno_type.cxx,v $
* *
* $Revision: 1.5 $ * $Revision: 1.6 $
* *
* last change: $Author: rt $ $Date: 2005-09-08 16:53:49 $ * last change: $Author: hr $ $Date: 2006-06-20 05:04:33 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -152,9 +152,9 @@ PyRef getAnyClass( const Runtime & r )
} }
sal_Unicode PyChar2Unicode( PyObject *obj, const Runtime & r ) throw ( RuntimeException ) sal_Unicode PyChar2Unicode( PyObject *obj ) throw ( RuntimeException )
{ {
PyRef value( PyObject_GetAttrString( obj, "value" ), SAL_NO_ACQUIRE ); PyRef value( PyObject_GetAttrString( obj, const_cast< char * >("value") ), SAL_NO_ACQUIRE );
if( ! PyUnicode_Check( value.get() ) ) if( ! PyUnicode_Check( value.get() ) )
{ {
throw RuntimeException( throw RuntimeException(
@ -173,11 +173,11 @@ sal_Unicode PyChar2Unicode( PyObject *obj, const Runtime & r ) throw ( RuntimeEx
return c; return c;
} }
Any PyEnum2Enum( PyObject *obj, const Runtime & r ) throw ( RuntimeException ) Any PyEnum2Enum( PyObject *obj ) throw ( RuntimeException )
{ {
Any ret; Any ret;
PyRef typeName( PyObject_GetAttrString( obj,"typeName" ), SAL_NO_ACQUIRE); PyRef typeName( PyObject_GetAttrString( obj,const_cast< char * >("typeName") ), SAL_NO_ACQUIRE);
PyRef value( PyObject_GetAttrString( obj, "value" ), SAL_NO_ACQUIRE); PyRef value( PyObject_GetAttrString( obj, const_cast< char * >("value") ), SAL_NO_ACQUIRE);
if( !PyString_Check( typeName.get() ) || ! PyString_Check( value.get() ) ) if( !PyString_Check( typeName.get() ) || ! PyString_Check( value.get() ) )
{ {
throw RuntimeException( throw RuntimeException(
@ -231,9 +231,9 @@ Any PyEnum2Enum( PyObject *obj, const Runtime & r ) throw ( RuntimeException )
} }
Type PyType2Type( PyObject * o, const Runtime & r ) throw(RuntimeException ) Type PyType2Type( PyObject * o ) throw(RuntimeException )
{ {
PyRef pyName( PyObject_GetAttrString( o, "typeName" ), SAL_NO_ACQUIRE); PyRef pyName( PyObject_GetAttrString( o, const_cast< char * >("typeName") ), SAL_NO_ACQUIRE);
if( !PyString_Check( pyName.get() ) ) if( !PyString_Check( pyName.get() ) )
{ {
throw RuntimeException( throw RuntimeException(
@ -241,8 +241,8 @@ Type PyType2Type( PyObject * o, const Runtime & r ) throw(RuntimeException )
Reference< XInterface > () ); Reference< XInterface > () );
} }
PyRef pyTC( PyObject_GetAttrString( o, "typeClass" ), SAL_NO_ACQUIRE ); PyRef pyTC( PyObject_GetAttrString( o, const_cast< char * >("typeClass") ), SAL_NO_ACQUIRE );
Any enumValue = PyEnum2Enum( pyTC.get(), r ); Any enumValue = PyEnum2Enum( pyTC.get() );
OUString name( OUString::createFromAscii( PyString_AsString( pyName.get() ) ) ); OUString name( OUString::createFromAscii( PyString_AsString( pyName.get() ) ) );
TypeDescription desc( name ); TypeDescription desc( name );
@ -284,7 +284,7 @@ PyObject *importToGlobal(PyObject *str, PyObject *dict, PyObject *target)
PyRef typesModule( PyDict_GetItemString( dict, "unotypes" ) ); PyRef typesModule( PyDict_GetItemString( dict, "unotypes" ) );
if( ! typesModule.is() || ! PyModule_Check( typesModule.get() )) if( ! typesModule.is() || ! PyModule_Check( typesModule.get() ))
{ {
typesModule = PyRef( PyModule_New( "unotypes" ), SAL_NO_ACQUIRE ); typesModule = PyRef( PyModule_New( const_cast< char * >("unotypes") ), SAL_NO_ACQUIRE );
Py_INCREF( typesModule.get() ); Py_INCREF( typesModule.get() );
PyDict_SetItemString( dict, "unotypes" , typesModule.get() ); PyDict_SetItemString( dict, "unotypes" , typesModule.get() );
} }
@ -346,7 +346,7 @@ PyObject *importToGlobal(PyObject *str, PyObject *dict, PyObject *target)
} }
} }
} }
catch( com::sun::star::container::NoSuchElementException &e ) catch( com::sun::star::container::NoSuchElementException & )
{ {
OUStringBuffer buf; OUStringBuffer buf;
buf.appendAscii( "pyuno.imp unknown type " ); buf.appendAscii( "pyuno.imp unknown type " );