root/10050_filter_all_illegal_xml_characters.patch @ 55:8b22aecab4d9

freemind/modes/NodeAdapter.java

@@ -210 +210 @@
 
     /** \0 is not allowed: */
     private String makeValidXml(String pXmlNoteText) {
-        return pXmlNoteText.replaceAll("\0", "").replaceAll("�", "");
+        return pXmlNoteText.replaceAll("[\0-\u0008]|\u000B|\u000C|[\u000E-\u001F]|[\uD800-\uDFFF]|\uFFFE|\uFFFF", "").replaceAll("�", "");
     }
     /* ************************************************************
      * ********     Notes                                   *******
@@ -1006 +1006 @@
         // OSSXP.COM: not save TEXT attributes in .mmx file
         if( node.isInWhiteAttlist("TEXT"))
         {
-        String text = this.toString().replace('\0', ' ');
+        String text = this.makeValidXml(this.toString());
         if(!HtmlTools.isHtmlNode(text)) {
             node.setAttribute(XMLElementAdapter.XML_NODE_TEXT,text);
         } else {
@@ -1014 +1014 @@
             XMLElement htmlElement = new XMLElement();
             htmlElement.setName(XMLElementAdapter.XML_NODE_XHTML_CONTENT_TAG);
             htmlElement.setAttribute(XMLElementAdapter.XML_NODE_XHTML_TYPE_TAG, XMLElementAdapter.XML_NODE_XHTML_TYPE_NODE);
-            htmlElement.setEncodedContent(getXmlText().replace('\0', ' '));
+            htmlElement.setEncodedContent(this.makeValidXml(getXmlText()));
             node.addChild(htmlElement);
         }
         if(getXmlNoteText()!= null){
                         XMLElement htmlElement = new XMLElement();
                         htmlElement.setName(XMLElementAdapter.XML_NODE_XHTML_CONTENT_TAG);
                         htmlElement.setAttribute(XMLElementAdapter.XML_NODE_XHTML_TYPE_TAG, XMLElementAdapter.XML_NODE_XHTML_TYPE_NOTE);
-                        htmlElement.setEncodedContent(getXmlNoteText().replace('\0', ' '));
+                        htmlElement.setEncodedContent(this.makeValidXml(getXmlNoteText()));
                         node.addChild(htmlElement);
                 
         }