You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2005/06/26 18:47:56 UTC

svn commit: r201873 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop/fo: FObj.java flow/Block.java flow/BlockContainer.java

Author: jeremias
Date: Sun Jun 26 09:47:55 2005
New Revision: 201873

URL: http://svn.apache.org/viewcvs?rev=201873&view=rev
Log:
Revert revsision 201627.

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java?rev=201873&r1=201872&r2=201873&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java Sun Jun 26 09:47:55 2005
@@ -147,21 +147,6 @@
         }
     }
 
-     /**
-      * Checks the block-level FO for correct use of the span attribute.
-      * Used by fo:block and fo:block-container.
-      * @param pList the property list to determine if the span is explicit
-      */
-     protected void checkSpanProperty(PropertyList pList) {
-         if (pList.getExplicit(PR_SPAN) != null) {
-             if (!(getParent() instanceof Flow)) {
-                 attributeWarning("Ignoring span attribute on " + getName() 
-                         + " as it's not a direct child of an fo:flow."
-                         + " (see XSL 1.0, 7.20.4)");
-             }
-         }
-     }
-     
     /**
      * Returns Out Of Line FO Descendant indicator.
      * @return true if Out of Line FO or Out Of Line descendant, false otherwise

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java?rev=201873&r1=201872&r2=201873&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java Sun Jun 26 09:47:55 2005
@@ -160,8 +160,6 @@
         whiteSpaceCollapse = pList.get(PR_WHITE_SPACE_COLLAPSE).getEnum();
         widows = pList.get(PR_WIDOWS).getNumeric();
         wrapOption = pList.get(PR_WRAP_OPTION).getEnum();
-     
-        checkSpanProperty(pList);
     }
 
     /**

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java?rev=201873&r1=201872&r2=201873&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java Sun Jun 26 09:47:55 2005
@@ -96,8 +96,6 @@
         width = pList.get(PR_WIDTH).getLength();
         writingMode = pList.get(PR_WRITING_MODE).getEnum();
         zIndex = pList.get(PR_Z_INDEX).getNumeric();
-        
-        checkSpanProperty(pList);
     }
 
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org