diff options
| -rw-r--r-- | chart2/source/tools/ObjectIdentifier.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/tools/RangeHighlighter.cxx | 4 | ||||
| -rw-r--r-- | forms/source/component/FormattedField.cxx | 14 | ||||
| -rw-r--r-- | sfx2/source/control/bindings.cxx | 6 |
4 files changed, 13 insertions, 13 deletions
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index 9edbdf041abd..ef399da99c46 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -263,7 +263,7 @@ ObjectIdentifier::ObjectIdentifier( const Any& rAny ) { rAny >>= m_aObjectCID; } - else if ( rType == cppu::UnoType< drawing::XShape >::get() ) + else if ( rType == cppu::UnoType< Reference< drawing::XShape > >::get() ) { rAny >>= m_xAdditionalShape; } diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index cc7e431c0b47..f9525a286f00 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -164,7 +164,7 @@ void RangeHighlighter::determineRanges() } } } - else if ( rType == cppu::UnoType< drawing::XShape >::get() ) + else if ( rType == cppu::UnoType< Reference < drawing::XShape > >::get() ) { // #i12587# support for shapes in chart Reference< drawing::XShape > xShape; @@ -336,7 +336,7 @@ void SAL_CALL RangeHighlighter::selectionChanged( const lang::EventObject& /*aEv void RangeHighlighter::fireSelectionEvent() { ::cppu::OInterfaceContainerHelper* pIC = rBHelper.getContainer( - cppu::UnoType< view::XSelectionChangeListener >::get() ); + cppu::UnoType< Reference < view::XSelectionChangeListener > >::get() ); if( pIC ) { lang::EventObject aEvent( static_cast< lang::XComponent* >( this ) ); diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index bf7ef15b7b56..b9767ebb5027 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -897,19 +897,19 @@ Any OFormattedModel::translateExternalValueToControlValue( const Any& _rExternal break; default: { - if ( _rExternalValue.getValueType().equals( ::getCppuType( static_cast< UNODate* >( NULL ) ) ) ) + if ( _rExternalValue.getValueType().equals( cppu::UnoType< UNODate >::get() ) ) { UNODate aDate; _rExternalValue >>= aDate; aControlValue <<= DBTypeConversion::toDouble( aDate, m_aNullDate ); } - else if ( _rExternalValue.getValueType().equals( ::getCppuType( static_cast< UNOTime* >( NULL ) ) ) ) + else if ( _rExternalValue.getValueType().equals( cppu::UnoType< UNOTime >::get() ) ) { UNOTime aTime; _rExternalValue >>= aTime; aControlValue <<= DBTypeConversion::toDouble( aTime ); } - else if ( _rExternalValue.getValueType().equals( ::getCppuType( static_cast< UNODateTime* >( NULL ) ) ) ) + else if ( _rExternalValue.getValueType().equals( cppu::UnoType< UNODateTime >::get() ) ) { UNODateTime aDateTime; _rExternalValue >>= aDateTime; @@ -967,21 +967,21 @@ Any OFormattedModel::translateControlValueToExternalValue( ) const // if this asserts ... well, the somebody set the TreatAsNumeric property to false, // and the control value is a string. This implies some weird misconfiguration // of the FormattedModel, so we won't care for it for the moment. - if ( aExternalValueType.equals( ::getCppuType( static_cast< UNODate* >( NULL ) ) ) ) + if ( aExternalValueType.equals( cppu::UnoType< UNODate >::get() ) ) { aExternalValue <<= DBTypeConversion::toDate( fValue, m_aNullDate ); } - else if ( aExternalValueType.equals( ::getCppuType( static_cast< UNOTime* >( NULL ) ) ) ) + else if ( aExternalValueType.equals( cppu::UnoType< UNOTime >::get() ) ) { aExternalValue <<= DBTypeConversion::toTime( fValue ); } - else if ( aExternalValueType.equals( ::getCppuType( static_cast< UNODateTime* >( NULL ) ) ) ) + else if ( aExternalValueType.equals( cppu::UnoType< UNODateTime >::get() ) ) { aExternalValue <<= DBTypeConversion::toDateTime( fValue, m_aNullDate ); } else { - OSL_ENSURE( aExternalValueType.equals( ::getCppuType( static_cast< double* >( NULL ) ) ), + OSL_ENSURE( aExternalValueType.equals( cppu::UnoType< double >::get() ), "OFormattedModel::translateControlValueToExternalValue: don't know how to translate this type!" ); aExternalValue <<= fValue; } diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index efa0cc751557..f157ba54a849 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1908,19 +1908,19 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState ) aAny >>= bTemp ; pItem = new SfxBoolItem( nSlot, bTemp ); } - else if ( pType == ::getCppuType((const sal_uInt16*)0) ) + else if ( pType == ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() ) { sal_uInt16 nTemp = 0; aAny >>= nTemp ; pItem = new SfxUInt16Item( nSlot, nTemp ); } - else if ( pType == ::getCppuType((const sal_uInt32*)0) ) + else if ( pType == cppu::UnoType<sal_uInt32>::get() ) { sal_uInt32 nTemp = 0; aAny >>= nTemp ; pItem = new SfxUInt32Item( nSlot, nTemp ); } - else if ( pType == ::getCppuType((const OUString*)0) ) + else if ( pType == cppu::UnoType<OUString>::get() ) { OUString sTemp ; aAny >>= sTemp ; |