summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java8
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java4
2 files changed, 6 insertions, 6 deletions
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
index 96a5e25cabd3..14243ccbb420 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
@@ -464,23 +464,23 @@ implements DOCConstants, OfficeConstants, DocumentDeserializer {
// copy font declarations from original document to the new document
nl = origDomDoc.getElementsByTagName(TAG_OFFICE_FONT_DECLS);
df = doc.createDocumentFragment();
- newNode = xu.deepClone(df, nl.item(0));
+ newNode = XmlUtil.deepClone(df, nl.item(0));
rootNode.insertBefore(newNode, bodyNode);
// copy style catalog from original document to the new document
nl = origDomDoc.getElementsByTagName(TAG_OFFICE_STYLES);
df = doc.createDocumentFragment();
- newNode = xu.deepClone(df, nl.item(0));
+ newNode = XmlUtil.deepClone(df, nl.item(0));
rootNode.insertBefore(newNode, bodyNode);
nl = origDomDoc.getElementsByTagName(TAG_OFFICE_AUTOMATIC_STYLES);
df = doc.createDocumentFragment();
- newNode = xu.deepClone(df, nl.item(0));
+ newNode = XmlUtil.deepClone(df, nl.item(0));
rootNode.insertBefore(newNode, bodyNode);
nl = origDomDoc.getElementsByTagName(TAG_OFFICE_MASTER_STYLES);
df = doc.createDocumentFragment();
- newNode = xu.deepClone(df, nl.item(0));
+ newNode = XmlUtil.deepClone(df, nl.item(0));
rootNode.insertBefore(newNode, bodyNode);
}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java
index 23f9d3fe7cd0..687f262a6052 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java
@@ -51,7 +51,7 @@ public class ConverterFactory {
// findConverterInfo expects the second paramenter to be the
// destination MimeType
- if (foundInfo.isValidOfficeType(mimeTypeOut))
+ if (ConverterInfo.isValidOfficeType(mimeTypeOut))
foundInfo = ConverterInfoMgr.findConverterInfo(mimeTypeIn, mimeTypeOut);
else
foundInfo = ConverterInfoMgr.findConverterInfo(mimeTypeOut, mimeTypeIn);
@@ -80,7 +80,7 @@ public class ConverterFactory {
ConverterInfo foundInfo = null;
boolean toOffice;
- toOffice = foundInfo.isValidOfficeType(mimeTypeOut);
+ toOffice = ConverterInfo.isValidOfficeType(mimeTypeOut);
// findConverterInfo expects the second paramenter to be the
// destination MimeType