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

Stephan Bergmann sbergman at redhat.com
Thu Jul 3 13:35:16 PDT 2014


 sw/source/core/layout/ftnfrm.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 40194dc12fd93720c3bea0b3ae2bba54d0b7a82f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jul 3 22:34:24 2014 +0200

    error: reference cannot be bound to dereferenced null pointer
    
    ...and SwTxtAttr::GetAttr already asserts non-null-ness.
    
    Change-Id: I978f86103e8121e41bf95a2a79cd2263d6e47853

diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 88157cc..32f05de 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -479,7 +479,7 @@ SwTwips SwFtnFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
     if( nNum != USHRT_MAX )
     {
         SwTxtFtn* pTxtFtn = GetAttr();
-        if( &pTxtFtn->GetAttr() && pTxtFtn->GetFtn().GetNumber() == nNum )
+        if( pTxtFtn->GetFtn().GetNumber() == nNum )
         {
             int bla = 5;
             (void)bla;


More information about the Libreoffice-commits mailing list