diff --git a/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java b/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
index 9606fd760..a86fbda66 100644
--- a/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
+++ b/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
@@ -173,19 +173,18 @@ public abstract class AbstractEscherOptRecord extends EscherRecord
stringBuilder.append( " " + property.toString() + nl );
}
- return stringBuilder.toString();
- }
-
- @Override
- public String toXml(String tab) {
- StringBuilder builder = new StringBuilder();
- builder.append(tab).append(formatXmlRecordHeader(getClass().getSimpleName(), HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())))
- .append(tab).append("\t").append("").append(getChildRecords().size()).append("\n")
- .append(tab).append("\t").append("").append(isContainerRecord()).append("\n");
- for (EscherProperty property: getEscherProperties()){
- builder.append(property.toXml(tab+"\t"));
- }
- builder.append(tab).append("").append(getClass().getSimpleName()).append(">\n");
- return builder.toString();
- }
-}
+ return stringBuilder.toString();
+ }
+
+ @Override
+ public String toXml(String tab) {
+ StringBuilder builder = new StringBuilder();
+ builder.append(tab).append(formatXmlRecordHeader(getClass().getSimpleName(),
+ HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())));
+ for (EscherProperty property: getEscherProperties()){
+ builder.append(property.toXml(tab+"\t"));
+ }
+ builder.append(tab).append("").append(getClass().getSimpleName()).append(">\n");
+ return builder.toString();
+ }
+}
diff --git a/src/java/org/apache/poi/ddf/EscherComplexProperty.java b/src/java/org/apache/poi/ddf/EscherComplexProperty.java
index d3db3469a..8cdd46f5a 100644
--- a/src/java/org/apache/poi/ddf/EscherComplexProperty.java
+++ b/src/java/org/apache/poi/ddf/EscherComplexProperty.java
@@ -140,7 +140,7 @@ public class EscherComplexProperty extends EscherProperty {
builder.append(tab).append("<").append(getClass().getSimpleName()).append(" id=\"0x").append(HexDump.toHex(getId()))
.append("\" name=\"").append(getName()).append("\" blipId=\"")
.append(isBlipId()).append("\">\n");
- builder.append("\t").append(tab).append(dataStr);
+ //builder.append("\t").append(tab).append(dataStr);
builder.append(tab).append("").append(getClass().getSimpleName()).append(">\n");
return builder.toString();
}
diff --git a/src/java/org/apache/poi/ddf/EscherContainerRecord.java b/src/java/org/apache/poi/ddf/EscherContainerRecord.java
index bed9619d1..4190594b5 100644
--- a/src/java/org/apache/poi/ddf/EscherContainerRecord.java
+++ b/src/java/org/apache/poi/ddf/EscherContainerRecord.java
@@ -258,17 +258,14 @@ public final class EscherContainerRecord extends EscherRecord {
@Override
public String toXml(String tab) {
StringBuilder builder = new StringBuilder();
- builder.append(tab).append(formatXmlRecordHeader(getClass().getSimpleName(), HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())))
- .append(tab).append("\t").append("").append(getRecordName()).append("\n")
- .append(tab).append("\t").append("").append(isContainerRecord()).append("\n")
- .append(tab).append("\t").append("").append(HexDump.toHex(_childRecords.size())).append("\n");
+ builder.append(tab).append(formatXmlRecordHeader(getRecordName(), HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())));
for ( Iterator iterator = _childRecords.iterator(); iterator
.hasNext(); )
{
EscherRecord record = iterator.next();
builder.append(record.toXml(tab+"\t"));
}
- builder.append(tab).append("").append(getClass().getSimpleName()).append(">\n");
+ builder.append(tab).append("").append(getRecordName()).append(">\n");
return builder.toString();
}
diff --git a/src/java/org/apache/poi/ddf/EscherTextboxRecord.java b/src/java/org/apache/poi/ddf/EscherTextboxRecord.java
index 12a0dcccd..c21c22796 100644
--- a/src/java/org/apache/poi/ddf/EscherTextboxRecord.java
+++ b/src/java/org/apache/poi/ddf/EscherTextboxRecord.java
@@ -155,8 +155,6 @@ public class EscherTextboxRecord extends EscherRecord
}
StringBuilder builder = new StringBuilder();
builder.append(tab).append(formatXmlRecordHeader(getClass().getSimpleName(), HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())))
- .append(tab).append("\t").append("").append(isContainerRecord()).append("\n")
- .append(tab).append("\t").append("").append(getChildRecords().size()).append("\n")
.append(tab).append("\t").append("").append(theDumpHex).append("\n");
builder.append(tab).append("").append(getClass().getSimpleName()).append(">\n");
return builder.toString();