+ handle single quote when writing XML

2015-07-30 11:52:50 +02:00 · 2015-07-30 11:52:50 +02:00 · d71d8943cb
commit d71d8943cb
parent d371cff4f2
2 changed files with 7 additions and 1 deletions
--- a/src/App/DynamicProperty.cpp
+++ b/src/App/DynamicProperty.cpp
@ -289,12 +289,16 @@ std::string DynamicProperty::encodeAttribute(const std::string& str) const
            tmp += "&lt;";
        else if (*it == '"')
            tmp += "&quot;";
+        else if (*it == '\'')
+            tmp += "&apos;";
        else if (*it == '&')
            tmp += "&amp;";
        else if (*it == '>')
            tmp += "&gt;";
+        else if (*it == '\r')
+            tmp += "&#xD;";
        else if (*it == '\n')
-            tmp += " ";
+            tmp += "&#xA;";
        else
            tmp += *it;
    }
--- a/src/App/Property.cpp
+++ b/src/App/Property.cpp
@ -122,6 +122,8 @@ std::string Property::encodeAttribute(const std::string& str)
            tmp += "&lt;";
        else if (*it == '"')
            tmp += "&quot;";
+        else if (*it == '\'')
+            tmp += "&apos;";
        else if (*it == '&')
            tmp += "&amp;";
        else if (*it == '>')