Bugzilla #37468:

Placement of flows in multi-column documents was wrong. The area tree is correct, however. Bug in AbstractRenderer. Simpler is sometimes better.

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

diff --git a/src/java/org/apache/fop/render/AbstractRenderer.java b/src/java/org/apache/fop/render/AbstractRenderer.java
index dc793611b549d0dfc4c1400add36ec3a6769c5fa..9180c626ed05af584ace5411d5dcc7d8a36d22be 100644 (file)
--- a/src/java/org/apache/fop/render/AbstractRenderer.java
+++ b/src/java/org/apache/fop/render/AbstractRenderer.java
@@ -379,9 +379,6 @@ public abstract class AbstractRenderer
         int saveSpanBPPos = saveBPPos;
         for (int count = 0; count < spans.size(); count++) {
             span = (Span) spans.get(count);
-            int offset = (mr.getWidth()
-                    - (mr.getColumnCount() - 1) * mr.getColumnGap())
-                    / mr.getColumnCount() + mr.getColumnGap();
             for (int c = 0; c < span.getColumnCount(); c++) {
                 NormalFlow flow = (NormalFlow) span.getNormalFlow(c);
 
@@ -389,7 +386,7 @@ public abstract class AbstractRenderer
                     currentBPPosition = saveSpanBPPos;
                     renderFlow(flow);
                     currentIPPosition += flow.getIPD();
-                    currentIPPosition += offset;
+                    currentIPPosition += mr.getColumnGap();
                 }
             }
             currentIPPosition = saveIPPos;