[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                       |    2 --
 patches/dev300/unoxml-fix-empty-xmlns.diff |   22 ----------------------
 2 files changed, 24 deletions(-)

New commits:
commit 3c89c8de167d7a6e99249fc4463027f158a9f719
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Apr 28 17:58:50 2011 +0200

    pushed unoxml-fix-empty-xmlns.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 2a704d1..9dae8fa 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1258,8 +1258,6 @@ mysqlcppconn-mysqlclient-SONAME.diff
 
 store-crash-fix.diff, thorsten
 sd-ppt-fix-document-summary-reading.diff, n#546758, rodo
-# fixes crasher in xml parser
-unoxml-fix-empty-xmlns.diff, rodo
 build-fix-xulrunner-npapi-inc.diff, janneke
 # FIXME ooo330-m2: does not apply: configure-fix-lpsolve-depends.diff, janneke
 
diff --git a/patches/dev300/unoxml-fix-empty-xmlns.diff b/patches/dev300/unoxml-fix-empty-xmlns.diff
deleted file mode 100644
index cb6c9a0..0000000
--- a/patches/dev300/unoxml-fix-empty-xmlns.diff
+++ /dev/null
@@ -1,22 +0,0 @@
----
- unoxml/source/dom/node.cxx |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git unoxml/source/dom/node.cxx unoxml/source/dom/node.cxx
-index f44e56d..57779db 100644
---- unoxml/source/dom/node.cxx
-+++ unoxml/source/dom/node.cxx
-@@ -68,8 +68,9 @@ namespace DOM
-         // add node's namespaces to current context
-         for (xmlNsPtr pNs = pNode->nsDef; pNs != 0; pNs = pNs->next) {
-             const xmlChar *pPrefix = pNs->prefix;
-+        // prefix can be NULL when xmlns attribute is empty (xmlns="")
-             OString prefix(reinterpret_cast<const sal_Char*>(pPrefix),
--                           strlen(reinterpret_cast<const char*>(pPrefix)));
-+                           pPrefix ? strlen(reinterpret_cast<const char*>(pPrefix)) : 0);
-             const xmlChar *pHref = pNs->href;
-             OUString val(reinterpret_cast<const sal_Char*>(pHref),
-                 strlen(reinterpret_cast<const char*>(pHref)),
--- 
-1.7.0.1
-