summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java4
1 files changed, 2 insertions, 2 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 9d6ddbc6ee1a..bfd7fb3e8476 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
@@ -494,7 +494,7 @@ public abstract class SxcDocumentDeserializer implements OfficeConstants,
int newCol = decoder.getColNumber();
// Check to see if some columns were skipped
- if (newCol != col) {
+ if (newCol != col && rowElement != null) {
// How many columns have we skipped?
int numColsSkipped = newCol - col;
@@ -738,4 +738,4 @@ public abstract class SxcDocumentDeserializer implements OfficeConstants,
}
}
}
-} \ No newline at end of file
+}