Browse Source

fixes duplicate id on overflow bug


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193446 13f79535-47bb-0310-9956-ffa450edef68
tags/pre-columns
Jordan Naftolin 24 years ago
parent
commit
b5013344d5
1 changed files with 8 additions and 4 deletions
  1. 8
    4
      src/org/apache/fop/fo/flow/Block.java

+ 8
- 4
src/org/apache/fop/fo/flow/Block.java View File

@@ -90,6 +90,8 @@ public class Block extends FObjMixed {
int paddingLeft;
int paddingRight;
String id;
ColorType borderColor;
int borderWidth;
int borderStyle;
@@ -168,6 +170,9 @@ public class Block extends FObjMixed {
this.borderStyle =
this.properties.get("border-style").getEnum();
this.id =
this.properties.get("id").getString();
if (area instanceof BlockArea) {
area.end();
}
@@ -182,6 +187,8 @@ public class Block extends FObjMixed {
startIndent += bodyIndent + distanceBetweenStarts;
}

area.getIDReferences().createID(id,area);

this.marker = 0;

if (breakBefore == BreakBefore.PAGE) {
@@ -206,9 +213,7 @@ public class Block extends FObjMixed {
}
if ( marker==0 ) {
// initialize id
String id = this.properties.get("id").getString();
area.getIDReferences().initializeID(id,area);
area.getIDReferences().configureID(id,area);
}
this.blockArea =
@@ -225,7 +230,6 @@ public class Block extends FObjMixed {
blockArea.setBorderWidth(borderWidth, borderWidth, borderWidth, borderWidth);
blockArea.setBorderColor(borderColor, borderColor, borderColor, borderColor);
blockArea.start();
layoutStart(area); // performs

blockArea.setAbsoluteHeight(area.getAbsoluteHeight());
blockArea.setIDReferences(area.getIDReferences());

Loading…
Cancel
Save