diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2014-05-17 23:32:29 +0200 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2014-05-17 23:33:02 +0200 |
commit | 745a094a37e029afcf34ad1cf82b14f80062163f (patch) | |
tree | eafa587b5924760ef993bdfa04c81416f1da27ec /vcl | |
parent | Don't build svdemo for Android and iOS. (diff) | |
download | core-745a094a37e029afcf34ad1cf82b14f80062163f.tar.gz core-745a094a37e029afcf34ad1cf82b14f80062163f.zip |
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part15
Change-Id: I38e855966598342eb2352e70e04f7a5e09e54f83
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/osx/DropTarget.cxx | 10 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/kde/UnxFilePicker.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/kde4/KDE4FilePicker.cxx | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx index 307181cbb904..7ee0f5b48e1e 100644 --- a/vcl/osx/DropTarget.cxx +++ b/vcl/osx/DropTarget.cxx @@ -436,7 +436,7 @@ void SAL_CALL DropTarget::dropComplete(sal_Bool success) throw (RuntimeException void DropTarget::fire_drop( const DropTargetDropEvent& dte) { - OInterfaceContainerHelper* pContainer= rBHelper.getContainer( getCppuType( (uno::Reference<XDropTargetListener>* )0 ) ); + OInterfaceContainerHelper* pContainer= rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get()); if( pContainer) { OInterfaceIteratorHelper iter( *pContainer); @@ -452,7 +452,7 @@ void DropTarget::fire_drop( const DropTargetDropEvent& dte) void DropTarget::fire_dragEnter(const DropTargetDragEnterEvent& e) { - OInterfaceContainerHelper* pContainer= rBHelper.getContainer( getCppuType( (uno::Reference<XDropTargetListener>* )0 ) ); + OInterfaceContainerHelper* pContainer= rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get()); if( pContainer) { OInterfaceIteratorHelper iter( *pContainer); @@ -468,7 +468,7 @@ void DropTarget::fire_dragEnter(const DropTargetDragEnterEvent& e) void DropTarget::fire_dragExit(const DropTargetEvent& dte) { - OInterfaceContainerHelper* pContainer= rBHelper.getContainer( getCppuType( (uno::Reference<XDropTargetListener>* )0 ) ); + OInterfaceContainerHelper* pContainer= rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get()); if( pContainer) { @@ -485,7 +485,7 @@ void DropTarget::fire_dragExit(const DropTargetEvent& dte) void DropTarget::fire_dragOver(const DropTargetDragEvent& dtde) { - OInterfaceContainerHelper* pContainer= rBHelper.getContainer( getCppuType( (uno::Reference<XDropTargetListener>* )0 ) ); + OInterfaceContainerHelper* pContainer= rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get()); if( pContainer) { OInterfaceIteratorHelper iter( *pContainer ); @@ -501,7 +501,7 @@ void DropTarget::fire_dragOver(const DropTargetDragEvent& dtde) void DropTarget::fire_dropActionChanged(const DropTargetDragEvent& dtde) { - OInterfaceContainerHelper* pContainer= rBHelper.getContainer( getCppuType( (uno::Reference<XDropTargetListener>* )0 ) ); + OInterfaceContainerHelper* pContainer= rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get()); if( pContainer) { OInterfaceIteratorHelper iter( *pContainer); diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 30dd88c7569c..2792982256cb 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -1614,8 +1614,8 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu aAny = aArguments[0]; - if( ( aAny.getValueType() != ::getCppuType( ( sal_Int16* )0 ) ) && - (aAny.getValueType() != ::getCppuType( ( sal_Int8* )0 ) ) ) + if( ( aAny.getValueType() != cppu::UnoType<sal_Int16>::get()) && + (aAny.getValueType() != cppu::UnoType<sal_Int8>::get()) ) throw lang::IllegalArgumentException( OUString( "invalid argument type" ), static_cast<XFilePicker2*>( this ), 1 ); diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index ff902787779d..fd92f1359ced 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -532,7 +532,7 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen aAny = rArguments[0]; - if ( ( aAny.getValueType() != ::getCppuType( (sal_Int16*)0 ) ) && ( aAny.getValueType() != ::getCppuType( (sal_Int8*)0 ) ) ) + if ( ( aAny.getValueType() != cppu::UnoType<sal_Int16>::get()) && ( aAny.getValueType() != cppu::UnoType<sal_Int8>::get()) ) throw lang::IllegalArgumentException( OUString( "invalid argument type" ), static_cast< XFilePicker2* >( this ), 1 ); diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index 43bad65ad5e8..8fa2bf080530 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -641,8 +641,8 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) arg = args[0]; - if (( arg.getValueType() != ::getCppuType((sal_Int16*)0)) && - ( arg.getValueType() != ::getCppuType((sal_Int8*)0))) + if (( arg.getValueType() != cppu::UnoType<sal_Int16>::get()) && + ( arg.getValueType() != cppu::UnoType<sal_Int8>::get())) { throw lang::IllegalArgumentException( OUString( "invalid argument type" ), |