summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-12-09 14:11:07 +0000
committerAndras Timar <andras.timar@collabora.com>2014-12-13 16:01:15 +0100
commit25f81e0448e2d7870403ec4389b705ef9a0b70ec (patch)
treed377378f495865391115fd601223a3dd97d88319 /basic
parent2957e15f5606e0b769d6d8dd21d82b478887b4ea (diff)
Resolves: fdo#86843 avoid getting deleted before finishing Broadcast
Change-Id: I19181f9e2fbd5f906e6e5d807b1b2483e7881cf0 (cherry picked from commit 19d0950451f909086c3732ce29812c4cda513908) Reviewed-on: https://gerrit.libreoffice.org/13420 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'basic')
-rw-r--r--basic/source/sbx/sbxvar.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index c0de91f74e40..88997cc91bac 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -166,6 +166,11 @@ void SbxVariable::Broadcast( sal_uIntPtr nHintId )
return;
}
}
+
+ //fdo#86843 Add a ref during the following block to guard against
+ //getting deleted before completing this method
+ SbxVariableRef aBroadcastGuard(this);
+
// Avoid further broadcasting
SfxBroadcaster* pSave = pCst;
pCst = NULL;