diff options
author | Noel Grandin <noel@peralex.com> | 2014-05-08 11:43:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-05-08 11:48:14 +0200 |
commit | e5d0a9ad78ceb531018cb49c1d78b0f63ba92995 (patch) | |
tree | 97529bae61d2eecebd87158f20344a7243d520c5 /pyuno | |
parent | 798531135855ad17d4939bee1c920d26032758c6 (diff) |
pyuno: sal_Bool->bool
Change-Id: I071c8984cd86b523d8ebae04b5fb2bdc1ac1a5b1
Diffstat (limited to 'pyuno')
-rw-r--r-- | pyuno/inc/pyuno/pyuno.hxx | 2 | ||||
-rw-r--r-- | pyuno/source/module/pyuno_except.cxx | 8 | ||||
-rw-r--r-- | pyuno/source/module/pyuno_impl.hxx | 4 | ||||
-rw-r--r-- | pyuno/source/module/pyuno_runtime.cxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pyuno/inc/pyuno/pyuno.hxx b/pyuno/inc/pyuno/pyuno.hxx index dbc003c36ed4..eef09da6d5b8 100644 --- a/pyuno/inc/pyuno/pyuno.hxx +++ b/pyuno/inc/pyuno/pyuno.hxx @@ -131,7 +131,7 @@ public: /** returns 1 when the reference points to a python object python object, otherwise 0. */ - sal_Bool is() const + bool is() const { return m != 0; } diff --git a/pyuno/source/module/pyuno_except.cxx b/pyuno/source/module/pyuno_except.cxx index cf02bd007534..63b1e68e9b54 100644 --- a/pyuno/source/module/pyuno_except.cxx +++ b/pyuno/source/module/pyuno_except.cxx @@ -92,9 +92,9 @@ static PyRef createClass( const OUString & name, const Runtime &runtime ) throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface > () ); } - sal_Bool isStruct = desc.get()->eTypeClass == typelib_TypeClass_STRUCT; - sal_Bool isExc = desc.get()->eTypeClass == typelib_TypeClass_EXCEPTION; - sal_Bool isInterface = desc.get()->eTypeClass == typelib_TypeClass_INTERFACE; + bool isStruct = desc.get()->eTypeClass == typelib_TypeClass_STRUCT; + bool isExc = desc.get()->eTypeClass == typelib_TypeClass_EXCEPTION; + bool isInterface = desc.get()->eTypeClass == typelib_TypeClass_INTERFACE; if( !isStruct && !isExc && ! isInterface ) { OUStringBuffer buf; @@ -206,7 +206,7 @@ bool isInstanceOfStructOrException( PyObject *obj) return false; } -sal_Bool isInterfaceClass( const Runtime &runtime, PyObject * obj ) +bool isInterfaceClass( const Runtime &runtime, PyObject * obj ) { const ClassSet & set = runtime.getImpl()->cargo->interfaceSet; return set.find( obj ) != set.end(); diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx index 02600cd691a5..bca4dc29a8f4 100644 --- a/pyuno/source/module/pyuno_impl.hxx +++ b/pyuno/source/module/pyuno_impl.hxx @@ -250,7 +250,7 @@ PyObject *PyUNO_invoke( PyObject *object, const char *name , PyObject *args ); com::sun::star::uno::Any PyEnum2Enum( PyObject *obj ) throw ( com::sun::star::uno::RuntimeException ); -sal_Bool PyBool2Bool( PyObject *o, const Runtime & r ) +bool PyBool2Bool( PyObject *o, const Runtime & r ) throw ( com::sun::star::uno::RuntimeException ); sal_Unicode PyChar2Unicode( PyObject *o ) throw ( com::sun::star::uno::RuntimeException ); @@ -263,7 +263,7 @@ const char *typeClassToString( com::sun::star::uno::TypeClass t ); PyRef getObjectFromUnoModule( const Runtime &runtime, const char * object ) throw ( com::sun::star::uno::RuntimeException ); -sal_Bool isInterfaceClass( const Runtime &, PyObject *obj ); +bool isInterfaceClass( const Runtime &, PyObject *obj ); bool isInstanceOfStructOrException( PyObject *obj); com::sun::star::uno::Sequence<com::sun::star::uno::Type> implementsInterfaces( const Runtime & runtime, PyObject *obj ); diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 343b8f8ad382..b266f01e9211 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -393,7 +393,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const } case typelib_TypeClass_BOOLEAN: { - sal_Bool b = sal_Bool(); + bool b; if ((a >>= b) && b) return Py_True; else |