Merge pull request #1261 from laanwj/2012_05_escapecsv

laanwj · laanwj · commit 661834d02bb8 · 2012-05-11T23:30:04.000-07:00
Properly escape strings when exporting CSV
diff --git a/src/qt/csvmodelwriter.cpp b/src/qt/csvmodelwriter.cpp
@@ -27,8 +27,9 @@ void CSVModelWriter::addColumn(const QString &title, int column, int role)
 
 static void writeValue(QTextStream &f, const QString &value)
 {
-    // TODO: quoting if " or \n in string
-    f << "\"" << value << "\"";
+    QString escaped = value;
+    escaped.replace('"', "\"\"");
+    f << "\"" << escaped << "\"";
 }
 
 static void writeSep(QTextStream &f)

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,9 @@ void CSVModelWriter::addColumn(const QString &title, int column, int role)`
`27`	`27`
`28`	`28`	`static void writeValue(QTextStream &f, const QString &value)`
`29`	`29`	`{`
`30`		`- // TODO: quoting if " or \n in string`
`31`		`- f << "\"" << value << "\"";`
	`30`	`+ QString escaped = value;`
	`31`	`+ escaped.replace('"', "\"\"");`
	`32`	`+ f << "\"" << escaped << "\"";`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`static void writeSep(QTextStream &f)`