diff options
| author | Simon Steiner <ssteiner@apache.org> | 2023-02-23 14:04:16 +0000 |
|---|---|---|
| committer | Simon Steiner <ssteiner@apache.org> | 2023-02-23 14:04:16 +0000 |
| commit | f4205e68b07a965481f326515ba33f08490ebc0a (patch) | |
| tree | 6138223f2836aba597e2dbee9c688c642b512b97 /fop-core | |
| parent | 2eb52494850ddcd44150e259829e7ed1cfaacf09 (diff) | |
| download | xmlgraphics-fop-f4205e68b07a965481f326515ba33f08490ebc0a.tar.gz xmlgraphics-fop-f4205e68b07a965481f326515ba33f08490ebc0a.zip | |
FOP-3121: Table width may be too wide when layout width changes
Diffstat (limited to 'fop-core')
3 files changed, 3 insertions, 3 deletions
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java index ad51ba579..a887215f6 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java @@ -64,7 +64,7 @@ public class TableContentLayoutManager implements PercentBaseContext { private static final Log LOG = LogFactory.getLog(TableContentLayoutManager.class); private TableLayoutManager tableLM; - private TableRowIterator bodyIter; + protected TableRowIterator bodyIter; private TableRowIterator headerIter; private TableRowIterator footerIter; private LinkedList headerList; diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java index bb3ce4fbb..f1750b226 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java @@ -318,7 +318,7 @@ public class TableLayoutManager extends SpacedBorderedPaddedBlockLayoutManager } private boolean supportResize(FONode node) { - if (node instanceof AbstractGraphics) { + if (node instanceof AbstractGraphics || contentLM.bodyIter.rowIndex == 1) { return false; } FONode.FONodeIterator iterator = node.getChildNodes(); diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableRowIterator.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableRowIterator.java index 93985425b..19f39e2b4 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableRowIterator.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableRowIterator.java @@ -48,7 +48,7 @@ public class TableRowIterator { private Iterator rowGroupsIter; - private int rowIndex; + protected int rowIndex; /** * Creates a new TableRowIterator. |