diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:45 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:45 +0200 |
| commit | bcb1ceafcc18aaa8199b21478dde39bdb9ae83dd (patch) | |
| tree | 619295a796fca507fa238235093b2c35323ffe84 /unoxml | |
| parent | 102d51ec7c35c0b90fff89093d1d2d8c47ea0b7c (diff) | |
| parent | 348f3a8b166c7c937766a25ec43eb9c0ecb38200 (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
filter/source/graphicfilter/eps/eps.cxx
oox/source/export/shapes.cxx
oox/source/xls/workbookhelper.cxx
Diffstat (limited to 'unoxml')
| -rw-r--r-- | unoxml/source/dom/node.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx index 7ab6336aefdf..b4645bc0b578 100644 --- a/unoxml/source/dom/node.cxx +++ b/unoxml/source/dom/node.cxx @@ -87,8 +87,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)), |