sc/qa/unit/data/xls/pass/crash-2.xls |binary
sc/source/filter/excel/impop.cxx | 6 ++++++
2 files changed, 6 insertions(+)
New commits:
commit cf54f3a3e2afa313cadb7c83934c9d8a1470e287
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Oct 2 20:37:14 2015 +0100
xls: DefColWidth without pColRowBuff
Change-Id: I36f9439e417b380bd3f999c02c55c29337796002
(cherry picked from commit 9b738520316b329251a9f815751fda4e25d25937)
Reviewed-on: https://gerrit.libreoffice.org/19103
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/sc/qa/unit/data/xls/pass/crash-2.xls
b/sc/qa/unit/data/xls/pass/crash-2.xls
new file mode 100644
index 0000000..99e485a
Binary files /dev/null and b/sc/qa/unit/data/xls/pass/crash-2.xls differ
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index a08bd14..34dc2c9 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -660,6 +660,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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
