diff options
Diffstat (limited to 'comphelper/source/property')
| -rw-r--r-- | comphelper/source/property/genericpropertyset.cxx | 18 | ||||
| -rw-r--r-- | comphelper/source/property/propertycontainer.cxx | 6 | ||||
| -rw-r--r-- | comphelper/source/property/propstate.cxx | 8 |
3 files changed, 16 insertions, 16 deletions
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index c44208c72631..5ce4ab16bade 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -199,13 +199,13 @@ Any SAL_CALL GenericPropertySet::queryAggregation( const Type & rType ) { Any aAny; - if( rType == ::getCppuType((const Reference< XServiceInfo >*)0) ) + if( rType == cppu::UnoType<XServiceInfo>::get()) aAny <<= Reference< XServiceInfo >(this); - else if( rType == ::getCppuType((const Reference< XTypeProvider >*)0) ) + else if( rType == cppu::UnoType<XTypeProvider>::get()) aAny <<= Reference< XTypeProvider >(this); - else if( rType == ::getCppuType((const Reference< XPropertySet >*)0) ) + else if( rType == cppu::UnoType<XPropertySet>::get()) aAny <<= Reference< XPropertySet >(this); - else if( rType == ::getCppuType((const Reference< XMultiPropertySet >*)0) ) + else if( rType == cppu::UnoType<XMultiPropertySet>::get()) aAny <<= Reference< XMultiPropertySet >(this); else aAny <<= OWeakAggObject::queryAggregation( rType ); @@ -229,11 +229,11 @@ uno::Sequence< uno::Type > SAL_CALL GenericPropertySet::getTypes() uno::Sequence< uno::Type > aTypes( 5 ); uno::Type* pTypes = aTypes.getArray(); - *pTypes++ = ::getCppuType((const uno::Reference< XAggregation>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< XServiceInfo>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< XTypeProvider>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< XPropertySet>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< XMultiPropertySet>*)0); + *pTypes++ = cppu::UnoType<XAggregation>::get(); + *pTypes++ = cppu::UnoType<XServiceInfo>::get(); + *pTypes++ = cppu::UnoType<XTypeProvider>::get(); + *pTypes++ = cppu::UnoType<XPropertySet>::get(); + *pTypes++ = cppu::UnoType<XMultiPropertySet>::get(); return aTypes; } diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx index 83a6eae1c5e2..1cd3fcd9e68c 100644 --- a/comphelper/source/property/propertycontainer.cxx +++ b/comphelper/source/property/propertycontainer.cxx @@ -56,9 +56,9 @@ Sequence< Type > OPropertyContainer::getBaseTypes() throw (RuntimeException, std { // just the types from our one and only base class ::cppu::OTypeCollection aTypes( - ::getCppuType( static_cast< Reference< XPropertySet >* >(NULL)), - ::getCppuType( static_cast< Reference< XFastPropertySet >* >(NULL)), - ::getCppuType( static_cast< Reference< XMultiPropertySet >* >(NULL)) + cppu::UnoType<XPropertySet>::get(), + cppu::UnoType<XFastPropertySet>::get(), + cppu::UnoType<XMultiPropertySet>::get() ); return aTypes.getTypes(); } diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx index 90d8e370e730..d8f53b5e4570 100644 --- a/comphelper/source/property/propstate.cxx +++ b/comphelper/source/property/propstate.cxx @@ -58,11 +58,11 @@ namespace comphelper ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> aTypes(4); ::com::sun::star::uno::Type* pTypes = aTypes.getArray(); // base class types - pTypes[0] = getCppuType(( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>*)NULL); - pTypes[1] = getCppuType(( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet>*)NULL); - pTypes[2] = getCppuType(( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet>*)NULL); + pTypes[0] = cppu::UnoType<com::sun::star::beans::XPropertySet>::get(); + pTypes[1] = cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(); + pTypes[2] = cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(); // my own type - pTypes[3] = getCppuType(( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState>*)NULL); + pTypes[3] = cppu::UnoType<com::sun::star::beans::XPropertyState>::get(); return aTypes; } |