+ handle single quote when writing XML

FreeCAD · Jul 30, 2015 · d71d894 · d71d894
1 parent d371cff
commit d71d894
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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;
     }

diff --git 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 == '>')