diff options
Diffstat (limited to 'pyuno/source/module/pyuno_runtime.cxx')
| -rw-r--r-- | pyuno/source/module/pyuno_runtime.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 1f431aeee5ac..580aad0df777 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -130,7 +130,7 @@ static PyTypeObject RuntimeImpl_Type = Runtime implementation -----------------------------------------------------------------------*/ static void getRuntimeImpl( PyRef & globalDict, PyRef &runtimeImpl ) - throw ( com::sun::star::uno::RuntimeException ) + throw ( css::uno::RuntimeException ) { PyThreadState * state = PyThreadState_Get(); if( ! state ) @@ -250,7 +250,7 @@ static void readLoggingConfig( sal_Int32 *pLevel, FILE **ppFile ) RuntimeImpl implementations *-------------------------------------------------------------------*/ PyRef stRuntimeImpl::create( const Reference< XComponentContext > &ctx ) - throw( com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { RuntimeImpl *me = PyObject_New (RuntimeImpl, &RuntimeImpl_Type); if( ! me ) @@ -362,8 +362,8 @@ Runtime & Runtime::operator = ( const Runtime & r ) } PyRef Runtime::any2PyObject (const Any &a ) const - throw ( com::sun::star::script::CannotConvertException, - com::sun::star::lang::IllegalArgumentException, + throw ( css::script::CannotConvertException, + css::lang::IllegalArgumentException, RuntimeException) { if( ! impl->cargo->valid ) @@ -443,7 +443,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const OString o = OUStringToOString( t.getTypeName(), RTL_TEXTENCODING_ASCII_US ); return PyRef( PyUNO_Type_new ( - o.getStr(), (com::sun::star::uno::TypeClass)t.getTypeClass(), *this), + o.getStr(), (css::uno::TypeClass)t.getTypeClass(), *this), SAL_NO_ACQUIRE); } case typelib_TypeClass_ANY: @@ -493,7 +493,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const throw RuntimeException( buf.makeStringAndClear() ); } - if( com::sun::star::uno::TypeClass_EXCEPTION == a.getValueTypeClass() ) + if( css::uno::TypeClass_EXCEPTION == a.getValueTypeClass() ) { // add the message in a standard python way ! PyRef args( PyTuple_New( 1 ), SAL_NO_ACQUIRE, NOT_NULL ); @@ -537,7 +537,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const PyTuple_SetItem( tuple.get(), i, element.getAcquired() ); } } - catch( com::sun::star::uno::Exception & ) + catch( css::uno::Exception & ) { for( ; i < s.getLength() ; i ++ ) { @@ -589,7 +589,7 @@ static Sequence< Type > invokeGetTypes( const Runtime & r , PyObject * o ) Any a = r.pyObject2Any(PyTuple_GetItem(types.get(),i)); a >>= ret[i]; } - ret[size] = cppu::UnoType<com::sun::star::lang::XUnoTunnel>::get(); + ret[size] = cppu::UnoType<css::lang::XUnoTunnel>::get(); } } return ret; @@ -645,7 +645,7 @@ bool Runtime::pyIterUnpack( PyObject *const pObj, Any &a ) const } Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) const - throw ( com::sun::star::uno::RuntimeException ) + throw ( css::uno::RuntimeException ) { if( ! impl->cargo->valid ) { @@ -835,7 +835,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con { a = getImpl()->cargo->xTypeConverter->convertTo( a, t ); } - catch( const com::sun::star::uno::Exception & e ) + catch( const css::uno::Exception & e ) { throw WrappedTargetRuntimeException( e.Message, e.Context, makeAny(e)); @@ -863,7 +863,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con if( adapterObject.is() ) { // object got already bridged ! - Reference< com::sun::star::lang::XUnoTunnel > tunnel( adapterObject, UNO_QUERY ); + Reference< css::lang::XUnoTunnel > tunnel( adapterObject, UNO_QUERY ); Adapter *pAdapter = reinterpret_cast<Adapter*>( tunnel->getSomething( @@ -885,7 +885,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con // keep a list of exported objects to ensure object identity ! impl->cargo->mappedObjects[ PyRef(o) ] = - com::sun::star::uno::WeakReference< XInvocation > ( pAdapter ); + css::uno::WeakReference< XInvocation > ( pAdapter ); } } catch (InvocationTargetException const& e) { OUString const msg(lcl_ExceptionMessage(o, &e.Message)); @@ -895,7 +895,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con } if( mappedObject.is() ) { - a = com::sun::star::uno::makeAny( mappedObject ); + a = css::uno::makeAny( mappedObject ); } else { @@ -1001,14 +1001,14 @@ Any Runtime::extractUnoException( const PyRef & excType, const PyRef &excValue, fprintf( stderr, "Python exception: %s\n", OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() ); #endif - ret = com::sun::star::uno::makeAny( e ); + ret = css::uno::makeAny( e ); } return ret; } PyThreadAttach::PyThreadAttach( PyInterpreterState *interp) - throw ( com::sun::star::uno::RuntimeException ) + throw ( css::uno::RuntimeException ) { tstate = PyThreadState_New( interp ); if( !tstate ) @@ -1023,7 +1023,7 @@ PyThreadAttach::~PyThreadAttach() PyThreadState_Delete( tstate ); } -PyThreadDetach::PyThreadDetach() throw ( com::sun::star::uno::RuntimeException ) +PyThreadDetach::PyThreadDetach() throw ( css::uno::RuntimeException ) { tstate = PyThreadState_Get(); PyEval_ReleaseThread( tstate ); |