diff options
| -rw-r--r-- | xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java index bfd7fb3e8476..1523b9089585 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java @@ -490,11 +490,16 @@ public abstract class SxcDocumentDeserializer implements OfficeConstants, Debug.log(Debug.TRACE, "<tr>"); } + if (rowElement == null) { + //utterly busted + break; + } + // Get the column number of the current cell int newCol = decoder.getColNumber(); // Check to see if some columns were skipped - if (newCol != col && rowElement != null) { + if (newCol != col) { // How many columns have we skipped? int numColsSkipped = newCol - col; |