bckfnn 2004/10/25 07:57:59
Modified: src/java/org/apache/fop/render/rtf/rtflib/rtfdoc
BorderAttributesConverter.java
src/java/org/apache/fop/fo/flow Leader.java
Log:
Cleanup after PR 31699.
Revision Changes Path
1.5 +3 -19
xml-fop/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/BorderAttributesConverter.java
Index: BorderAttributesConverter.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/BorderAttributesConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BorderAttributesConverter.java 20 Oct 2004 17:53:36 -0000 1.4
+++ BorderAttributesConverter.java 25 Oct 2004 14:57:58 -0000 1.5
@@ -27,7 +27,6 @@
package org.apache.fop.render.rtf.rtflib.rtfdoc;
import org.apache.fop.fo.Constants;
-import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.render.rtf.FOPRtfAttributes;
@@ -112,26 +111,11 @@
/**
* Create a border control word in attributes, with border properties
* as specified in color, style and width.
- * @param propList The property list to get properties from.
+ * @param border The CommonBorderPaddingBackground object.
+ * @param side The START, END, BEFORE, AFTER enum from
CommonBorderPaddingBackground.
* @param attributes The attributes list to set the border control word.
* @param controlWord The border control word.
- * @param color The PR_BORDER_X_COLOR constants for the color,
- * @param style The PR_BORDER_X_STYLE constants for the border style.
- * @param width The PR_BORDER_X_WIDTH constants for the width.
*/
- public static void makeBorder(PropertyList propList,
- RtfAttributes attributes, String controlWord,
- int color, int style, int width) {
- int styleEnum = propList.get(style).getEnum();
- if (styleEnum != Constants.NONE) {
- FOPRtfAttributes attrs = new FOPRtfAttributes();
- attrs.set(BORDER_COLOR, propList.get(color).getColorType());
- attrs.set(convertAttributetoRtf(styleEnum));
- attrs.set(BORDER_WIDTH, propList.get(width).getLength());
- attributes.set(controlWord, attrs);
- }
- }
-
public static void makeBorder(CommonBorderPaddingBackground border, int side,
RtfAttributes attributes, String controlWord) {
int styleEnum = border.getBorderStyle(side);
1.44 +1 -15 xml-fop/src/java/org/apache/fop/fo/flow/Leader.java
Index: Leader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Leader.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Leader.java 20 Oct 2004 21:07:01 -0000 1.43
+++ Leader.java 25 Oct 2004 14:57:59 -0000 1.44
@@ -39,7 +39,6 @@
import org.apache.fop.fo.properties.KeepProperty;
import org.apache.fop.fo.properties.LengthRangeProperty;
import org.apache.fop.fo.properties.SpaceProperty;
-import org.apache.fop.fo.properties.PercentLength;
import org.apache.fop.layoutmgr.LeaderLayoutManager;
/**
@@ -140,20 +139,7 @@
protected void startOfNode() throws SAXParseException {
checkId(id);
}
-
- /**
- * @todo check need for each of these accessors (should be LM instead?)
- */
- public int getLength(Length maxlength, int dim) {
- int length;
- if (maxlength instanceof PercentLength) {
- length = (int)(((PercentLength)maxlength).value() * dim);
- } else {
- length = maxlength.getValue();
- }
- return length;
- }
-
+
/**
* Return the Common Font Properties.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
