hwpfilter/source/hwpreader.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a728f0e8dc19a090f19af7b9e1d416f065ae6095
Author:     Caolán McNamara <[email protected]>
AuthorDate: Mon Feb 28 11:35:50 2022 +0000
Commit:     Michael Stahl <[email protected]>
CommitDate: Tue Mar 1 18:37:53 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 <[email protected]>
    (cherry picked from commit f5f3eaa63f24093453af08ad01967ae17f108af2)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130673
    Reviewed-by: Michael Stahl <[email protected]>

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(" +

Reply via email to