diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-06-04 08:53:08 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-06-04 08:53:08 +0000 |
| commit | 92355fe9fa7165d755de520cb91eaee4d13e3a18 (patch) | |
| tree | cb3e951630eeee5faf7f6cab678a76a4c4674c71 /sfx2 | |
| parent | 14d21bf1a9c5e05690fb681d09e9b79c43638364 (diff) | |
INTEGRATION: CWS tkr10 (1.140.18); FILE MERGED
2008/05/19 09:30:23 tkr 1.140.18.2: RESYNC: (1.140-1.142); FILE MERGED
2008/04/17 14:00:38 tkr 1.140.18.1: #i88181# remove assertions
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 806c76e0e2..61728de25f 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: filedlghelper.cxx,v $ - * $Revision: 1.143 $ + * $Revision: 1.144 $ * * This file is part of OpenOffice.org. * @@ -1062,7 +1062,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( FileDialogHelper* _pAntiImpl, sal_ //Sequence < Any > aInitArguments( mbSystemPicker || !mpPreferredParentWindow ? 1 : 3 ); - Sequence < Any > aInitArguments( mbSystemPicker ? 1 : 3 ); + Sequence < Any > aInitArguments( !mpPreferredParentWindow ? 2 : 3 ); // This is a hack. We currently know that the internal file picker implementation // supports the extended arguments as specified below. @@ -1080,18 +1080,19 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( FileDialogHelper* _pAntiImpl, sal_ makeAny( nTemplateDescription ) ); + ::rtl::OUString sStandardDirTemp = ::rtl::OUString( sStandardDir ); + + aInitArguments[1] <<= NamedValue( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StandardDir" ) ), + makeAny( sStandardDirTemp ) + ); if ( mpPreferredParentWindow ) - aInitArguments[1] <<= NamedValue( + aInitArguments[2] <<= NamedValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" ) ), makeAny( VCLUnoHelper::GetInterface( mpPreferredParentWindow ) ) ); - ::rtl::OUString sStandardDirTemp = ::rtl::OUString( sStandardDir ); - aInitArguments[2] <<= NamedValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StandardDir" ) ), - makeAny( sStandardDirTemp ) - ); } try |