[FOP-1911] Incorrect refactoring in src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java (r1069154)

• Type: Bug
• Status: Closed
• Resolution: Fixed
• Affects Version/s: 2.5
• Component/s: layout/unqualified
• Environment: Operating System: All; Platform: PC
• External issue ID: 50965
• Assignee: fop-dev
• Reporter: Martin K
• Created: 24/Mar/11 07:21
• Updated: 18/Dec/12 17:00
• Resolved: 01/Apr/12 06:18

Description

r1069154 refactored some code to the function BlockContainerLayoutManager.setupAreaDimensions()

contentRectOffsetX and contentRectOffsetY are now only initialised to 0, when the class is instantiated. The previous version did this for every execution of this code.
As setupAreaDimensions() can be executed multiple times, this yields to layout errors.

— a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
@@ -346,6 +346,8 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager
updateContentAreaIPDwithOverconstrainedAdjust(contentWidth);
}

+ contentRectOffsetX = 0;
+ contentRectOffsetY = 0;
contentRectOffsetX += fo.getCommonMarginBlock().startIndent.getValue(this);
contentRectOffsetY += fo.getCommonBorderPaddingBackground().getBorderBeforeWidth(false);
contentRectOffsetY += fo.getCommonBorderPaddingBackground().getPaddingBefore(false, this);