Kaydet (Commit) bfcdcdb6 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Replace remaining getCppuType et al with cppu::UnoType

Change-Id: Ied1a4e7226de4ae1d1c24af90ae9397ba80f404a
üst 17e74bf1
This diff is collapsed.
...@@ -51,12 +51,12 @@ public: ...@@ -51,12 +51,12 @@ public:
throw (RuntimeException, std::exception) SAL_OVERRIDE throw (RuntimeException, std::exception) SAL_OVERRIDE
{ {
Any aInterface; Any aInterface;
if (_type == getCppuType< Reference< XInterface > >()) if (_type == cppu::UnoType<XInterface>::get())
{ {
Reference< XInterface > ref( static_cast< XInterface * >( this ) ); Reference< XInterface > ref( static_cast< XInterface * >( this ) );
aInterface.setValue( &ref, _type ); aInterface.setValue( &ref, _type );
} }
else if (_type == getCppuType< Reference< Interface1 > >()) else if (_type == cppu::UnoType<Interface1>::get())
{ {
Reference< Interface1 > ref( this ); Reference< Interface1 > ref( this );
aInterface.setValue( &ref, _type ); aInterface.setValue( &ref, _type );
......
This diff is collapsed.
...@@ -68,7 +68,7 @@ inline Any::Any( bool value ) ...@@ -68,7 +68,7 @@ inline Any::Any( bool value )
{ {
sal_Bool b = value; sal_Bool b = value;
::uno_type_any_construct( ::uno_type_any_construct(
this, &b, ::getCppuBooleanType().getTypeLibType(), this, &b, cppu::UnoType<bool>::get().getTypeLibType(),
(uno_AcquireFunc) cpp_acquire ); (uno_AcquireFunc) cpp_acquire );
} }
...@@ -191,7 +191,7 @@ template<> ...@@ -191,7 +191,7 @@ template<>
inline Any SAL_CALL makeAny( bool const & value ) inline Any SAL_CALL makeAny( bool const & value )
{ {
const sal_Bool b = value; const sal_Bool b = value;
return Any( &b, ::getCppuBooleanType() ); return Any( &b, cppu::UnoType<bool>::get() );
} }
...@@ -220,7 +220,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, bool const & value ) ...@@ -220,7 +220,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, bool const & value )
{ {
sal_Bool b = value; sal_Bool b = value;
::uno_type_any_assign( ::uno_type_any_assign(
&rAny, &b, ::getCppuBooleanType().getTypeLibType(), &rAny, &b, cppu::UnoType<bool>::get().getTypeLibType(),
(uno_AcquireFunc) cpp_acquire, (uno_ReleaseFunc) cpp_release ); (uno_AcquireFunc) cpp_acquire, (uno_ReleaseFunc) cpp_release );
} }
......
...@@ -277,7 +277,7 @@ SAL_CALL getCharSequenceCppuType() ...@@ -277,7 +277,7 @@ SAL_CALL getCharSequenceCppuType()
static typelib_TypeDescriptionReference * s_pType_com_sun_star_uno_Sequence_Char = 0; static typelib_TypeDescriptionReference * s_pType_com_sun_star_uno_Sequence_Char = 0;
if (! s_pType_com_sun_star_uno_Sequence_Char) if (! s_pType_com_sun_star_uno_Sequence_Char)
{ {
const ::com::sun::star::uno::Type & rElementType = ::getCharCppuType(); const ::com::sun::star::uno::Type & rElementType = cppu::UnoType<cppu::UnoCharType>::get();
::typelib_static_sequence_type_init( ::typelib_static_sequence_type_init(
& s_pType_com_sun_star_uno_Sequence_Char, & s_pType_com_sun_star_uno_Sequence_Char,
rElementType.getTypeLibType() ); rElementType.getTypeLibType() );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment