diff options
| author | Aidan Butler <abutler@openoffice.org> | 2003-03-05 09:32:24 +0000 |
|---|---|---|
| committer | Aidan Butler <abutler@openoffice.org> | 2003-03-05 09:32:24 +0000 |
| commit | 775053a71bbd5166cfe2210dfa848fb0306026c3 (patch) | |
| tree | dd72a45478976c9a5e589f6472bf0cc57d889183 /xmerge | |
| parent | 97faf4712351bc9e523be56fabf8647ec1bbd6ca (diff) | |
Added extra checks
Diffstat (limited to 'xmerge')
| -rw-r--r-- | xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java b/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java index bfaaacf4549f..025267a0c5e8 100644 --- a/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java +++ b/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java @@ -187,26 +187,29 @@ public final class DocumentSerializerImpl NodeList nodeList; Node tmpNode; Node rootNode = (Node)rootElement; - + if (metaDoc !=null){ nodeList= metaDoc.getElementsByTagName(TAG_OFFICE_META); if (nodeList.getLength()>0){ - tmpNode = newDoc.importNode(nodeList.item(0),true); - rootNode.appendChild(tmpNode); + tmpNode = newDoc.importNode(nodeList.item(0),true); + rootNode.appendChild(tmpNode); } + } if (styleDoc !=null){ nodeList= styleDoc.getElementsByTagName(TAG_OFFICE_STYLES); if (nodeList.getLength()>0){ - tmpNode = newDoc.importNode(nodeList.item(0),true); - rootNode.appendChild(tmpNode); + tmpNode = newDoc.importNode(nodeList.item(0),true); + rootNode.appendChild(tmpNode); } + }if (domDoc !=null){ nodeList= domDoc.getElementsByTagName(TAG_OFFICE_AUTOMATIC_STYLES); if (nodeList.getLength()>0){ - tmpNode = newDoc.importNode(nodeList.item(0),true); - rootNode.appendChild(tmpNode); + tmpNode = newDoc.importNode(nodeList.item(0),true); + rootNode.appendChild(tmpNode); } nodeList= domDoc.getElementsByTagName(TAG_OFFICE_BODY); if (nodeList.getLength()>0){ - tmpNode = newDoc.importNode(nodeList.item(0),true); - rootNode.appendChild(tmpNode); + tmpNode = newDoc.importNode(nodeList.item(0),true); + rootNode.appendChild(tmpNode); + } } domDoc=newDoc; }catch(Exception e){ |