hwpfilter/source/hwpreader.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 69ac100f537c33de80ed451288120028b0914e94
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Feb 28 11:35:50 2022 +0000
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Mar 1 18:37:41 2022 +0100
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 <caol...@redhat.com>
(cherry picked from commit f5f3eaa63f24093453af08ad01967ae17f108af2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130674
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index b27307b6ca18..88c9ada95e2c 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -2628,7 +2628,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(" +
