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

[Eike Rathke]

 sc/source/ui/dbgui/scuiasciiopt.cxx |   13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

New commits:
commit 52be0a739642aa10bf5ec81c512ff0a9ca854eed
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Dec 19 20:09:19 2013 +0100

    there is no reason to not set FromRow for TSV files
    
    The FromRow setting is remembered between imports, ignoring it for TSV
    may just lead to the user having it to enter again and again.
    
    Change-Id: I869b25595cf1f15dcbd1d5028d253299d2964cd7

diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 6b9978a..b73c4b0 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -314,7 +314,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,OUString aDatName,
         pCkbDetectNumber->Check();
     if( bFixedWidth && !bIsTSV )
         pRbFixed->Check();
-    if( nFromRow != 1 && !bIsTSV )
+    if( nFromRow != 1 )
         pNfRow->SetValue( nFromRow );
 
     if ( bIsTSV )
commit 112e39a0a172f79ad3afa366673e1b7dfb3845f2
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Dec 19 19:58:38 2013 +0100

    reverted the CSV comma-checkbox override
    
    While for .tsv|.tab files forcing the Tab box to be checked may be
    helpful, doing the same with the Comma box for .csv files is not. Though
    named Comma-Separated Values, the file format is often used with other
    separators, especially with localized content where the decimal
    separator is also comma to not interfer and having to enquote each
    numeric field.
    
    Users frequently importing such files would have to uncheck Comma on
    each import, while if it really was a comma-separated file and such
    files are imported frequently checking Comma would have to be done only
    once, as the options are persistently remembered.
    
    Change-Id: I464d453bfa4e2a793faabbabfccb5986c454496e

diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 95b528c..6b9978a 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -289,13 +289,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,OUString aDatName,
     }
 
     // To be able to prefill the correct values based on the file extension
-    bool bIsCSV = false;
-    bool bIsTSV = false;
-
-    if ( aDatName.endsWithIgnoreAsciiCase(".csv") )
-        bIsCSV = true;
-    else if ( aDatName.endsWithIgnoreAsciiCase(".tsv") || aDatName.endsWithIgnoreAsciiCase(".tab") )
-        bIsTSV = true;
+    bool bIsTSV = (aDatName.endsWithIgnoreAsciiCase(".tsv") || aDatName.endsWithIgnoreAsciiCase(".tab"));
 
     // Default options are set in officecfg/registry/schema/org/openoffice/Office/Calc.xcs
     OUString sFieldSeparators(",;\t");
@@ -328,9 +322,6 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,OUString aDatName,
     else
         SetSeparators(); // Set Separators in the dialog from maFieldSeparators (empty are not set)
 
-    if ( bIsCSV )
-        pCkbComma->Check();
-
     // Get Separators from the dialog (empty are set from default)
     maFieldSeparators = GetSeparators();