diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-05-19 22:03:18 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-05-19 22:24:07 +0200 |
| commit | 838c580fdba8b1c72bc854d101d302be0e3861d5 (patch) | |
| tree | bf01c436c96807280c75fe0f825c327e8d90aad0 /sfx2/source/inc | |
| parent | 2fc4f5cd750cc3899ffc6b2f831edcb01e7773b4 (diff) | |
fdo#78536: sfx2: template dialog: make the am-i-dead-yet check reentrant
In the fine tradition of our enterprise-grade code base, this lets the
check in SfxCommonTemplateDialog_Impl::Execute_Impl() do an early
return if the "this" instance has signalled its untimely demise even if
there are multiple calls of Execute_Impl() on the stack; extending
the scheme with further epicycles to make it work if the Execute_Impl()
calls happen on 2 different threads is left as an exercise for the
interested reader.
(regression from bcc52fb2ebdf77a1cc089857775fd742085b45b6)
Change-Id: I1d9f0d82bf6d9f5da8f9bd2be57d01937d71fd26
Diffstat (limited to 'sfx2/source/inc')
| -rw-r--r-- | sfx2/source/inc/templdgi.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 3a3495338f8a..d313a6bc44ea 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -155,7 +155,7 @@ private: void ReadResource(); void ClearResource(); void impl_clear(); - void impl_setDeletionWatcher(DeletionWatcher* pNewWatcher); + DeletionWatcher * impl_setDeletionWatcher(DeletionWatcher* pNewWatcher); protected: #define MAX_FAMILIES 5 |