diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2018-03-14 10:19:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-21 15:10:39 +0100 |
| commit | 2d8d36713790584b4ab7f5c94179bad05754b2ec (patch) | |
| tree | 486279e735025a15a85520a8da028d0dc0ede005 | |
| parent | 8256df2bb3823f318d2131f513d62784e702b90c (diff) | |
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@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
(cherry picked from commit 6a9326803c01f4c9bc7da855053ce4e80646fad8)
Reviewed-on: https://gerrit.libreoffice.org/51295
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sd/source/ui/view/drviewse.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 54b3628826cc..52a244635ddb 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -720,12 +720,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; @@ -1582,6 +1578,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) @@ -1611,6 +1608,7 @@ namespace slideshowhelp xPresentation->startWithArguments( aArguments ); } + sfx2::SfxNotebookBar::UnlockNotebookBar(); } } } |