Bugzilla #46883:

Reverting revision 807010 because it creates faulty GOCA data. Have debugged but haven't immediately found the cause. Due to time restrictions I'm currently just reverting the change to fix the regression.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@819542 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 10 deletions

diff --git a/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrderContainer.java b/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrderContainer.java
index dbeaa26d0..a158fbe8f 100644
--- a/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrderContainer.java
+++ b/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrderContainer.java
@@ -46,8 +46,6 @@ implements StructuredData, Completable, Startable {
     /** object has started */
     private boolean started = false;
 
-    private int dataLength = 0;
-
     /**
      * Default constructor
      */
@@ -80,7 +78,6 @@ implements StructuredData, Completable, Startable {
      */
     public void addObject(StructuredData object) {
         objects.add(object);
-        dataLength += object.getDataLength();
     }
 
     /**
@@ -91,7 +88,6 @@ implements StructuredData, Completable, Startable {
     public void addAll(AbstractGraphicsDrawingOrderContainer graphicsContainer) {
         Collection/*<StructuredDataObject>*/ objects = graphicsContainer.getObjects();
         objects.addAll(objects);
-        dataLength += graphicsContainer.getDataLength();
     }
 
     /**
@@ -111,11 +107,9 @@ implements StructuredData, Completable, Startable {
     public StructuredData removeLast() {
         int lastIndex = objects.size() - 1;
         StructuredData object = null;
-        if (lastIndex >= 0) {
-            object = (StructuredData)objects.remove(lastIndex);
-        }
-        if (object != null) {
-            dataLength -= object.getDataLength();
+        if (lastIndex > -1) {
+            object = (StructuredData)objects.get(lastIndex);
+            objects.remove(lastIndex);
         }
         return object;
     }
@@ -127,7 +121,12 @@ implements StructuredData, Completable, Startable {
      * all enclosed objects (and their containers)
      */
     public int getDataLength() {
-        return this.dataLength;
+        int dataLen = 0;
+        Iterator it = objects.iterator();
+        while (it.hasNext()) {
+            dataLen += ((StructuredData)it.next()).getDataLength();
+        }
+        return dataLen;
     }
 
     /** {@inheritDoc} */