summaryrefslogtreecommitdiff
path: root/hwpfilter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2022-02-28 11:35:50 +0000
committerAndras Timar <andras.timar@collabora.com>2022-03-09 09:17:17 +0100
commit60e825017f4a95765dbfeb7fdeb95499d80aa291 (patch)
treef5f3f1217c0f0d390c2a9eb85084d80e487d0657 /hwpfilter
parent27c39ee60e888d8ef96be59ee117a3963eed4c8d (diff)
cid#1501377 Dereference after null check
Change-Id: I9dceb5c33f62df16b43429ba502b0d12180fa403 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130694 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f5f3eaa63f24093453af08ad01967ae17f108af2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130673 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'hwpfilter')
-rw-r--r--hwpfilter/source/hwpreader.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 83b764d102bd..1bd12242b436 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -2627,7 +2627,7 @@ void HwpReader::makeFStyle(FBoxStyle * fstyle)
padd( "style:border-line-width-bottom", sXML_CDATA, "0.02mm 0.35mm 0.02mm");
padd("fo:border-bottom", sXML_CDATA,"0.039cm double #808080");
}
- else if( fstyle->boxtype == 'G' )
+ else if( fstyle->boxtype == 'G' && fstyle->cell )
{
if( fstyle->margin[1][0] || fstyle->margin[1][1] || fstyle->margin[1][2] || fstyle->margin[1][3] ){
OUString clip = "rect(" +