diff options
| author | Adrian Cumiskey <acumiskey@apache.org> | 2008-05-14 10:55:24 +0000 |
|---|---|---|
| committer | Adrian Cumiskey <acumiskey@apache.org> | 2008-05-14 10:55:24 +0000 |
| commit | 2baad1404411d87dbf30c9f3debe56188787834a (patch) | |
| tree | 3a9ab1569a431892b192eedf0b82a2a165290112 | |
| parent | a3a8de868227ec7db6daae8e3018cfe750f527f7 (diff) | |
| download | xmlgraphics-fop-2baad1404411d87dbf30c9f3debe56188787834a.tar.gz xmlgraphics-fop-2baad1404411d87dbf30c9f3debe56188787834a.zip | |
Merged revisions 655829,656104 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
........
r655829 | adelmelle | 2008-05-13 13:19:03 +0100 (Tue, 13 May 2008) | 1 line
Check updated: wrapper now generates a Block, if descendant of an fo:block-container
........
r656104 | adelmelle | 2008-05-14 06:11:15 +0100 (Wed, 14 May 2008) | 1 line
Avoid error-message if the text-node is white-space only.
........
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@656235 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | src/java/org/apache/fop/fo/FObjMixed.java | 3 | ||||
| -rw-r--r-- | test/layoutengine/standard-testcases/wrapper_block.xml | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/fo/FObjMixed.java b/src/java/org/apache/fop/fo/FObjMixed.java index 698fc58f2..bf7383398 100644 --- a/src/java/org/apache/fop/fo/FObjMixed.java +++ b/src/java/org/apache/fop/fo/FObjMixed.java @@ -134,7 +134,8 @@ public abstract class FObjMixed extends FObj { if (foNameId == FO_BLOCK) { tmpText.createBlockPointers((org.apache.fop.fo.flow.Block) fo); ((FObjMixed) fo).lastFOTextProcessed = tmpText; - } else if (foNameId == FO_PAGE_SEQUENCE) { + } else if (foNameId == FO_PAGE_SEQUENCE + && tmpText.willCreateArea()) { log.error("Could not create block pointers." + " FOText w/o Block ancestor."); } diff --git a/test/layoutengine/standard-testcases/wrapper_block.xml b/test/layoutengine/standard-testcases/wrapper_block.xml index 295b7b968..490bab995 100644 --- a/test/layoutengine/standard-testcases/wrapper_block.xml +++ b/test/layoutengine/standard-testcases/wrapper_block.xml @@ -41,6 +41,7 @@ <checks> <!-- Just check if this really results in 1 line. --> <element-list category="breaker"> + <skip>2</skip> <box w="14400"/> <skip>3</skip> </element-list> |