New upstream version 3.2.1+dfsg1upstream/3.2.1+dfsg1

1 files changed, 15 insertions, 0 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/csvformat.cpp b/SQLiteStudio3/coreSQLiteStudio/csvformat.cpp
index 151fffd..c5019c3 100644
--- a/SQLiteStudio3/coreSQLiteStudio/csvformat.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/csvformat.cpp
@@ -10,6 +10,7 @@ CsvFormat::CsvFormat()
 CsvFormat::CsvFormat(const QString& columnSeparator, const QString& rowSeparator) :
     columnSeparator(columnSeparator), rowSeparator(rowSeparator)
 {
+    calculateSeparatorMaxLengths();
 }
 
 CsvFormat::CsvFormat(const QStringList &columnSeparators, const QStringList &rowSeparators)
@@ -31,9 +32,23 @@ CsvFormat::CsvFormat(const QStringList &columnSeparators, const QStringList &row
     }
     else if (columnSeparators.size() > 0)
         this->columnSeparator = columnSeparators.first();
+
+    calculateSeparatorMaxLengths();
 }
 
 CsvFormat::CsvFormat(const QString& columnSeparator, const QString& rowSeparator, bool strictRowSeparator, bool strictColumnSeparator) :
     columnSeparator(columnSeparator), rowSeparator(rowSeparator), strictColumnSeparator(strictColumnSeparator), strictRowSeparator(strictRowSeparator)
 {
+    calculateSeparatorMaxLengths();
+}
+
+void CsvFormat::calculateSeparatorMaxLengths()
+{
+    maxColumnSeparatorLength = columnSeparator.length();
+    for (const QString& sep : columnSeparators)
+        maxColumnSeparatorLength = qMax(sep.length(), maxColumnSeparatorLength);
+
+    maxRowSeparatorLength = rowSeparator.length();
+    for (const QString& sep : rowSeparators)
+        maxRowSeparatorLength = qMax(sep.length(), maxRowSeparatorLength);
 }