1.) Added restriction to fo:declarations that fo:color-profile is the only XSL namespace child element allowed.

2.) Switched from fo.FOTreeControl to apps.Document throughout app, to better clarify that it is the apps.Document object being accessed/used.


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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/java/org/apache/fop/fo/FObjMixed.java b/src/java/org/apache/fop/fo/FObjMixed.java
index 513294ad6..78831cade 100644
--- a/src/java/org/apache/fop/fo/FObjMixed.java
+++ b/src/java/org/apache/fop/fo/FObjMixed.java
@@ -46,8 +46,8 @@ public class FObjMixed extends FObj {
         if (textInfo == null) {
             // Really only need one of these, but need to get fontInfo
             // stored in propMgr for later use.
-            propMgr.setFontInfo(getFOTreeControl());
-            textInfo = propMgr.getTextLayoutProps(getFOTreeControl());
+            propMgr.setFontInfo(getDocument());
+            textInfo = propMgr.getTextLayoutProps(getDocument());
         }
 
         FOText ft = new FOText(data, start, length, textInfo, this);
@@ -55,7 +55,7 @@ public class FObjMixed extends FObj {
         ft.setName("text");
         
         /* characters() processing empty for FOTreeHandler, not empty for RTF & MIFHandlers */
-        getFOTreeControl().getFOInputHandler().characters(ft.ca, ft.startIndex, ft.endIndex);
+        getDocument().getFOInputHandler().characters(ft.ca, ft.startIndex, ft.endIndex);
 
         addChild(ft);
     }