diff options
| author | Michael Stahl <mst@openoffice.org> | 2010-07-01 17:28:42 +0200 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2010-07-01 17:28:42 +0200 |
| commit | 86209cb3324b4b30bc773a81b1ac03829bba253f (patch) | |
| tree | 2f673e92849506ef6246f61104489502f7bbecdd /sw | |
| parent | 866497af8cba12f5eac55da7ffec5b95058772a4 (diff) | |
sw33bf06: #i112657#: apply patch by dtardon: do not crash when there are
merged cells not started by \clmgf at the beginning of a row
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/rtf/rtftbl.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sw/source/filter/rtf/rtftbl.cxx b/sw/source/filter/rtf/rtftbl.cxx index a2572006a290..2c182532079d 100644 --- a/sw/source/filter/rtf/rtftbl.cxx +++ b/sw/source/filter/rtf/rtftbl.cxx @@ -288,7 +288,12 @@ void SwRTFParser::ReadTable( int nToken ) break; case RTF_CLMRG: - aMergeBoxes[ nBoxCnt ] = TRUE; + // would crash later on reading \cellx (#i112657#): + // the first cell cannot be merged with earlier ones. + if (nBoxCnt != 0) + { + aMergeBoxes[ nBoxCnt ] = TRUE; + } break; case RTF_CELLX: |