[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sw/source

Bjoern Michaelsen (via logerrit) logerrit at kemper.freedesktop.org
Wed May 12 16:34:53 UTC 2021


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

New commits:
commit b129ce4426d460963ace6c9e69c4b44e2a3615c2
Author:     Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>
AuthorDate: Sun May 9 01:30:40 2021 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed May 12 18:34:22 2021 +0200

    tdf#141307: adapt null-check
    
    - if we check pNd for nullptr, we need to expect it to be nullptr
    - in that case we shouldnt use the pointer before the null check
    
    Change-Id: Ia9d11abe32fac10f36fdbfcefeadd51891f1834e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115264
    Tested-by: Jenkins
    Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>
    (cherry picked from commit b0ae5aaaafd236663f7e81af06a567ade8a2a745)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115287
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index 3dfed9ea3303..d8f37887b4a4 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -63,11 +63,11 @@ SwAccessibleNoTextFrame::SwAccessibleNoTextFrame(
     msDesc()
 {
     const SwNoTextNode* pNd = GetNoTextNode();
-    StartListening(const_cast<SwNoTextNode*>(pNd)->GetNotifier());
     // #i73249#
     // consider new attributes Title and Description
     if( pNd )
     {
+        StartListening(const_cast<SwNoTextNode*>(pNd)->GetNotifier());
         msTitle = pNd->GetTitle();
 
         msDesc = pNd->GetDescription();


More information about the Libreoffice-commits mailing list