summaryrefslogtreecommitdiff
path: root/sc/source/filter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-10-02 20:37:14 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-10-02 20:38:31 +0100
commit9b738520316b329251a9f815751fda4e25d25937 (patch)
treeaf110bcc1457c8d32e4b9d0aa8666dd88214f2bf /sc/source/filter
parentca69f1606e93810f5551fd3d4ccb75ab5615540d (diff)
xls: DefColWidth without pColRowBuff
Change-Id: I36f9439e417b380bd3f999c02c55c29337796002
Diffstat (limited to 'sc/source/filter')
-rw-r--r--sc/source/filter/excel/impop.cxx6
1 files changed, 6 insertions, 0 deletions
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 );