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

Jochen Nitschke j.nitschke+logerrit at ok.de
Tue May 1 07:16:35 UTC 2018


 forms/source/richtext/rtattributes.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit af94177d64828d227fd4008ec797378715282192
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Sun Apr 29 23:35:51 2018 +0200

    improve AttributeState compare operator
    
    guess this was the original intention, else the nullptr checks
    would be pointless
    
    Change-Id: Ifb41b125c6d297c76c1d1b5c06c8f9f127b8e613
    Reviewed-on: https://gerrit.libreoffice.org/53644
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/forms/source/richtext/rtattributes.hxx b/forms/source/richtext/rtattributes.hxx
index a47c5e22abd3..6f79286f653f 100644
--- a/forms/source/richtext/rtattributes.hxx
+++ b/forms/source/richtext/rtattributes.hxx
@@ -115,10 +115,10 @@ namespace frm
         if ( !pItemHandleItem && _rRHS.pItemHandleItem )
             return false;
 
-        if ( !pItemHandleItem && !_rRHS.pItemHandleItem )
+        if ( pItemHandleItem == _rRHS.pItemHandleItem )
             return true;
 
-        return pItemHandleItem == _rRHS.pItemHandleItem;
+        return *pItemHandleItem == *_rRHS.pItemHandleItem;
     }
 
     class IMultiAttributeDispatcher


More information about the Libreoffice-commits mailing list