From: Jeremias Maerki <jeremias@apache.org>
Date: Fri, 23 Dec 2005 23:33:38 +0000 (+0000)
Subject: Merge from Branch fop-0_91:
X-Git-Tag: fop-0_92-beta~262
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=524072a37ebd4028604461ea76351cb16a1bcf5a;p=xmlgraphics-fop.git

Merge from Branch fop-0_91:
Relaxed validation for empty static-content for compatibility with 0.20.5.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@358884 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/java/org/apache/fop/fo/pagination/StaticContent.java b/src/java/org/apache/fop/fo/pagination/StaticContent.java
index 5278db92b..3c9841725 100644
--- a/src/java/org/apache/fop/fo/pagination/StaticContent.java
+++ b/src/java/org/apache/fop/fo/pagination/StaticContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ public class StaticContent extends Flow {
      * @see org.apache.fop.fo.FONode#endOfNode
      */
     protected void endOfNode() throws FOPException {
-        if (childNodes == null) {
+        if (childNodes == null && getUserAgent().validateStrictly()) {
             missingChildElementError("(%block;)+");
         }
         getFOEventHandler().endFlow(this);