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

[Kohei Yoshida]

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

New commits:
commit 9dc4377c91b00585519abfd4fc1528393fe84e4a
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Fri Mar 21 15:06:47 2014 -0400

    Revert "fdo#74064 The filename gets properly highlighted in the Save As dialog."
    
    This reverts commit 55eb86699d7d4b2151530e9a0b3ca2e99033595b, which caused a
    regression fdo#76466.

diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 6e524b9..2365565 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -1345,13 +1345,9 @@ 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 )
     {
-        // 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 );
-        }
+        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);