summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2015-08-12 20:15:08 +0200
committerEike Rathke <erack@redhat.com>2015-08-12 20:21:50 +0200
commit2d4edd7de2e67db5bd17e7a89e2496611ebcc165 (patch)
treeefe365bbca05c9ecdc5767a4551c7c54ea4a2a22
parent7ffe6aebb44ed3f7b5fd1ffe3ccfccf0f61984b3 (diff)
Resolves: tdf#93388 broadcasting to removed listeners isn't a good idea
This cures only a symptom, the underlying cause is that the broadcasters still are listed in maBulkGroupAreas. Change-Id: I9625483016a51eb6f6a7e3d58ed42c7dad3a57b3
-rw-r--r--sc/source/core/data/bcaslot.cxx20
1 files changed, 15 insertions, 5 deletions
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 2174216834e1..f9d6a19518e8 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -1155,12 +1155,22 @@ void ScBroadcastAreaSlotMachine::BulkBroadcastGroupAreas()
for (; it != itEnd; ++it)
{
ScBroadcastArea* pArea = it->first;
- const sc::ColumnSpanSet* pSpans = it->second;
assert(pArea);
- assert(pSpans);
- aHint.setSpans(pSpans);
- pArea->GetBroadcaster().Broadcast(aHint);
- bBroadcasted = true;
+ SvtBroadcaster& rBC = pArea->GetBroadcaster();
+ if (!rBC.HasListeners())
+ {
+ /* FIXME: find the cause where the last listener is removed and
+ * this area is still listed here. */
+ SAL_WARN("sc.core","ScBroadcastAreaSlotMachine::BulkBroadcastGroupAreas - pArea has no listeners and should had been removed already");
+ }
+ else
+ {
+ const sc::ColumnSpanSet* pSpans = it->second;
+ assert(pSpans);
+ aHint.setSpans(pSpans);
+ rBC.Broadcast(aHint);
+ bBroadcasted = true;
+ }
}
maBulkGroupAreas.clear();