diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-05-10 00:14:44 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2014-05-10 06:19:42 +0200 |
| commit | 5ec7a589bed7991ffe8ad9a2f544a6699d159765 (patch) | |
| tree | f9020375a29477fe7e4d22970a4040c36abadbdf /fpicker | |
| parent | 83a88b942134314e86ac612d0ef70a8e4919e4af (diff) | |
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part8
Change-Id: Ie16923d17541e84e0d7424fffe37caf410786abf
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/aqua/SalAquaFilePicker.mm | 4 | ||||
| -rw-r--r-- | fpicker/source/win32/filepicker/FilePicker.cxx | 4 | ||||
| -rw-r--r-- | fpicker/source/win32/misc/WinImplHelper.cxx | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index 6c2aa35f427d..7c4858aa27fa 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -531,8 +531,8 @@ throw( uno::Exception, uno::RuntimeException ) 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(rtl::OUString( "invalid argument type" ), static_cast<XFilePicker*>( static_cast<XFilePicker3*>(this) ), 1 ); diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx index 2d91c3396c11..a8bb989091cf 100644 --- a/fpicker/source/win32/filepicker/FilePicker.cxx +++ b/fpicker/source/win32/filepicker/FilePicker.cxx @@ -606,8 +606,8 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments) 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/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx index bc42e736328d..6011bcf18694 100644 --- a/fpicker/source/win32/misc/WinImplHelper.cxx +++ b/fpicker/source/win32/misc/WinImplHelper.cxx @@ -136,7 +136,7 @@ void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInt OSL_ASSERT( IsWindow( hwnd ) ); if ( !aItem.hasValue( ) || - aItem.getValueType( ) != getCppuType((OUString*)0) ) + aItem.getValueType( ) != cppu::UnoType<OUString>::get() ) throw IllegalArgumentException( OUString( "invalid value type or any has no value" ), rXInterface, @@ -184,9 +184,9 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc OSL_ASSERT( IsWindow( hwnd ) ); if ( !aPosition.hasValue( ) || - ( (aPosition.getValueType( ) != getCppuType((sal_Int32*)0)) && - (aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) && - (aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) ) + ( (aPosition.getValueType( ) != cppu::UnoType<sal_Int32>::get()) && + (aPosition.getValueType( ) != cppu::UnoType<sal_Int16>::get()) && + (aPosition.getValueType( ) != cppu::UnoType<sal_Int8>::get()) ) ) throw IllegalArgumentException( OUString( "invalid value type or any has no value" ), rXInterface, @@ -236,9 +236,9 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref OSL_ASSERT( IsWindow( hwnd ) ); if ( !aPosition.hasValue( ) || - ( (aPosition.getValueType( ) != getCppuType((sal_Int32*)0)) && - (aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) && - (aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) ) + ( (aPosition.getValueType( ) != cppu::UnoType<sal_Int32>::get()) && + (aPosition.getValueType( ) != cppu::UnoType<sal_Int16>::get()) && + (aPosition.getValueType( ) != cppu::UnoType<sal_Int8>::get()) ) ) throw IllegalArgumentException( OUString( "invalid value type or any has no value" ), rXInterface, |