i122041 More unifications for FillStyles, better defaults, better preview visualizations

1 files changed, 14 insertions, 1 deletions

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 1f04cbb2ea29..f95a4d39443c 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -546,9 +546,14 @@ void ComboBox::EnableAutoSize( sal_Bool bAuto )
     if ( mpFloatWin )
     {
         if ( bAuto && !mpFloatWin->GetDropDownLineCount() )
-            mpFloatWin->SetDropDownLineCount( 5 );
+        {
+            // Adapt to GetListBoxMaximumLineCount here; was on fixed number of five before
+            AdaptDropDownLineCountToMaximum();
+        }
         else if ( !bAuto )
+        {
             mpFloatWin->SetDropDownLineCount( 0 );
+        }
     }
 }
 
@@ -578,6 +583,14 @@ void ComboBox::SetDropDownLineCount( sal_uInt16 nLines )
 
 // -----------------------------------------------------------------------
 
+void ComboBox::AdaptDropDownLineCountToMaximum()
+{
+    // adapt to maximum allowed number
+    SetDropDownLineCount(std::min(GetEntryCount(), GetSettings().GetStyleSettings().GetListBoxMaximumLineCount()));
+}
+
+// -----------------------------------------------------------------------
+
 sal_uInt16 ComboBox::GetDropDownLineCount() const
 {
     sal_uInt16 nLines = 0;