[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source

[Caolán McNamara]

 sw/source/core/access/accnotextframe.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit c7d2270f86b2bd1f3c764d8461a40c903780ee56
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 13 12:38:18 2015 +0100

    fix a11y crash seen on close of tdf#92573
    
    its not the reported crash, which has "gone away" which might
    be a duplicate of tdf#90502
    
    the switch only handled RES_TITLE_CHANGED and RES_DESCRIPTION_CHANGED so if its
    anything else, e.g. OBJ_DYING, then don't attempt GetNoTextNode
    
    Change-Id: I642beb66613481cbc7ee18647f0204a67d670a84
    (cherry picked from commit 7de992bcc66c973bb6b247184cac38f01cd1104a)
    Reviewed-on: https://gerrit.libreoffice.org/16989
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index cee5edb..bcf5031 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -102,6 +102,9 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem
             return; // probably was deleted - avoid doing anything
     }
 
+    if (nWhich != RES_TITLE_CHANGED || nWhich != RES_DESCRIPTION_CHANGED)
+        return;
+
     const SwNoTextNode *pNd = GetNoTextNode();
     OSL_ENSURE( pNd == aDepend.GetRegisteredIn(), "invalid frame" );
     switch( nWhich )