diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2018-10-06 12:31:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-06 13:27:42 +0200 |
| commit | 97dac306e6b4c26f67307e6b3bb0c2b2b470a09a (patch) | |
| tree | 9fbaafae934ed92da498d322f7ccd6677362972f /include/svl | |
| parent | 792f85dcc45951a05027d082ce5ac1aef103f453 (diff) | |
try to fix SvtBroadcaster on macOS
this reverts
commit a20ec3b5cd691ae18f0d87d045673ce3a06579c6
fix iterator invalidation assert
and
commit 4a290888580474f9542f185091bb2a6fcf4e9a53
SvtBroadcaster unify the normal and PrepareForDestruction paths
no idea what is going on, I suspect that std::vector is re-allocating
its data buffer despite having called reserve()
Change-Id: I681ae5fca4578240a2a0dc0af51ff06d919f9099
Reviewed-on: https://gerrit.libreoffice.org/61464
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svl')
| -rw-r--r-- | include/svl/broadcast.hxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/svl/broadcast.hxx b/include/svl/broadcast.hxx index 27181e03294e..b4c8be5f9ac0 100644 --- a/include/svl/broadcast.hxx +++ b/include/svl/broadcast.hxx @@ -82,6 +82,7 @@ private: /// Indicate that this broadcaster will be destructed (we indicate this on all ScColumn's broadcasters during the ScTable destruction, eg.) bool mbAboutToDie:1; + bool mbDisposing:1; mutable bool mbNormalized:1; mutable bool mbDestNormalized:1; }; |