diff options
| author | Szymon Kłos <eszkadev@gmail.com> | 2016-06-28 12:51:39 +0200 |
|---|---|---|
| committer | Szymon Kłos <eszkadev@gmail.com> | 2016-06-28 13:52:59 +0200 |
| commit | 876348f5acdaa109e0f878786345e1e12fce19a1 (patch) | |
| tree | 684e46d80d2a79df78edab4f054c3fbfb06766dc /sd/source/ui/view/ViewShellBase.cxx | |
| parent | 48a8d6d8434908690bc2a51d27f1051bd550c9b0 (diff) | |
GSoC kill notebookbar after the real impress close
Change-Id: I641ebdd7610289a872dd0c8de9b297e5e6ba0b45
Before: notebookbar was closed even if exit was canceled by user
Diffstat (limited to 'sd/source/ui/view/ViewShellBase.cxx')
| -rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 2df5ad572516..a5cda27ed6c7 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -270,6 +270,8 @@ ViewShellBase::ViewShellBase ( */ ViewShellBase::~ViewShellBase() { + sfx2::SfxNotebookBar::CloseMethod(GetFrame()->GetBindings()); + rtl::Reference<SlideShow> xSlideShow(SlideShow::GetSlideShow(*this)); if (xSlideShow.is() && xSlideShow->dependsOn(this)) SlideShow::Stop(*this); @@ -770,8 +772,6 @@ bool ViewShellBase::PrepareClose (bool bUI) if (bResult) { - sfx2::SfxNotebookBar::CloseMethod(GetFrame()->GetBindings()); - mpImpl->mbIsClosing = true; // Forward call to main sub shell. |