diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-07-25 21:49:55 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-07-25 21:50:52 +0100 |
| commit | bb020b3ea80e104d2db1fd301dbca8a01b838f4a (patch) | |
| tree | d51f7ebb2af20746561f794c571127dbd6f2ef92 /sc/source/ui/vba/vbaapplication.cxx | |
| parent | 6a330d823aa3c2f8ff640aa017edb9d6e0464ccd (diff) | |
use XFilePicker2 regardless of service, if possible, it is far more sane
Diffstat (limited to 'sc/source/ui/vba/vbaapplication.cxx')
| -rw-r--r-- | sc/source/ui/vba/vbaapplication.cxx | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 4e3b89c724c2..371c70bd908d 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -1460,19 +1460,8 @@ ScVbaApplication::GetOpenFilename(const uno::Any& FileFilter, const uno::Any& Fi if ( xFilePicker.is() && xFilePicker->execute() ) { - sal_Bool bUseXFilePicker2 = false; - uno::Reference< lang::XServiceInfo > xServiceInfo( xFilePicker, UNO_QUERY ); - if ( xServiceInfo.is() ) - { - rtl::OUString sImplName = xServiceInfo->getImplementationName(); - if ( sImplName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.comp.fpicker.VistaFileDialog")) || - sImplName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.ui.dialogs.SalGtkFilePicker")) ) - { - bUseXFilePicker2 = sal_True; - } - } uno::Sequence< rtl::OUString > aSelectedFiles; - if ( bUseXFilePicker2 && xFilePicker2.is() ) + if ( xFilePicker2.is() ) { // On Linux, XFilePicker->getFiles() always return one selected file although we select more than one file, also on Vista // XFilePicker->getFiles() does not work well too, so we call XFilePicker2->getSelectedFiles() to get selected files. |