[Libreoffice-commits] core.git: sd/source

[Szymon Kłos]

 sd/source/ui/view/ViewShellBase.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 876348f5acdaa109e0f878786345e1e12fce19a1
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Tue Jun 28 12:51:39 2016 +0200

    GSoC kill notebookbar after the real impress close
    
    Change-Id: I641ebdd7610289a872dd0c8de9b297e5e6ba0b45
    Before: notebookbar was closed even if exit was canceled by user

diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 2df5ad5..a5cda27 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.