[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source

[Caolán McNamara]

 sc/source/ui/cctrl/cbuttonw.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 92921cfec5a41bffe16426cbf0511accddda6f2c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 23 16:17:29 2017 +0100

    Resolves: tdf#108708 set a min width for calc dropdown combobox button
    
    Change-Id: I002350170cf30a3347ed0c4e4885109ef194458e
    Reviewed-on: https://gerrit.libreoffice.org/39179
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx
index e559ea185f25..f922e545d71a 100644
--- a/sc/source/ui/cctrl/cbuttonw.cxx
+++ b/sc/source/ui/cctrl/cbuttonw.cxx
@@ -43,9 +43,8 @@ void ScDDComboBoxButton::SetOutputDevice( OutputDevice* pOutputDevice )
 
 void ScDDComboBoxButton::SetOptSizePixel()
 {
-    aBtnSize = pOut->LogicToPixel( Size(0,11), MapUnit::MapAppFont );
-    //aBtnSize.Width() = GetSystemMetrics( SM_CXVSCROLL ) - 1; // Win SDK function
-    aBtnSize.Width() = pOut->GetSettings().GetStyleSettings().GetScrollBarSize();
+    aBtnSize = pOut->LogicToPixel(Size(8, 11), MapUnit::MapAppFont);
+    aBtnSize.Width() = std::max(aBtnSize.Width(), pOut->GetSettings().GetStyleSettings().GetScrollBarSize());
 }
 
 void ScDDComboBoxButton::Draw( const Point& rAt,