diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2013-05-07 17:54:46 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2013-05-07 18:07:02 +0300 |
| commit | dcf11ef35fbd0012c1603b53704fa05afdb2ce7f (patch) | |
| tree | 82dcfe0a3af4fff30bc8ed4336fa19e87f3e86be /fpicker | |
| parent | 58fc0b1a14e827ab0b9ee4da8630c1e3ee10a19c (diff) | |
Different fix for bnc#777788
Use the same GUID in the file dialog for the FILESAVE_AUTOEXTENSION
case as for the FILESAVE_AUTOEXTENSION_EXTENSION case. The former is
used when exporting to PDF. Exactly why using one GUID for the dialog
causes it to use the default folder as set by SetFolder(), and the
other not, I have no idea. Are the GUIDs we use arbitrary (and unique
to the OOo/LO codebase), or does either of them, or both, have some
magic meaning to Windows?
FILESAVE_AUTOEXTENSION is also used in other cases than exporting to
PDF. It remains to be seen whether this change will cause noticeable
behaviour change interpreted as a harmful regression. Or whether the
change of default folder for PDF export will do that, for that matter.
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index 655568508b76..52de8d8fe09a 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -68,7 +68,6 @@ typedef ::comphelper::SequenceAsVector< ::rtl::OUString > TStringList; // Guids used for IFileDialog::SetClientGuid static const GUID CLIENTID_FILEDIALOG_SIMPLE = {0xB8628FD3, 0xA3F5, 0x4845, 0x9B, 0x62, 0xD5, 0x1E, 0xDF, 0x97, 0xC4, 0x83}; static const GUID CLIENTID_FILEDIALOG_OPTIONS = {0x93ED486F, 0x0D04, 0x4807, 0x8C, 0x44, 0xAC, 0x26, 0xCB, 0x6C, 0x5D, 0x36}; -static const GUID CLIENTID_FILESAVE = {0x3B2E2261, 0x402D, 0x4049, 0xB0, 0xC0, 0x91, 0x13, 0xF8, 0x6E, 0x84, 0x7C}; static const GUID CLIENTID_FILESAVE_PASSWORD = {0xC12D4F4C, 0x4D41, 0x4D4F, 0x97, 0xEF, 0x87, 0xF9, 0x8D, 0xB6, 0x1E, 0xA6}; static const GUID CLIENTID_FILESAVE_SELECTION = {0x5B2482B3, 0x0358, 0x4E09, 0xAA, 0x64, 0x2B, 0x76, 0xB2, 0xA0, 0xDD, 0xFE}; static const GUID CLIENTID_FILESAVE_TEMPLATE = {0x9996D877, 0x20D5, 0x424B, 0x9C, 0x2E, 0xD3, 0xB6, 0x31, 0xEC, 0xF7, 0xCE}; @@ -500,14 +499,11 @@ void VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_I aGUID = CLIENTID_FILEDIALOG_OPTIONS; break; - case css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION : - aGUID = CLIENTID_FILESAVE; - break; - case css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION_PASSWORD : aGUID = CLIENTID_FILESAVE_PASSWORD; break; + case css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION : case css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION_SELECTION : aGUID = CLIENTID_FILESAVE_SELECTION; break; |