diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-09-29 14:28:08 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-09-29 14:36:14 +0200 |
| commit | 7aa6009a7f7132c80db7bcc4e8291ba4a3296ae5 (patch) | |
| tree | adf8d6f4edc25fae20b5d0afe579749823c5cac6 /sd | |
| parent | d3c7c9ea81ee7c617f8cee5b645621088aea215b (diff) | |
Take care of ~ViewShellBase -> ~FormShellManager -> ViewShellBase::...
...ViewShellBase::GetEventMultiplexer call sequence, where
OSL_ASSERT(mpImpl->mpEventMultiplexer.get()!=NULL);
would call on an already stale ViewShellBase::mpImpl if ~FromShellManager were
only called from within ViewShellBase::~Implementation instead of directly from
~ViewShellBase.
(Needed to unbreak <https://gerrit.libreoffice.org/#/c/18890> "boost->std" on
Mac OS X, where libc++ presumably nulls a std::unique_ptr early in ~unique_ptr.)
Change-Id: I179e0d12cc049f33b5724673b65f84d7f7c3d059
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 461d9bf05f26..7da0c4c5483a 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -284,6 +284,8 @@ ViewShellBase::~ViewShellBase() EndListening(*GetDocShell()); SetWindow(NULL); + + mpImpl->mpFormShellManager.reset(); } void ViewShellBase::LateInit (const OUString& rsDefaultView) |