diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:40:15 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:40:15 +0200 |
| commit | 714f4db8d3b9310a38a3a55d7800c04d384b81cd (patch) | |
| tree | 6d656257fc8ebbf67ee870aeef77b11083c2e0e9 /pyuno/source/module/pyuno_runtime.cxx | |
| parent | cf93af5e97d630947b3683e5fd7c51f63bddda30 (diff) | |
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: Id848d14133fee5104e79ba0683cbaf942598faa7
Diffstat (limited to 'pyuno/source/module/pyuno_runtime.cxx')
| -rw-r--r-- | pyuno/source/module/pyuno_runtime.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index a7793da7e7ff..96bc9aea1cd1 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -524,7 +524,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const { Reference< XTypeConverter > tc = getImpl()->cargo->xTypeConverter; Reference< XSingleServiceFactory > ssf = getImpl()->cargo->xInvocation; - tc->convertTo (a, ::getCppuType (&s)) >>= s; + tc->convertTo (a, cppu::UnoType<decltype(s)>::get()) >>= s; PyRef tuple( PyTuple_New (s.getLength()), SAL_NO_ACQUIRE, NOT_NULL); int i=0; try @@ -642,12 +642,12 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con if( o == Py_True ) { sal_Bool b = sal_True; - a = Any( &b, getBooleanCppuType() ); + a = Any( &b, cppu::UnoType<bool>::get() ); } else if ( o == Py_False ) { sal_Bool b = sal_False; - a = Any( &b, getBooleanCppuType() ); + a = Any( &b, cppu::UnoType<bool>::get() ); } else { @@ -676,12 +676,12 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con if(o == Py_True) { sal_Bool b = sal_True; - a = Any(&b, getBooleanCppuType()); + a = Any(&b, cppu::UnoType<bool>::get()); } else if(o == Py_False) { sal_Bool b = sal_False; - a = Any(&b, getBooleanCppuType()); + a = Any(&b, cppu::UnoType<bool>::get()); } else { @@ -794,7 +794,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con else if( PyObject_IsInstance( o, getCharClass( runtime ).get() ) ) { sal_Unicode c = PyChar2Unicode( o ); - a.setValue( &c, getCharCppuType( )); + a.setValue( &c, cppu::UnoType<cppu::UnoCharType>::get()); } else if( PyObject_IsInstance( o, getAnyClass( runtime ).get() ) ) { |