summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-07-16 16:16:40 +0100
committerAndras Timar <andras.timar@collabora.com>2015-09-28 10:06:42 +0200
commit3775e7ae5d36e85a9cee17e519925084fc327815 (patch)
tree0fa2551f1ce63e4bbde1ab8a28ebfc9264fcd270
parent4939ae4c11ff79ae89320af97494edd919118db7 (diff)
coverity#1311944 Logically dead code
for the record its a SwFormatChg we get here at the crash time regression from commit 7de992bcc66c973bb6b247184cac38f01cd1104a Author: Caolán McNamara <caolanm@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: I290d6e633811423c3acc198aba7a60943518ec4a (cherry picked from commit 34c0b8869784cb44a516c97213ef24566a4ed111) Reviewed-on: https://gerrit.libreoffice.org/17138 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a9354ec39705da856ed46b3837bbff8a34317fe3)
-rw-r--r--sw/source/core/access/accnotextframe.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index f24eb0e70162..a72bb881d1f9 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -102,7 +102,7 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem
return; // probably was deleted - avoid doing anything
}
- if (nWhich != RES_TITLE_CHANGED || nWhich != RES_DESCRIPTION_CHANGED)
+ if (nWhich != RES_TITLE_CHANGED && nWhich != RES_DESCRIPTION_CHANGED)
return;
const SwNoTxtNode *pNd = GetNoTxtNode();