[Libreoffice-commits] core.git: sc/source

[TokieSan (via logerrit)]

 sc/source/ui/dbgui/scuiasciiopt.cxx |    5 +----
 sc/source/ui/inc/scuiasciiopt.hxx   |    1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit be1fe4418caa8c26ea53fe1f9acbe36096d5e3a9
Author:     TokieSan <elto...@aucegypt.edu>
AuthorDate: Mon Mar 27 14:28:45 2023 +0200
Commit:     Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Wed Apr 19 17:37:39 2023 +0200

    tdf#150652 Column Type being disabled makes UX unintuitive
    
    Columntype is no longer disabled by default.
    
    Change-Id: I173ec35363278b397a2727cff234c0b4d936ff99
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149630
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
    Reviewed-by: Andreas Heinisch <andreas.heini...@yahoo.de>

diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx 
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index df8f77c8553c..9f510c9d7e3d 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -339,7 +339,6 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, 
std::u16string_view aD
     , mxCkbDetectNumber(m_xBuilder->weld_check_button("detectspecialnumbers"))
     , mxCkbEvaluateFormulas(m_xBuilder->weld_check_button("evaluateformulas"))
     , mxCkbSkipEmptyCells(m_xBuilder->weld_check_button("skipemptycells"))
-    , mxFtType(m_xBuilder->weld_label("textcolumntype"))
     , mxLbType(m_xBuilder->weld_combo_box("columntype"))
     , mxAltTitle(m_xBuilder->weld_label("textalttitle"))
     , mxTableBox(new ScCsvTableBox(*m_xBuilder))
@@ -545,7 +544,6 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, 
std::u16string_view aD
     }
 
     mxLbType->connect_changed( LINK( this, ScImportAsciiDlg, LbColTypeHdl ) );
-    mxFtType->set_sensitive(false);
     mxLbType->set_sensitive(false);
 
     // *** table box preview ***
@@ -931,12 +929,11 @@ IMPL_LINK( ScImportAsciiDlg, ColTypeHdl, ScCsvTableBox&, 
rTableBox, void )
     bool bEmpty = (nType == CSV_TYPE_MULTI);
     bool bEnable = ((0 <= nType) && (nType < nTypeCount)) || bEmpty;
 
-    mxFtType->set_sensitive( bEnable );
     mxLbType->set_sensitive( bEnable );
 
     if (bEmpty)
         mxLbType->set_active(-1);
-    else if (bEnable)
+    else
         mxLbType->set_active(nType);
 }
 
diff --git a/sc/source/ui/inc/scuiasciiopt.hxx 
b/sc/source/ui/inc/scuiasciiopt.hxx
index f966bd2be895..5649fb3da234 100644
--- a/sc/source/ui/inc/scuiasciiopt.hxx
+++ b/sc/source/ui/inc/scuiasciiopt.hxx
@@ -74,7 +74,6 @@ class ScImportAsciiDlg : public weld::GenericDialogController
     std::unique_ptr<weld::CheckButton> mxCkbEvaluateFormulas;
     std::unique_ptr<weld::CheckButton> mxCkbSkipEmptyCells;
 
-    std::unique_ptr<weld::Label> mxFtType;
     std::unique_ptr<weld::ComboBox> mxLbType;
     std::unique_ptr<weld::Label> mxAltTitle;