Used pool.surrenderEvent().

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@195693 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java b/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java
index 87be4c1c9fbaec2868091d6fbc49233e33711430..5df54ffc22985f884d71fbc79435742ed0bea3bd 100644 (file)
--- a/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java
+++ b/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java
@@ -172,7 +172,7 @@ public class FoLayoutMasterSet extends FONode {
                     throw new FOPException
                             ("Aargh! expectStartElement(events, list)");
                 // Flush the master event
-                xmlevents.getEndElement(ev);
+                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             } while (true);
         } catch (NoSuchElementException e) {

diff --git a/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java b/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java
index 59035e35887c82cdc0fc9c419db122a8739ae109..dbf29d4c35b221996bc0d2fbdcedbae21019ffac 100644 (file)
--- a/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java
+++ b/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java
@@ -214,7 +214,7 @@ public class FoPageSequenceMaster extends FONode {
                 } else
                     throw new FOPException
                             ("Aargh! expectStartElement(events, list)");
-                xmlevents.getEndElement(ev);
+                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             } while (true);
         } catch (NoSuchElementException e) {
@@ -304,7 +304,8 @@ public class FoPageSequenceMaster extends FONode {
                     //System.out.println
                     //    ("Found conditional-page-master-reference");
                     new FoConditionalPageMasterReference(foTree, this, ev);
-                    this.xmlevents.getEndElement(ev);
+                    ev = this.xmlevents.getEndElement
+                                            (this.xmlevents.DISCARD_EV, ev);
                     this.pool.surrenderEvent(ev);
                 } while (true);
             } catch (NoSuchElementException e) {

diff --git a/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java b/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java
index 67f76ad55ac073e5e293b01cb88909233a841a3c..74f046650870764903a5041fc9e48616cbafafb5 100644 (file)
--- a/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java
+++ b/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java
@@ -103,7 +103,7 @@ public class FoSimplePageMaster extends FONode {
                     + getMasterName());
         // Process region-body
         regionBody = new FoRegionBody(foTree, this, regionEv);
-        xmlevents.getEndElement(regionEv);
+        regionEv = xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
         pool.surrenderEvent(regionEv);
 
         // Remaining regions are optional
@@ -112,7 +112,8 @@ public class FoSimplePageMaster extends FONode {
                 != null)
         {
             regionBefore = new FoRegionBefore(foTree, this, regionEv);
-            xmlevents.getEndElement(regionEv);
+            regionEv =
+                xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
             pool.surrenderEvent(regionEv);
         }
 
@@ -121,7 +122,8 @@ public class FoSimplePageMaster extends FONode {
                 != null)
         {
             regionAfter = new FoRegionAfter(foTree, this, regionEv);
-            xmlevents.getEndElement(regionEv);
+            regionEv =
+                xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
             pool.surrenderEvent(regionEv);
         }
 
@@ -130,7 +132,8 @@ public class FoSimplePageMaster extends FONode {
                 != null)
         {
             regionStart = new FoRegionStart(foTree, this, regionEv);
-            xmlevents.getEndElement(regionEv);
+            regionEv =
+                xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
             pool.surrenderEvent(regionEv);
         }
 
@@ -139,7 +142,8 @@ public class FoSimplePageMaster extends FONode {
                 != null)
         {
             regionEnd = new FoRegionEnd(foTree, this, regionEv);
-            xmlevents.getEndElement(regionEv);
+            regionEv =
+                xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
             pool.surrenderEvent(regionEv);
         }