chrisg 02/02/17 11:53:36
Modified: src/org/apache/fop/datatypes Tag: fop-0_20_2-maintain
LinearCombinationLength.java
src/org/apache/fop/fo/expr Tag: fop-0_20_2-maintain
LabelEndFunction.java
Log:
make sure label-end() value gets calculated
(fix for bug #6094, endless loop while processing list-item-label))
Revision Changes Path
No revision
No revision
1.3.2.1 +2 -2
xml-fop/src/org/apache/fop/datatypes/LinearCombinationLength.java
Index: LinearCombinationLength.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datatypes/LinearCombinationLength.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- LinearCombinationLength.java 14 Oct 2001 20:33:36 -0000 1.3
+++ LinearCombinationLength.java 17 Feb 2002 19:53:36 -0000 1.3.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: LinearCombinationLength.java,v 1.3 2001/10/14 20:33:36 klease Exp $
+ * $Id: LinearCombinationLength.java,v 1.3.2.1 2002/02/17 19:53:36 chrisg Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -27,7 +27,7 @@
/**
* Return the computed value in millipoints.
*/
- protected void computeValue() {
+ public void computeValue() {
int result = 0;
int numFactors = factors.size();
for (int i = 0; i < numFactors; ++i) {
No revision
No revision
1.2.2.1 +4 -1 xml-fop/src/org/apache/fop/fo/expr/LabelEndFunction.java
Index: LabelEndFunction.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/expr/LabelEndFunction.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- LabelEndFunction.java 30 Jul 2001 20:29:21 -0000 1.2
+++ LabelEndFunction.java 17 Feb 2002 19:53:36 -0000 1.2.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: LabelEndFunction.java,v 1.2 2001/07/30 20:29:21 tore Exp $
+ * $Id: LabelEndFunction.java,v 1.2.2.1 2002/02/17 19:53:36 chrisg Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -47,6 +47,9 @@
labelEnd.addTerm(-1.0, distance);
labelEnd.addTerm(-1.0, startIndent);
labelEnd.addTerm(1.0, separation);
+
+ // make sure value gets calculated
+ labelEnd.computeValue();
return new LengthProperty(labelEnd);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
