diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:03:59 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:03:59 +0000 |
| commit | c79d6a2782cc97d725fbdd04245e4fce4d9d1d68 (patch) | |
| tree | 2709bc927068f2ed4798f4f37bbfee07e12a0121 /pyuno | |
| parent | 67c96a9e5f81252788073af51835eafae433f9e4 (diff) | |
INTEGRATION: CWS warnings01 (1.3.44); FILE MERGED
2006/04/20 14:46:09 sb 1.3.44.5: #i53898# Made code warning-free again after resync to SRC680m162.
2006/04/07 21:24:23 sb 1.3.44.4: RESYNC: (1.4-1.5); FILE MERGED
2006/03/01 10:01:16 sb 1.3.44.3: #i53898# Made code waring-free.
2005/09/23 02:08:50 sb 1.3.44.2: RESYNC: (1.3-1.4); FILE MERGED
2005/09/09 15:31:19 sb 1.3.44.1: #i53898# Made code warning-free.
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/source/module/pyuno_impl.hxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx index 5a2535c51bf9..5f4ee4bf65f3 100644 --- a/pyuno/source/module/pyuno_impl.hxx +++ b/pyuno/source/module/pyuno_impl.hxx @@ -4,9 +4,9 @@ * * $RCSfile: pyuno_impl.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-03-22 10:49:43 $ + * last change: $Author: hr $ $Date: 2006-06-20 05:03:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -35,11 +35,11 @@ #ifndef _PYUNO_IMPL_ #define _PYUNO_IMPL_ +#include <pyuno/pyuno.hxx> + #include <hash_map> #include <hash_set> -#include <pyuno/pyuno.hxx> - #include <com/sun/star/beans/XIntrospection.hpp> #include <com/sun/star/script/XTypeConverter.hpp> #include <com/sun/star/script/XInvocation2.hpp> @@ -74,14 +74,14 @@ bool isLog( RuntimeCargo *cargo, sal_Int32 loglevel ); void log( RuntimeCargo *cargo, sal_Int32 level, const rtl::OUString &logString ); void log( RuntimeCargo *cargo, sal_Int32 level, const char *str ); void logCall( RuntimeCargo *cargo, const char *intro, - sal_Int64 ptr, const rtl::OUString & aFunctionName, + void * ptr, const rtl::OUString & aFunctionName, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > & args ); void logReply( RuntimeCargo *cargo, const char *intro, - sal_Int64 ptr, const rtl::OUString & aFunctionName, + void * ptr, const rtl::OUString & aFunctionName, const com::sun::star::uno::Any &returnValue, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > & args ); void logException( RuntimeCargo *cargo, const char *intro, - sal_Int64 ptr, const rtl::OUString &aFunctionName, + void * ptr, const rtl::OUString &aFunctionName, const void * data, const com::sun::star::uno::Type & type ); static const sal_Int32 VAL2STR_MODE_DEEP = 0; static const sal_Int32 VAL2STR_MODE_SHALLOW = 1; @@ -178,13 +178,13 @@ PyRef getClass( const rtl::OUString & name , const Runtime & runtime ); PyRef getAnyClass( const Runtime &); PyObject *PyUNO_invoke( PyObject *object, const char *name , PyObject *args ); -com::sun::star::uno::Any PyEnum2Enum( PyObject *obj, const Runtime & r ) +com::sun::star::uno::Any PyEnum2Enum( PyObject *obj ) throw ( com::sun::star::uno::RuntimeException ); sal_Bool PyBool2Bool( PyObject *o, const Runtime & r ) throw ( com::sun::star::uno::RuntimeException ); -sal_Unicode PyChar2Unicode( PyObject *o, const Runtime & r ) +sal_Unicode PyChar2Unicode( PyObject *o ) throw ( com::sun::star::uno::RuntimeException ); -com::sun::star::uno::Type PyType2Type( PyObject * o, const Runtime & r ) +com::sun::star::uno::Type PyType2Type( PyObject * o ) throw( com::sun::star::uno::RuntimeException ); void raisePyExceptionWithAny( const com::sun::star::uno::Any &a ); @@ -194,7 +194,7 @@ PyRef getObjectFromUnoModule( const Runtime &runtime, const char * object ) throw ( com::sun::star::uno::RuntimeException ); sal_Bool isInterfaceClass( const Runtime &, PyObject *obj ); -sal_Bool isInstanceOfStructOrException( const Runtime & runtime, PyObject *obj); +bool isInstanceOfStructOrException( PyObject *obj); com::sun::star::uno::Sequence<com::sun::star::uno::Type> implementsInterfaces( const Runtime & runtime, PyObject *obj ); @@ -244,7 +244,7 @@ private: public: public: - Adapter( const PyRef &obj, const Runtime &, + Adapter( const PyRef &obj, const com::sun::star::uno::Sequence< com::sun::star::uno::Type > & types ); static com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); |