[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source

[Tor Lillqvist (via logerrit)]

 sfx2/source/sidebar/SidebarController.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit af8927b6aa210095bbf3b693ec56b4adb90e9d1d
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Feb 28 17:02:30 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Mar 25 08:08:41 2020 +0100

    tdf#130348: Add special case for ChartDeck, too
    
    Change-Id: Idf6cc1469f074debfc4351a58826a3a7411391ca
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89722
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit 6a031edca26cadd5917a94de2d3b6a706197a8fc)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89783
    Tested-by: Jenkins
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 794cfef82b81..5c69f97d0b59 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -435,7 +435,9 @@ void SidebarController::NotifyResize()
                 // it's the PropertyDeck that really has many panes
                 // that can collapse or expand. For others, limit
                 // the height to something sensible.
-                const sal_Int32 nExtHeight = (msCurrentDeckId == "PropertyDeck" ? 2000 : 600);
+                // tdf#130348: Add special case for ChartDeck, too.
+                const sal_Int32 nExtHeight = (msCurrentDeckId == "PropertyDeck" ? 2000 :
+                                              (msCurrentDeckId == "ChartDeck" ? 1200 : 600));
                 // No TabBar in LOK (use nWidth in full).
                 mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth, nExtHeight);
             }