diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-10-03 11:48:14 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-10-17 23:22:49 +0200 |
| commit | a06be488f4fff3e52c25f60c71997a0dc9268b8c (patch) | |
| tree | 76a6cb93ea1f1526d53c1cb37eaee92d2a8504ae /sc | |
| parent | 2695aa8c3ca1b1aa2007b6592a814dd19c83f587 (diff) | |
xls: Defrowheight345 without pColRowBuff
Change-Id: I22be90d7c54b1118f81337bd9e1d97ba3a1fd86e
(cherry picked from commit 4eb26f9cae2aacc8d672884283460e86e5c331ca)
Reviewed-on: https://gerrit.libreoffice.org/19109
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit ce321f45840fb7e34e823af511221faafc6ef200)
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/unit/data/xls/pass/crash-3.xls | bin | 0 -> 4075 bytes | |||
| -rw-r--r-- | sc/source/filter/excel/impop.cxx | 7 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sc/qa/unit/data/xls/pass/crash-3.xls b/sc/qa/unit/data/xls/pass/crash-3.xls Binary files differnew file mode 100644 index 000000000000..99e485aeecc4 --- /dev/null +++ b/sc/qa/unit/data/xls/pass/crash-3.xls diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index c48244d04aa5..0c5614faa613 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -1053,6 +1053,13 @@ void ImportExcel::Defrowheight345() sal_uInt16 nFlags, nDefHeight; nFlags = maStrm.ReaduInt16(); nDefHeight = maStrm.ReaduInt16(); + + if (!pColRowBuff) + { + SAL_WARN("sc", "*ImportExcel::Defrowheight345(): pColRowBuff is NULL!"); + return; + } + pColRowBuff->SetDefHeight( nDefHeight, nFlags ); } |