diff options
| author | Roman Kennke <roman@kennke.org> | 2006-12-06 19:50:42 +0000 |
|---|---|---|
| committer | Roman Kennke <roman@kennke.org> | 2006-12-06 19:50:42 +0000 |
| commit | 2e21cb7ecb218c092104350ee510f17265ba12bc (patch) | |
| tree | ac86205e9f370bae76e2f8a560e8a4d851cf658b | |
| parent | d5425275a1d00836416906578b76ceba3d35ecae (diff) | |
| download | classpath-2e21cb7ecb218c092104350ee510f17265ba12bc.tar.gz | |
2006-12-06 Roman Kennke <kennke@aicas.com>
* javax/swing/text/html/TableView.java
(RowView.layoutMajorAxis): Check column index for invalid value.
(updateGrid): Check column index for invalid value.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | javax/swing/text/html/TableView.java | 10 |
2 files changed, 14 insertions, 2 deletions
@@ -1,5 +1,11 @@ 2006-12-06 Roman Kennke <kennke@aicas.com> + * javax/swing/text/html/TableView.java + (RowView.layoutMajorAxis): Check column index for invalid value. + (updateGrid): Check column index for invalid value. + +2006-12-06 Roman Kennke <kennke@aicas.com> + * javax/swing/text/html/BlockView.java (getAlignment): Align blocks horizontally by the superclass. * javax/swing/text/html/HTMLEditorKit.java diff --git a/javax/swing/text/html/TableView.java b/javax/swing/text/html/TableView.java index 0885e6372..f87d7b35f 100644 --- a/javax/swing/text/html/TableView.java +++ b/javax/swing/text/html/TableView.java @@ -183,9 +183,10 @@ class TableView updateGrid(); int numCols = offsets.length; int realColumn = 0; + int colCount = getViewCount(); for (int i = 0; i < numColumns;) { - if (! overlap[i]) + if (! overlap[i] && realColumn < colCount) { View v = getView(realColumn); if (v instanceof CellView) @@ -785,6 +786,7 @@ class TableView rowView.rowIndex = r; rowView.overlap = new boolean[maxColumns]; int colIndex = 0; + int colCount = rowView.getViewCount(); for (int c = 0; c < maxColumns;) { if (rowSpans[c] > 0) @@ -793,7 +795,7 @@ class TableView rowView.overlap[c] = true; c++; } - else + else if (colIndex < colCount) { View v = rowView.getView(colIndex); colIndex++; @@ -816,6 +818,10 @@ class TableView } } } + else + { + c++; + } } } } |