diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-10-24 14:10:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-10-24 15:39:27 +0100 |
| commit | 4cc5ccef4bccc779f6286ac369b00dfd42ca9cdb (patch) | |
| tree | 081fa1b57fe6a54be50215bcd4c11355b9fa801c /vcl/source/control | |
| parent | b9326cf05f1ec7ba480bef756c20eca91035bedc (diff) | |
convert index dialog to .ui
Change-Id: I4b16cb517dca25f862b9dd612785dae4d0f21793
Diffstat (limited to 'vcl/source/control')
| -rw-r--r-- | vcl/source/control/combobox.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/control/ilstbox.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/control/lstbox.cxx | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 9d04b7a2e30f..6dae2238da12 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -544,7 +544,7 @@ void ComboBox::EnableAutoSize( sal_Bool bAuto ) if ( mpFloatWin ) { if ( bAuto && !mpFloatWin->GetDropDownLineCount() ) - mpFloatWin->SetDropDownLineCount( 5 ); + mpFloatWin->SetDropDownLineCount( 16 ); else if ( !bAuto ) mpFloatWin->SetDropDownLineCount( 0 ); } diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 714f0db66e7b..23199fa39b2a 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -3229,7 +3229,7 @@ Size ImplListBoxFloatingWindow::CalcFloatSize() // Minimale Hoehe, falls Hoehe nicht auf Float-Hoehe eingestellt wurde. // Der Parent vom FloatWin muss die DropDown-Combo/Listbox sein. Size aParentSz = GetParent()->GetSizePixel(); - if( !mnDDLineCount && ( aFloatSz.Height() < aParentSz.Height() ) ) + if( (!mnDDLineCount || !nLines) && ( aFloatSz.Height() < aParentSz.Height() ) ) aFloatSz.Height() = aParentSz.Height(); // Nicht schmaler als der Parent werden... @@ -3254,6 +3254,7 @@ Size ImplListBoxFloatingWindow::CalcFloatSize() long nSBWidth = GetSettings().GetStyleSettings().GetScrollBarSize(); aFloatSz.Height() += nSBWidth; } + return aFloatSz; } diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 5dbef4aeefce..e7ed3cf0c0f8 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -618,7 +618,7 @@ void ListBox::EnableAutoSize( sal_Bool bAuto ) if ( mpFloatWin ) { if ( bAuto && !mpFloatWin->GetDropDownLineCount() ) - mpFloatWin->SetDropDownLineCount( 5 ); + mpFloatWin->SetDropDownLineCount( 16 ); else if ( !bAuto ) mpFloatWin->SetDropDownLineCount( 0 ); } |