svn commit: r656235 - in /xmlgraphics/fop/branches/Temp_AFPGOCAResources: ./ src/java/org/apache/fop/fo/FObjMixed.java test/layoutengine/standard-testcases/wrapper_block.xml

[acumiskey]

Author: acumiskey
Date: Wed May 14 03:55:24 2008
New Revision: 656235

URL: http://svn.apache.org/viewvc?rev=656235&view=rev
Log:
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.
........

Modified:
    xmlgraphics/fop/branches/Temp_AFPGOCAResources/   (props changed)
    
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FObjMixed.java
    
xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/standard-testcases/wrapper_block.xml

Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed May 14 03:55:24 2008
@@ -1 +1 @@
-/xmlgraphics/fop/trunk:1-655813
+/xmlgraphics/fop/trunk:1-656234

Modified: 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FObjMixed.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FObjMixed.java?rev=656235&r1=656234&r2=656235&view=diff
==============================================================================
--- 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FObjMixed.java
 (original)
+++ 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FObjMixed.java
 Wed May 14 03:55:24 2008
@@ -134,7 +134,8 @@
                     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.");
                     }

Modified: 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/standard-testcases/wrapper_block.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/standard-testcases/wrapper_block.xml?rev=656235&r1=656234&r2=656235&view=diff
==============================================================================
--- 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/standard-testcases/wrapper_block.xml
 (original)
+++ 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/standard-testcases/wrapper_block.xml
 Wed May 14 03:55:24 2008
@@ -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>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]