fix ArrayIndexOutOfBoundsException

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1149617 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sergey Vladimirov 2011-07-22 14:28:54 +00:00
parent 94fbeaa50a
commit bffd3722a2
1 changed files with 5 additions and 1 deletions

View File

@ -132,7 +132,11 @@ public abstract class AbstractWordConverter
TableCell upperCell = null; TableCell upperCell = null;
for ( int r1 = r - 1; r1 >= 0; r1-- ) for ( int r1 = r - 1; r1 >= 0; r1-- )
{ {
final TableCell prevCell = table.getRow( r1 ).getCell( c ); final TableRow row = table.getRow( r1 );
if ( row == null || c >= row.numCells() )
continue;
final TableCell prevCell = row.getCell( c );
if ( prevCell != null && prevCell.isFirstVerticallyMerged() ) if ( prevCell != null && prevCell.isFirstVerticallyMerged() )
{ {
upperCell = prevCell; upperCell = prevCell;