summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-05-22 16:50:18 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-05-22 17:36:29 +0100
commitce418f314f4674d9eb9954cc553cc0674ed4a82a (patch)
treeb1762a6785f5be415154f56cd3ac356eee52875a
parent5cfb604159f0b73c94f528b5005da8734f2b2c2e (diff)
setting max line count should allow extra values to be added later
Change-Id: Ia693c83b8d27cacbd257f81b5eae2936fc5f8a6f (cherry picked from commit c19c9dfc69b73ae7dbd7d4b9e68ec0a7c7891913)
-rw-r--r--vcl/source/control/combobox.cxx2
-rw-r--r--vcl/source/control/lstbox.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 5234a521d7e1..e89bc536ea26 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 741558e2fd2d..31dfde2ac5e7 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());
}
// -----------------------------------------------------------------------