summaryrefslogtreecommitdiff
authorLuboš Luňák <l.lunak@suse.cz>2012-08-01 09:11:44 (GMT)
committer Luboš Luňák <l.lunak@suse.cz>2012-08-01 09:37:35 (GMT)
commite62c67d8d47231e3ff0df440642dfcabac4f3f81 (patch) (side-by-side diff)
tree68d67589304212b3b88ec686f49e9bb9ebb5cebe
parenta69691ff8c1cfeca6b67973000d17fa01947a0a5 (diff)
downloadcore-e62c67d8d47231e3ff0df440642dfcabac4f3f81.zip
core-e62c67d8d47231e3ff0df440642dfcabac4f3f81.tar.gz
do not let LO's autoextension handling interfere with KFileDialog's(fdo#52546)
Change-Id: I73263a74d7b9bbf4a99e86773854e69f747e19d5
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--vcl/unx/kde4/KDE4FilePicker.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index df08ed7..4917bf7 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -398,9 +398,12 @@ uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16 controlId, sal_Int16 )
switch (controlId)
{
case ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION:
- // we ignore this one and rely on KFileDialog to provide the function,
- // always return true, here meaning "it's been taken care of"
- res = uno::Any( true );
+ // We ignore this one and rely on KFileDialog to provide the function.
+ // Always return false, to pretend we do not support this, otherwise
+ // LO core would try to be smart and cut the extension in some places,
+ // interfering with KFileDialog's handling of it. KFileDialog also
+ // saves the value of the setting, so LO core is not needed for that either.
+ res = uno::Any( false );
break;
case ExtendedFilePickerElementIds::CHECKBOX_PASSWORD:
case ExtendedFilePickerElementIds::CHECKBOX_FILTEROPTIONS: