diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-10-02 20:37:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-10-02 20:38:31 +0100 |
| commit | 9b738520316b329251a9f815751fda4e25d25937 (patch) | |
| tree | af110bcc1457c8d32e4b9d0aa8666dd88214f2bf /sc | |
| parent | ca69f1606e93810f5551fd3d4ccb75ab5615540d (diff) | |
xls: DefColWidth without pColRowBuff
Change-Id: I36f9439e417b380bd3f999c02c55c29337796002
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/unit/data/xls/pass/crash-2.xls | bin | 0 -> 4075 bytes | |||
| -rw-r--r-- | sc/source/filter/excel/impop.cxx | 6 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sc/qa/unit/data/xls/pass/crash-2.xls b/sc/qa/unit/data/xls/pass/crash-2.xls Binary files differnew file mode 100644 index 000000000000..99e485aeecc4 --- /dev/null +++ b/sc/qa/unit/data/xls/pass/crash-2.xls diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 4339ae40bca0..e252185456c1 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -662,6 +662,12 @@ void ImportExcel::DefColWidth() // stored as entire characters -> convert to 1/256 of characters (as in COLINFO) double fDefWidth = 256.0 * maStrm.ReaduInt16(); + if (!pColRowBuff) + { + SAL_WARN("sc", "*ImportExcel::DefColWidth(): pColRowBuff is NULL!"); + return; + } + // #i3006# additional space for default width - Excel adds space depending on font size long nFontHt = GetFontBuffer().GetAppFontData().mnHeight; fDefWidth += XclTools::GetXclDefColWidthCorrection( nFontHt ); |