diff options
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/aqua/ControlHelper.mm | 3 | ||||
| -rw-r--r-- | fpicker/source/aqua/SalAquaFilePicker.mm | 7 | ||||
| -rw-r--r-- | fpicker/source/office/OfficeFilePicker.cxx | 4 | ||||
| -rw-r--r-- | fpicker/source/win32/filepicker/FilePicker.cxx | 1 | ||||
| -rw-r--r-- | fpicker/source/win32/filepicker/VistaFilePicker.cxx | 7 | ||||
| -rw-r--r-- | fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 1 |
6 files changed, 21 insertions, 2 deletions
diff --git a/fpicker/source/aqua/ControlHelper.mm b/fpicker/source/aqua/ControlHelper.mm index 5727cdf35cdf..0cecb40b1cea 100644 --- a/fpicker/source/aqua/ControlHelper.mm +++ b/fpicker/source/aqua/ControlHelper.mm @@ -216,6 +216,9 @@ void ControlHelper::initialize( sal_Int16 nTemplateId ) case FILESAVE_AUTOEXTENSION: m_bToggleVisibility[AUTOEXTENSION] = true; break; + case FILEOPEN_PREVIEW: + m_bToggleVisibility[PREVIEW] = true; + break; } createControls(); diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index 78ec4f8cf640..eef8f425e91c 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -204,7 +204,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException ) default: throw uno::RuntimeException( - "The dialog returned with an unknown result!", + "The dialog returned with an unknown result!", static_cast<XFilePicker*>( static_cast<XFilePicker3*>( this ) )); break; } @@ -288,7 +288,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles() thro SAL_INFO("fpicker.aqua", "# of items: " << nFiles); uno::Sequence< rtl::OUString > aSelectedFiles(nFiles); - + for(long nIndex = 0; nIndex < nFiles; nIndex += 1) { NSURL *url = [files objectAtIndex:nIndex]; @@ -483,6 +483,9 @@ throw( uno::Exception, uno::RuntimeException ) case FILESAVE_AUTOEXTENSION: m_nDialogType = NAVIGATIONSERVICES_SAVE; break; + case FILEOPEN_PREVIEW: + m_nDialogType = NAVIGATIONSERVICES_OPEN; + break; default: throw lang::IllegalArgumentException("Unknown template", static_cast<XFilePicker*>( static_cast<XFilePicker3*>(this) ), diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 728dd4f5ca75..1a5496b439d8 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -277,6 +277,10 @@ PickerFlags SvtFilePicker::getPickerFlags() { nBits = PickerFlags::Open | PickerFlags::InsertAsLink | PickerFlags::ShowPreview; } + else if ( m_nServiceType == TemplateDescription::FILEOPEN_PREVIEW ) + { + nBits = PickerFlags::Open | PickerFlags::ShowPreview; + } if ( m_bMultiSelection && ( nBits & PickerFlags::Open ) ) nBits |= PickerFlags::MultiSelection; diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx index 88c8cdb48104..40c258d124f2 100644 --- a/fpicker/source/win32/filepicker/FilePicker.cxx +++ b/fpicker/source/win32/filepicker/FilePicker.cxx @@ -562,6 +562,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments) break; case FILEOPEN_LINK_PREVIEW: + case FILEOPEN_PREVIEW: //FIXME: FILEOPEN_PREVIEW needs an own template, no idea how to create one winResTemplateId = TMPL2000_FILEOPEN_LINK_PREVIEW_BOX_SIMPLE_ID; break; diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx index 4b2a436c245a..102117eb46fd 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx @@ -523,6 +523,13 @@ void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::An nFeatures |= FEATURE_AUTOEXTENSION; } break; + + case css::ui::dialogs::TemplateDescription::FILEOPEN_PREVIEW : + { + bFileOpenDialog = sal_True; + nFeatures |= FEATURE_PREVIEW; + } + break; } css::uno::Reference<css::awt::XWindow> xParentWindow; if(lArguments.getLength() > 1) diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index 17138701cfca..d60aff8b95f3 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -524,6 +524,7 @@ void VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_I switch (nTemplate) { case css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE : + case css::ui::dialogs::TemplateDescription::FILEOPEN_PREVIEW : case css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE : aGUID = CLIENTID_FILEDIALOG_SIMPLE; break; |