[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source

[Caolán McNamara]

 vcl/source/control/combobox.cxx |    2 +-
 vcl/source/control/lstbox.cxx   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ce418f314f4674d9eb9954cc553cc0674ed4a82a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 22 16:50:18 2013 +0100

    setting max line count should allow extra values to be added later
    
    Change-Id: Ia693c83b8d27cacbd257f81b5eae2936fc5f8a6f
    (cherry picked from commit c19c9dfc69b73ae7dbd7d4b9e68ec0a7c7891913)

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 5234a52..e89bc53 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -569,7 +569,7 @@ void ComboBox::SetDropDownLineCount( sal_uInt16 nLines )
 void ComboBox::AdaptDropDownLineCountToMaximum()
 {
     // adapt to maximum allowed number
-    SetDropDownLineCount(std::min(GetEntryCount(), GetSettings().GetStyleSettings().GetListBoxMaximumLineCount()));
+    SetDropDownLineCount(GetSettings().GetStyleSettings().GetListBoxMaximumLineCount());
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 741558e..31dfde2 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -593,7 +593,7 @@ void ListBox::SetDropDownLineCount( sal_uInt16 nLines )
 void ListBox::AdaptDropDownLineCountToMaximum()
 {
     // adapt to maximum allowed number
-    SetDropDownLineCount(std::min(GetEntryCount(), GetSettings().GetStyleSettings().GetListBoxMaximumLineCount()));
+    SetDropDownLineCount(GetSettings().GetStyleSettings().GetListBoxMaximumLineCount());
 }
 
 // -----------------------------------------------------------------------