[Libreoffice-commits] .: vcl/unx

[Lubos Lunak]

 vcl/unx/kde4/KDE4FilePicker.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit e62c67d8d47231e3ff0df440642dfcabac4f3f81
Author: Luboš Luňák <l.lu...@suse.cz>
Date:   Wed Aug 1 11:11:44 2012 +0200

    do not let LO's autoextension handling interfere with 
KFileDialog's(fdo#52546)
    
    Change-Id: I73263a74d7b9bbf4a99e86773854e69f747e19d5

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:

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits