diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-11 14:19:26 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-11 14:19:26 +0000 |
| commit | a8916a0226c76dd64fffe9216deb4a223bbede35 (patch) | |
| tree | 18efe6b785abecfd5198274bb128d486d5b606f6 /fpicker/source | |
| parent | 7982680e70dd74180dcefd43b51fc3c96d4ad941 (diff) | |
CWS-TOOLING: integrate CWS tkr16
2008-12-11 15:48:43 +0100 tkr r265321 : #i95208# do not deliver linux/unix shared libraries
2008-12-10 11:13:31 +0100 tkr r265158 : CWS-TOOLING: rebase CWS tkr16 to trunk@264807 (milestone: DEV300:m37)
2008-12-09 10:32:56 +0100 tkr r265061 : #i96906# patch: size of a symlink to a file
2008-10-28 08:48:23 +0100 tkr r262697 : iXXXXX#: migrate CWS tkr16 to SVN.
Diffstat (limited to 'fpicker/source')
| -rw-r--r-- | fpicker/source/office/OfficeFilePicker.cxx | 22 | ||||
| -rw-r--r-- | fpicker/source/office/commonpicker.cxx | 10 |
2 files changed, 26 insertions, 6 deletions
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 013c643274d3..d94e6d34caaa 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.17 $ + * $Revision: 1.17.20.1 $ * * This file is part of OpenOffice.org. * @@ -1057,19 +1057,31 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments ) { checkAlive(); + Sequence< Any > aArguments( _rArguments.getLength()); + m_nServiceType = TemplateDescription::FILEOPEN_SIMPLE; if ( _rArguments.getLength() >= 1 ) { // compatibility: one argument, type sal_Int16 , specifies the service type - _rArguments[0] >>= m_nServiceType; + int index = 0; - for ( int i = 0; i < _rArguments.getLength(); i++) + if (_rArguments[0] >>= m_nServiceType) + { + // skip the first entry if it was the ServiceType, because it's not needed in OCommonPicker::initialize and it's not a NamedValue + NamedValue emptyNamedValue; + aArguments[0] <<= emptyNamedValue; + index = 1; + + } + for ( int i = index; i < _rArguments.getLength(); i++) { NamedValue namedValue; + aArguments[i] <<= _rArguments[i]; - if (_rArguments[i] >>= namedValue ) + if (aArguments[i] >>= namedValue ) { + if ( namedValue.Name.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StandardDir" ) ) ) ) { ::rtl::OUString sStandardDir; @@ -1087,7 +1099,7 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments ) } // let the base class analyze the sequence (will call into implHandleInitializationArgument) - OCommonPicker::initialize( _rArguments ); + OCommonPicker::initialize( aArguments ); } //------------------------------------------------------------------------- diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index 33a4e40ce401..64e506329d24 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: commonpicker.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.12.1 $ * * This file is part of OpenOffice.org. * @@ -449,13 +449,21 @@ namespace svt { if ( *pArgument >>= aPropArg ) { + if ( aPropArg.Name.getLength() <= 0) + continue; + sSettingName = aPropArg.Name; aSettingValue = aPropArg.Value; } else if ( *pArgument >>= aPairArg ) { + if ( aPairArg.Name.getLength() <= 0) + continue; + sSettingName = aPairArg.Name; aSettingValue = aPairArg.Value; + + } else { |