diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2018-08-26 22:11:43 -0400 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-25 12:18:58 +0200 |
| commit | 11b06f0e00fc21654384e2816842ab101e15010e (patch) | |
| tree | 131a9ba44be70feacc30749fdacbdef7b10fabf1 /sfx2 | |
| parent | c156cff9d6b2245ed0570fb758bb18d37950ff96 (diff) | |
sidebar: Add .uno:MasterSlidesPanel
Change-Id: I578dc8b1f9c8df7f7cc9108c70d6fad8006871c6
Reviewed-on: https://gerrit.libreoffice.org/73502
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/DeckLayouter.cxx | 1 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index a27f6f7847ca..591602ccf93a 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -169,6 +169,7 @@ tools::Rectangle LayoutPanels ( nTotalPreferredHeight += rItem.maLayoutSize.Preferred; } + if (nTotalMinimumHeight > nAvailableHeight && ! bShowVerticalScrollBar) { diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 6af46db78a86..e636f4cb30df 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -762,7 +762,6 @@ void SidebarController::SwitchToDeck ( nDeckX = 0; } - // Activate the deck and the new set of panels. mpCurrentDeck->setPosSizePixel( nDeckX, |