mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS tkr10 (1.140.18); FILE MERGED

Browse Source 
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
This commit is contained in:
Vladimir Glazounov
2008-06-04 08:53:08 +00:00
parent b07a5fcc60
commit 97f747f6b2
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sfx2/source/dialog/filedlghelper.cxx
View File

@@ -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