[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/source

[Xisco Fauli]

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

New commits:
commit f7db69e5302dca28c3cf5a36dc2328bd062fc0d9
Author: Xisco Fauli <xiscofauli at libreoffice.org>
Date:   Wed Mar 14 10:19:47 2018 +0100

    tdf#115539, tdf#116238: Don't display the notebookbar in presentation mode
    
    Change-Id: Ifc64d9a3b5c93b83fa238737375e7a58b2ae86db
    Reviewed-on: https://gerrit.libreoffice.org/51262
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    (cherry picked from commit 6a9326803c01f4c9bc7da855053ce4e80646fad8)
    Reviewed-on: https://gerrit.libreoffice.org/51294
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 99a1c34343f5..d24dbb65b4d4 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -721,12 +721,8 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
         case SID_PRESENTATION_CURRENT_SLIDE:
         case SID_REHEARSE_TIMINGS:
         {
-            sfx2::SfxNotebookBar::LockNotebookBar();
-
             slideshowhelp::ShowSlideShow(rReq, *GetDoc());
             rReq.Ignore ();
-
-            sfx2::SfxNotebookBar::UnlockNotebookBar();
         }
         break;
 
@@ -1587,6 +1583,7 @@ namespace slideshowhelp
         Reference< XPresentation2 > xPresentation( rDoc.getPresentation() );
         if( xPresentation.is() )
         {
+            sfx2::SfxNotebookBar::LockNotebookBar();
             if (SID_REHEARSE_TIMINGS == rReq.GetSlot())
                 xPresentation->rehearseTimings();
             else if (rDoc.getPresentationSettings().mbCustomShow)
@@ -1616,6 +1613,7 @@ namespace slideshowhelp
 
                 xPresentation->startWithArguments( aArguments );
             }
+            sfx2::SfxNotebookBar::UnlockNotebookBar();
         }
     }
 }