Add check for missing checkbox value and forced onmouseover removal.

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / xml / XMLCleanup.java

diff --git a/src/cx/fbn/nevernote/xml/XMLCleanup.java b/src/cx/fbn/nevernote/xml/XMLCleanup.java
index 3d1b280..73a0531 100644 (file)
--- a/src/cx/fbn/nevernote/xml/XMLCleanup.java
+++ b/src/cx/fbn/nevernote/xml/XMLCleanup.java
@@ -1,5 +1,5 @@
 /*\r
- * This file is part of NeverNote \r
+ * This file is part of NixNote \r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
@@ -128,7 +128,8 @@ public class XMLCleanup {
                                element.setTagName("span");\r
                        }\r
                }\r
-               content = doc.toString();\r
+               // Replace the XML carrage returns that the toString() creates.\r
+               content = doc.toString().replace( "
", "" );\r
 \r
        }\r
        // Start looking through the tree.\r
@@ -164,10 +165,13 @@ public class XMLCleanup {
                        QDomElement e = node.toElement();\r
                        e.setTagName("en-todo");\r
                        String value = e.attribute("value");\r
+                       if (value.trim().equals(""))\r
+                               value = "false";\r
                        e.removeAttribute("value");\r
                        e.removeAttribute("unchecked");\r
                        e.setAttribute("checked", value);\r
                        e.removeAttribute("onclick");\r
+                       e.removeAttribute("onmouseover");\r
                        e.removeAttribute("type");\r
                }\r
 \r
@@ -199,6 +203,14 @@ public class XMLCleanup {
                                node.removeChild(e);\r
                                return;\r
                        }\r
+\r
+                       // Check if we have a LaTeX image.  Remove the parent link tag\r
+                       if (enType.equalsIgnoreCase("en-latex")) {\r
+                               enType = "en-media";\r
+                               QDomNode parent = e.parentNode();\r
+                               parent.removeChild(e);\r
+                               parent.parentNode().replaceChild(e, parent);\r
+                       }\r
                        \r
                        // If we've gotten this far, we have an en-media tag\r
                        e.setTagName(enType);\r