diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-10-04 08:23:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-10-04 08:25:07 +0100 |
| commit | a28f5f963d16e6355aadd2f27c3348e7679e785b (patch) | |
| tree | c2519166a1b5b0e126c2fe1e5b49160697d74398 /sc | |
| parent | e3f8eb8d3a594e3b8afa51c214f6c5c44d8dde4e (diff) | |
crash in Standardwidth
Change-Id: I9b781aaf98c16c83e12406ee38167814fb32cfc9
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/unit/data/xls/pass/crash-6.xls | bin | 0 -> 4108 bytes | |||
| -rw-r--r-- | sc/source/filter/excel/impop.cxx | 5 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sc/qa/unit/data/xls/pass/crash-6.xls b/sc/qa/unit/data/xls/pass/crash-6.xls Binary files differnew file mode 100644 index 000000000000..19544baf7a69 --- /dev/null +++ b/sc/qa/unit/data/xls/pass/crash-6.xls diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index cc3c312b010e..904209d2bb1b 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -815,6 +815,11 @@ void ImportExcel::Hideobj() void ImportExcel::Standardwidth() { sal_uInt16 nScWidth = XclTools::GetScColumnWidth( maStrm.ReaduInt16(), GetCharWidth() ); + if (!pColRowBuff) + { + SAL_WARN("sc", "*ImportExcel::Standardwidth(): pColRowBuff is NULL!"); + return; + } pColRowBuff->SetDefWidth( nScWidth, true ); } |