From ac76cc7e605b1bc9c0ff8e24d0b9995a8247074e Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Fri, 23 May 2014 22:11:27 +0200 Subject: Prefer cppu::UnoType::get() to ::getCppuType((T*)0) part20 Change-Id: If87cdfb2c605254f6d69baa4ca5aec09091caa68 --- forms/source/component/FormComponent.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'forms/source/component/FormComponent.cxx') diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 951a37ffb4fe..615688e69961 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -358,7 +358,7 @@ Any SAL_CALL OBoundControl::queryAggregation(const Type& _rType) throw(RuntimeEx Any aReturn; // XTypeProvider first - don't ask the OBoundControl_BASE, it would deliver incomplete types - if ( _rType.equals( ::getCppuType( static_cast< Reference< XTypeProvider >* >( NULL ) ) ) ) + if ( _rType.equals( cppu::UnoType::get() ) ) aReturn = OControl::queryAggregation( _rType ); // ask our own interfaces @@ -462,7 +462,7 @@ Any SAL_CALL OControlModel::queryAggregation(const Type& _rType) throw (RuntimeE { aReturn = OPropertySetAggregationHelper::queryInterface(_rType); // our aggregate - if (!aReturn.hasValue() && m_xAggregate.is() && !_rType.equals(::getCppuType(static_cast< Reference< XCloneable>* >(NULL)))) + if (!aReturn.hasValue() && m_xAggregate.is() && !_rType.equals(cppu::UnoType::get())) aReturn = m_xAggregate->queryAggregation(_rType); } } @@ -975,12 +975,12 @@ void OControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const A switch (_nHandle) { case PROPERTY_ID_NAME: - DBG_ASSERT(_rValue.getValueType() == getCppuType((const OUString*)NULL), + DBG_ASSERT(_rValue.getValueType() == cppu::UnoType::get(), "OControlModel::setFastPropertyValue_NoBroadcast : invalid type" ); _rValue >>= m_aName; break; case PROPERTY_ID_TAG: - DBG_ASSERT(_rValue.getValueType() == getCppuType((const OUString*)NULL), + DBG_ASSERT(_rValue.getValueType() == cppu::UnoType::get(), "OControlModel::setFastPropertyValue_NoBroadcast : invalid type" ); _rValue >>= m_aTag; break; -- cgit