diff options
| author | Tino Rachui <tra@openoffice.org> | 2001-08-10 11:14:02 +0000 |
|---|---|---|
| committer | Tino Rachui <tra@openoffice.org> | 2001-08-10 11:14:02 +0000 |
| commit | 7e66d29a9f198a0b67a327232618b4bdd36abed5 (patch) | |
| tree | c14c1dcd81fd5cf9bea3011b842da2904bc5b8a2 /fpicker | |
| parent | 933493cd5a26d63e321e7ab406c2e7c7806e6153 (diff) | |
#89230#accepting sal_Int8 and sal_Int16 in initialize
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/win32/filepicker/FilePicker.cxx | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx index 1b4bbf35ec4f..c84f4f5378fa 100644 --- a/fpicker/source/win32/filepicker/FilePicker.cxx +++ b/fpicker/source/win32/filepicker/FilePicker.cxx @@ -2,9 +2,9 @@ * * $RCSfile: FilePicker.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: tra $ $Date: 2001-08-06 07:34:48 $ + * last change: $Author: tra $ $Date: 2001-08-10 12:14:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -594,10 +594,18 @@ void SAL_CALL CFilePicker::initialize( const Sequence< Any >& aArguments ) { // parameter checking Any aAny; - if ( !aArguments.getLength( ) || - (aAny = aArguments[0]).getValueType() != ::getCppuType( (sal_Int16*)0 ) ) + if ( 0 == aArguments.getLength( ) ) throw IllegalArgumentException( - OUString::createFromAscii( "Invalid arguments" ), + OUString::createFromAscii( "no arguments" ), + static_cast< XFilePicker* >( this ), + 1 ); + + aAny = aArguments[0]; + + if ( (aAny.getValueType() != ::getCppuType((sal_Int16*)0)) && + (aAny.getValueType() != ::getCppuType((sal_Int8*)0)) ) + throw IllegalArgumentException( + OUString::createFromAscii( "invalid argument type" ), static_cast< XFilePicker* >( this ), 1 ); @@ -658,7 +666,6 @@ void SAL_CALL CFilePicker::initialize( const Sequence< Any >& aArguments ) break; case FILEOPEN_PLAY: - bFileOpenDialog = sal_False; if ( bIsWin2000 ) winResTemplateId = TMPL2000_PLAY_PUSHBUTTON; else |