# HG changeset patch
# Parent 23574dd1e2de7a4ebb1348b00ae43e1761af672d
#i112657# do not crash when there are merged cells not started by \clmgf at the beginning of a row

diff -r 23574dd1e2de sw/source/filter/rtf/rtftbl.cxx
--- a/sw/source/filter/rtf/rtftbl.cxx	Thu Jun 24 09:29:05 2010 +0200
+++ b/sw/source/filter/rtf/rtftbl.cxx	Thu Jun 24 14:35:01 2010 +0200
@@ -288,7 +288,11 @@
 			break;
 
 		case RTF_CLMRG:
-			aMergeBoxes[ nBoxCnt ] = TRUE;
+            // would crash later on reading \cellx (#i112657#)
+            if (nBoxCnt != 0)
+            {
+                aMergeBoxes[ nBoxCnt ] = TRUE;
+            }
 			break;
 
 		case RTF_CELLX: