sd/source/ui/view/ViewShellBase.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 7aa6009a7f7132c80db7bcc4e8291ba4a3296ae5
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 29 14:28:08 2015 +0200
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
diff --git a/sd/source/ui/view/ViewShellBase.cxx
b/sd/source/ui/view/ViewShellBase.cxx
index 461d9bf..7da0c4c 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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
