[Libreoffice-commits] core.git: writerfilter/source

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Fri Apr 3 16:55:16 UTC 2020


 writerfilter/source/dmapper/StyleSheetTable.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a9a397eeece146b1ea8e12be50685313ea1f14d8
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Apr 3 14:21:17 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Apr 3 18:54:39 2020 +0200

    fix wrong variable checked in AddTblStylePr
    
    regression from
        commit 4c3ba3a413be7339115ea5e6edc825a8434cd345
        Date:   Sat Jul 26 17:17:27 2014 +0100
        fdo#75757: Remove inheritance from std::map.
    found by my new unusedvariableplus loplugin
    
    Change-Id: Ica9a3ade207698ac7af76e010fbb9e6bdd0dc227
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91631
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index f3dfe000c55b..864149a66cb4 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -118,7 +118,7 @@ void TableStyleSheetEntry::AddTblStylePr( TblStyleType nType, const PropertyMapP
             PropertyIds nInsideProp = ( i < 2 ) ? META_PROP_HORIZONTAL_BORDER : META_PROP_VERTICAL_BORDER;
             std::optional<PropertyMap::Property> pInside = pProps->getProperty(nInsideProp);
 
-            if ( pChecked && pProps )
+            if ( pChecked && pInside )
             {
                 // In this case, remove the inside border
                 pProps->Erase( nInsideProp );


More information about the Libreoffice-commits mailing list