[Libreoffice-commits] core.git: vcl/unx

[Rachit Gupta]

 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 55eb86699d7d4b2151530e9a0b3ca2e99033595b
Author: Rachit Gupta <rachitgupta1792 at gmail.com>
Date:   Wed Feb 26 19:12:08 2014 +0530

    fdo#74064 The filename gets properly highlighted in the Save As dialog.
    
    The filename was missing the extension which was causing problems.
    The extension is retained now by disabling the autoextension checkbox.
    
    Change-Id: If913124c22265da2bacb043d83386fd8f5710ca8
    Reviewed-on: https://gerrit.libreoffice.org/8364
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 2365565..6e524b9 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -1345,9 +1345,13 @@ void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nContr
         OSL_TRACE("enable unknown control %d", nControlId);
     else if( tType == GTK_TYPE_TOGGLE_BUTTON )
     {
-        bool bChecked = false;
-        rValue >>= bChecked;
-        gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( pWidget ), bChecked );
+        // fdo#74064, not activating the auto_extension checkbox so that proper filename is highlighted.
+        if(nControlId != ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION)
+        {
+            bool bChecked = false;
+            rValue >>= bChecked;
+            gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( pWidget ), bChecked );
+        }
     }
     else if( tType == GTK_TYPE_COMBO_BOX )
         HandleSetListValue(GTK_COMBO_BOX(pWidget), nControlAction, rValue);