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-08-03 19:50:52 +0200
commitf76427a06817b5a30b675f0d2f6e35ca654f2579 (patch)
treec080a887effc6340e466ad6bd9c7dff6f015bada
parent6541380093f9d3cb8060f082fe218b0ef9321246 (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>
-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 8d06a70be622..e6a4b3b9efa2 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();