diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-06-04 08:42:24 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-06-04 08:42:24 +0000 |
commit | 55326862588e24977181984aa7a864282363fdf7 (patch) | |
tree | d6e494da4aa9eed01e11f994ec796770a80ff314 /fpicker | |
parent | 0d6853fbe9f1e712927d082fe0cdf387cf708b61 (diff) |
INTEGRATION: CWS tkr10 (1.15.10); FILE MERGED
2008/05/19 09:26:12 tkr 1.15.10.2: RESYNC: (1.15-1.16); FILE MERGED
2008/04/17 14:02:18 tkr 1.15.10.1: #i88181# remove assertions
Diffstat (limited to 'fpicker')
-rw-r--r-- | fpicker/source/office/OfficeFilePicker.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index a98ea91c64c0..013c643274d3 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: OfficeFilePicker.cxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.17 $ * * This file is part of OpenOffice.org. * @@ -1064,8 +1064,6 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments ) // compatibility: one argument, type sal_Int16 , specifies the service type _rArguments[0] >>= m_nServiceType; - // NOTE: _rArguments[1] not used here - for ( int i = 0; i < _rArguments.getLength(); i++) { NamedValue namedValue; @@ -1101,6 +1099,13 @@ sal_Bool SvtFilePicker::implHandleInitializationArgument( const ::rtl::OUString& OSL_VERIFY( _rValue >>= m_nServiceType ); return sal_True; } + if ( _rName.equalsAscii( "StandardDir" ) ) + { + OSL_VERIFY( _rValue >>= m_aStandardDir ); + return sal_True; + } + + return OCommonPicker::implHandleInitializationArgument( _rName, _rValue ); } |