CSV escaping.

common/string_utils.cpp

@@ -245,6 +245,15 @@ wxString EscapeString( const wxString& aSource, ESCAPE_CONTEXT aContext )
             else
                 converted += c;
         }
+        else if( aContext == CTX_CSV )
+        {
+            if( c == ',' )
+                converted += wxT( "{comma}" );
+            else if( c == '\n' || c == '\r' )
+                converted += wxT( "{return}" );
+            else
+                converted += c;
+        }
         else
         {
             converted += c;

include/string_utils.h

@@ -56,6 +56,7 @@ enum ESCAPE_CONTEXT
     CTX_IPC,
     CTX_QUOTED_STR,
     CTX_LINE,
+    CTX_CSV,
     CTX_FILENAME,
     CTX_NO_SPACE        // to replace spaces in names that do not accept spaces
 };