PR:

Obtained from:
Submitted by:
Reviewed by:
1.)  Temporary commenting out of TableAttributesConverter code until
missing code checked in.

2.)  Code simplification of having AbstractLayoutManager call the fObj.AddLayoutManager()
directly.

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

diff --git a/src/java/org/apache/fop/area/AreaTreeHandler.java b/src/java/org/apache/fop/area/AreaTreeHandler.java
index 631ea44fb2bff9dff4fe80302690008d9bf4f95a..a835f991117b2e587d54e0be31c68cf92c2f3e4d 100644 (file)
--- a/src/java/org/apache/fop/area/AreaTreeHandler.java
+++ b/src/java/org/apache/fop/area/AreaTreeHandler.java
@@ -35,7 +35,6 @@ import org.apache.fop.apps.FOPException;
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.area.extensions.BookmarkData;
 import org.apache.fop.fo.FOEventHandler;
-import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.extensions.Outline;
 import org.apache.fop.fo.extensions.Bookmarks;
 import org.apache.fop.fo.pagination.PageSequence;
@@ -78,9 +77,6 @@ public class AreaTreeHandler extends FOEventHandler {
     // count of number of pages rendered
     private int pageCount;
 
-    /** The List object to which FO's should add Layout Managers */
-    protected List currentLMList;
-
     // AreaTreeModel in use
     private AreaTreeModel model;
 
@@ -338,16 +334,5 @@ public class AreaTreeHandler extends FOEventHandler {
             pageSequence.setCurrentPageNumber(pageSLM.getPageCount());
         }
     }
-
-    /**
-     *
-     * @param fobj the FObj object for which a layout manager should be created
-     * @param lmList the list to which the newly created layout manager(s)
-     * should be added
-     */
-    public void addLayoutManager(FObj fobj, List lmList) {
-        currentLMList = lmList;
-        fobj.addLayoutManager(currentLMList);
-    }
 }
 

diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
index 531914f13c4e9e9b7700d0a3d6ddc6d5a6bcf45c..0b8bfd230206a6d8f9f6102b86bf83bcf2e6064b 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
@@ -421,7 +421,7 @@ public abstract class AbstractLayoutManager implements LayoutManager, Constants
             Object theobj = fobjIter.next();
             if (theobj instanceof FObj) {
                 FObj fobj = (FObj) theobj;
-                areaTreeHandler.addLayoutManager(fobj, newLMs);
+                fobj.addLayoutManager(newLMs);
             }
         }
         return newLMs;

diff --git a/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java b/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java
index fc53ae854a8051cec882f2b0caf931c68c3a27e8..92d12f51f3868e559f30e224236597b2be12c4d4 100644 (file)
--- a/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java
+++ b/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java
@@ -118,7 +118,7 @@ public class TableAttributesConverter {
             }
 
         }
-        
+/*
         BorderAttributesConverter.makeBorder(propList, attrib, ITableAttributes.CELL_BORDER_TOP,
                 Constants.PR_BORDER_TOP_COLOR, 
                 Constants.PR_BORDER_TOP_STYLE, 
@@ -135,7 +135,7 @@ public class TableAttributesConverter {
                 Constants.PR_BORDER_RIGHT_COLOR, 
                 Constants.PR_BORDER_RIGHT_STYLE, 
                 Constants.PR_BORDER_RIGHT_WIDTH);
-
+*/
         int n = fobj.getProperty(Constants.PR_NUMBER_COLUMNS_SPANNED).getNumber().intValue();
         // Column spanning :
         if (n > 1) {
@@ -215,6 +215,7 @@ public class TableAttributesConverter {
          * place.
          */
         PropertyList propList = fobj.getPropertyList();
+/*
         BorderAttributesConverter.makeBorder(propList, attrib, ITableAttributes.CELL_BORDER_TOP,
                 Constants.PR_BORDER_TOP_COLOR, 
                 Constants.PR_BORDER_TOP_STYLE, 
@@ -231,6 +232,7 @@ public class TableAttributesConverter {
                 Constants.PR_BORDER_RIGHT_COLOR, 
                 Constants.PR_BORDER_RIGHT_STYLE, 
                 Constants.PR_BORDER_RIGHT_WIDTH);
+*/
 /*
         ep = (EnumProperty)fobj.getProperty(Constants.PR_BORDER_TOP_STYLE);
         if (ep != null && ep.getEnum() != Constants.NONE) {