From d9aa870e5d509cc7309ab82dd102a937ab58613a Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Thu, 9 Feb 2017 04:36:04 -0500 Subject: Imported Upstream version 3.1.1+dfsg1 --- Plugins/CsvImport/csvimport.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Plugins/CsvImport/csvimport.cpp') diff --git a/Plugins/CsvImport/csvimport.cpp b/Plugins/CsvImport/csvimport.cpp index b1d52ee..e9f8f15 100644 --- a/Plugins/CsvImport/csvimport.cpp +++ b/Plugins/CsvImport/csvimport.cpp @@ -83,7 +83,9 @@ bool CsvImport::extractColumns() void CsvImport::defineCsvFormat() { csvFormat = CsvFormat(); - csvFormat.rowSeparator = '\n'; + csvFormat.rowSeparators = QStringList({"\r\n", "\n", "\r"}); + csvFormat.multipleRowSeparators = true; + csvFormat.strictRowSeparator = true; switch (cfg.CsvImport.Separator.get()) { -- cgit v1.2.3