summaryrefslogtreecommitdiff
path: root/include/com
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-01 08:37:54 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-01 08:37:54 +0200
commitbfcdcdb63a9f7800629e3143b52f4eed1b7b0b4f (patch)
tree4168e9c1a49c26b0c32cb9f37586d81314278258 /include/com
parent17e74bf1a0ca19bd7f555716408d318f5193e1bd (diff)
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: Ied1a4e7226de4ae1d1c24af90ae9397ba80f404a
Diffstat (limited to 'include/com')
-rw-r--r--include/com/sun/star/uno/Any.hxx6
-rw-r--r--include/com/sun/star/uno/Sequence.hxx2
2 files changed, 4 insertions, 4 deletions
diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx
index f9b286894a47..2b314e976b6f 100644
--- a/include/com/sun/star/uno/Any.hxx
+++ b/include/com/sun/star/uno/Any.hxx
@@ -68,7 +68,7 @@ inline Any::Any( bool value )
{
sal_Bool b = value;
::uno_type_any_construct(
- this, &b, ::getCppuBooleanType().getTypeLibType(),
+ this, &b, cppu::UnoType<bool>::get().getTypeLibType(),
(uno_AcquireFunc) cpp_acquire );
}
@@ -191,7 +191,7 @@ template<>
inline Any SAL_CALL makeAny( bool const & 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 )
{
sal_Bool b = value;
::uno_type_any_assign(
- &rAny, &b, ::getCppuBooleanType().getTypeLibType(),
+ &rAny, &b, cppu::UnoType<bool>::get().getTypeLibType(),
(uno_AcquireFunc) cpp_acquire, (uno_ReleaseFunc) cpp_release );
}
diff --git a/include/com/sun/star/uno/Sequence.hxx b/include/com/sun/star/uno/Sequence.hxx
index dce2609c2d77..aab21b75c74a 100644
--- a/include/com/sun/star/uno/Sequence.hxx
+++ b/include/com/sun/star/uno/Sequence.hxx
@@ -277,7 +277,7 @@ SAL_CALL getCharSequenceCppuType()
static typelib_TypeDescriptionReference * s_pType_com_sun_star_uno_Sequence_Char = 0;
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(
& s_pType_com_sun_star_uno_Sequence_Char,
rElementType.getTypeLibType() );