Skip to content

Commit

Permalink
Merge branch 'jb46745' into 'master'
Browse files Browse the repository at this point in the history
[calligra] Fix escape characters in CSV parser. Contributes JB#46745

See merge request mer-core/calligra!43
  • Loading branch information
pvuorela committed Nov 29, 2019
2 parents 5032cdb + ca0ba4a commit 6c0f634
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions rpm/calligra-sheets-csvimport.patch
Expand Up @@ -257,8 +257,8 @@ index 00000000000..f6b9d8f5da6
+
+QString CSVParser::detectDelimiter(const QString &text)
+{
+ QRegExp bracketsRegExp("\(.*?\)");
+ QRegExp squareBracketsRegExp("\[.*?\]");
+ QRegExp bracketsRegExp("\\(.*?\\)");
+ QRegExp squareBracketsRegExp("\\[.*?\\]");
+ QRegExp doubleQuotesRegExp("(\"([^\"]|\"\")*\")");
+ QRegExp quotesRegExp("(\'([^\']|\'\')*\')");
+
Expand Down

0 comments on commit 6c0f634

Please sign in to comment.