Merge from Trunk revisions 735029 - 740275.

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

1 files changed, 16 insertions, 0 deletions

diff --git a/src/java/org/apache/fop/afp/modca/ObjectEnvironmentGroup.java b/src/java/org/apache/fop/afp/modca/ObjectEnvironmentGroup.java
index bc0cc5a63..359f68602 100644
--- a/src/java/org/apache/fop/afp/modca/ObjectEnvironmentGroup.java
+++ b/src/java/org/apache/fop/afp/modca/ObjectEnvironmentGroup.java
@@ -46,6 +46,9 @@ public final class ObjectEnvironmentGroup extends AbstractNamedAFPObject {
     /** the ObjectAreaPosition for the object environment group */
     private ObjectAreaPosition objectAreaPosition;
 
+    /** the MapImageObject for the object environment group (optional) */
+    private MapImageObject mapImageObject;
+
     /** the DataDescriptor for the object environment group */
     private AbstractDescriptor dataDescriptor;
 
@@ -83,6 +86,15 @@ public final class ObjectEnvironmentGroup extends AbstractNamedAFPObject {
         this.objectAreaPosition = objectAreaPosition;
     }
 
+    /**
+     * Sets the Map Image Object (MIO).
+     *
+     * @param mapImageObject the MIO structured field
+     */
+    public void setMapImageObject(MapImageObject mapImageObject) {
+        this.mapImageObject = mapImageObject;
+    }
+
     /** {@inheritDoc} */
     protected void writeStart(OutputStream os) throws IOException {
         byte[] data = new byte[17];
@@ -115,6 +127,10 @@ public final class ObjectEnvironmentGroup extends AbstractNamedAFPObject {
             objectAreaPosition.writeToStream(os);
         }
 
+        if (mapImageObject != null) {
+            mapImageObject.writeToStream(os);
+        }
+
         if (mapContainerData != null) {
             mapContainerData.writeToStream(os);
         }