sd/sdi/drviewsh.sdi | 5 +++++ sfx2/source/sidebar/DeckLayouter.cxx | 1 + sfx2/source/sidebar/SidebarController.cxx | 5 +++++ 3 files changed, 11 insertions(+)
New commits: commit 78a14ad204b0fea20d97388f958325e8173216c5 Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk> AuthorDate: Sun Sep 2 11:38:31 2018 -0400 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Aug 15 13:44:28 2019 +0200 sidebar: support closing the sidebar through the X button Reviewed-on: https://gerrit.libreoffice.org/73503 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> (cherry picked from commit bf7adf4c24209b48198d06a66e7fadba66637763) Change-Id: I078c27d22bbee3d02ad4a3fb97ba01a394f171e1 Reviewed-on: https://gerrit.libreoffice.org/77493 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index cb5a4e52ebf9..ec900b75590e 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -1211,6 +1211,11 @@ IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*, pMenu, bool) void SidebarController::RequestCloseDeck() { + if (comphelper::LibreOfficeKit::isActive()) + { + mpCurrentDeck->GetLOKNotifier()->notifyWindow(mpCurrentDeck->GetLOKWindowId(), "close"); + } + mbIsDeckRequestedOpen = false; UpdateDeckOpenState(); commit 416fbeffa8fc8e3a480f7cda5db4b37c2e9ea228 Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk> AuthorDate: Sun Aug 26 22:11:43 2018 -0400 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Aug 15 13:44:09 2019 +0200 sidebar: Add .uno:MasterSlidesPanel Change-Id: I578dc8b1f9c8df7f7cc9108c70d6fad8006871c6 Reviewed-on: https://gerrit.libreoffice.org/73502 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> (cherry picked from commit 11b06f0e00fc21654384e2816842ab101e15010e) Reviewed-on: https://gerrit.libreoffice.org/77492 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi index 453ffb4a5cec..b4d4bcb550e8 100644 --- a/sd/sdi/drviewsh.sdi +++ b/sd/sdi/drviewsh.sdi @@ -57,6 +57,11 @@ interface ImpressEditView : DrawView ExecMethod = FuTemporary ; StateMethod = GetMenuState ; ] + SID_MASTER_SLIDES_PANEL // ole : no, status : ? + [ + ExecMethod = FuTemporary ; + StateMethod = GetMenuState ; + ] SID_REHEARSE_TIMINGS // ole : no, status : ? [ ExecMethod = FuSupport ; diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index e432e383d519..650b112605aa 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -172,6 +172,7 @@ tools::Rectangle LayoutPanels ( nTotalPreferredHeight += iItem->maLayoutSize.Preferred; } + if (nTotalMinimumHeight > nAvailableHeight && ! bShowVerticalScrollBar) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits