diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-05-05 23:24:25 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2014-05-05 23:24:49 +0200 |
| commit | ebd4986c3495239f09510f2c0c79b6e30acda83e (patch) | |
| tree | fce4db3c0eac639def371866654a93cdc2d0d7a2 /chart2 | |
| parent | fb0ca7eff0e16fa8dd1a4c8d75fef23830903a3f (diff) | |
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part2
Change-Id: Ibca921eff3647507ffb7e9011a84aeefbec58d7a
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/tools/ObjectIdentifier.cxx | 4 | ||||
| -rw-r--r-- | chart2/source/tools/RangeHighlighter.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index c681b86db1c6..9edbdf041abd 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -259,11 +259,11 @@ ObjectIdentifier::ObjectIdentifier( const Any& rAny ) ,m_xAdditionalShape( 0 ) { const uno::Type& rType = rAny.getValueType(); - if ( rType == ::getCppuType( static_cast< const OUString* >( 0 ) ) ) + if ( rType == cppu::UnoType<OUString>::get() ) { rAny >>= m_aObjectCID; } - else if ( rType == ::getCppuType( static_cast< const Reference< drawing::XShape >* >( 0 ) ) ) + else if ( rType == cppu::UnoType< drawing::XShape >::get() ) { rAny >>= m_xAdditionalShape; } diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index 6a865a175cec..cc7e431c0b47 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -97,7 +97,7 @@ void RangeHighlighter::determineRanges() uno::Any aSelection( m_xSelectionSupplier->getSelection()); const uno::Type& rType = aSelection.getValueType(); - if ( rType == ::getCppuType( static_cast< const OUString* >( 0 ) ) ) + if ( rType == cppu::UnoType<OUString>::get() ) { // @todo??: maybe getSelection() should return a model object rather than a CID @@ -164,7 +164,7 @@ void RangeHighlighter::determineRanges() } } } - else if ( rType == ::getCppuType( static_cast< const Reference< drawing::XShape >* >( 0 ) ) ) + else if ( rType == cppu::UnoType< 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( - ::getCppuType((const uno::Reference< view::XSelectionChangeListener >*)0) ); + cppu::UnoType< view::XSelectionChangeListener >::get() ); if( pIC ) { lang::EventObject aEvent( static_cast< lang::XComponent* >( this ) ); |