From 0afa75a21f0625ad1668c009f047599f3ede95c0 Mon Sep 17 00:00:00 2001 From: Peter Bernard West Date: Sun, 15 Sep 2002 05:00:54 +0000 Subject: [PATCH] Removed COMPOUND_INH inheritance type. inheritance() commented out.First attempt at 'inherit' resolution changed. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@195181 13f79535-47bb-0310-9956-ffa450edef68 --- src/org/apache/fop/fo/Properties.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/org/apache/fop/fo/Properties.java b/src/org/apache/fop/fo/Properties.java index 5472aa620..4309d8f61 100644 --- a/src/org/apache/fop/fo/Properties.java +++ b/src/org/apache/fop/fo/Properties.java @@ -271,8 +271,7 @@ public abstract class Properties { NO = 0 ,COMPUTED = 1 ,SPECIFIED = 2 - ,COMPOUND_INH = 3 - ,VALUE_SPECIFIC = 4 + ,VALUE_SPECIFIC = 3 ; /** @@ -285,12 +284,15 @@ public abstract class Properties { * specified value. * @exception PropertyException */ + /* public static PropertyValue inheritance(FOTree foTree, int property) throws PropertyException { - // Is it inherited? + // Is it inherited? This question is not asked here. Should it be + // determined in here or outside? return foTree.getCurrentInherited(property); } + */ /** Constant for nested refineParsing methods. */ public static boolean IS_NESTED = true; @@ -4383,7 +4385,7 @@ public abstract class Properties { // First, check that we have a list if (type != PropertyValue.LIST) { if ( ! nested && type == PropertyValue.INHERIT) { - return foTree.resolveInheritValue((Inherit)value); + return ((Inherit)value).resolve(foTree); } if ( ! (value instanceof StringType)) throw new PropertyException -- 2.39.5