Removed no longer useful setCurrentColumnIndex method on ColumnNumberManager. The column number is now automatically updated in signalUsedColumnNumbers

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

2 files changed, 1 insertions, 13 deletions

diff --git a/src/java/org/apache/fop/fo/flow/ColumnNumberManager.java b/src/java/org/apache/fop/fo/flow/ColumnNumberManager.java
index bc31440ea..038a85706 100644
--- a/src/java/org/apache/fop/fo/flow/ColumnNumberManager.java
+++ b/src/java/org/apache/fop/fo/flow/ColumnNumberManager.java
@@ -59,6 +59,7 @@ public class ColumnNumberManager {
             usedColumnIndices.set(i);
         }
 
+        columnNumber = end + 1;
         while (usedColumnIndices.get(columnNumber - 1)) {
             columnNumber++;
         }
@@ -102,15 +103,4 @@ public class ColumnNumberManager {
         return usedColumnIndices.get(colNr - 1);
     }
 
-    /**
-     * Sets the current column index to a specific value
-     * (used by ColumnNumberPropertyMaker.make() in case the 
-     *  column-number was explicitly specified on the cell)
-     * 
-     * @param newIndex  the new column index
-     */
-    void setCurrentColumnIndex(int newIndex) {
-        columnNumber = newIndex;
-    }
-
 }
diff --git a/src/java/org/apache/fop/fo/flow/TableFObj.java b/src/java/org/apache/fop/fo/flow/TableFObj.java
index e00559d3e..68aaf2bf5 100644
--- a/src/java/org/apache/fop/fo/flow/TableFObj.java
+++ b/src/java/org/apache/fop/fo/flow/TableFObj.java
@@ -165,8 +165,6 @@ public abstract class TableFObj extends FObj {
                 }
             }
 
-            columnIndexManager.setCurrentColumnIndex(columnIndex);
-
             int colSpan = propertyList.get(Constants.PR_NUMBER_COLUMNS_SPANNED)
                                 .getNumeric().getValue();
             int i = -1;