mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part2 + fix some errors

Browse Source 
Change-Id: I9c889d718a9c91eb4c2bde2389a21dd754cbef36
This commit is contained in:
Julien Nabet 2014-05-06 21:31:29 +02:00
parent 7aa32a759f
commit f69e74d1a0
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chart2/source/tools/ObjectIdentifier.cxx
View File

@ -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;
}

4
chart2/source/tools/RangeHighlighter.cxx
View File

@ -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 ) );

14
forms/source/component/FormattedField.cxx
View File

@ -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;
}

6
sfx2/source/control/bindings.cxx
View File

@ -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 ;