summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-12-18 15:24:05 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-12-18 15:25:37 +0000
commit1cd9420755dc5d5435bf564a992b727c455a3d73 (patch)
treef5a6fab1a6fc5e38a7d95f584e17420e2eea869d /vcl
parentd1cf36265d25ddee11e787c4c83692163b66b06b (diff)
Resolves: rhbz#1175142 nStarts ends up as an invalid -1
Change-Id: Ic67c5562d0e9936cd6a524ecd4f798aaf885a6e8
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/control/combobox.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 462c61fe3fc8..5edee223e753 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -292,7 +292,7 @@ void ComboBox::ImplAutocompleteHandler( Edit* pEdit )
{
OUString aFullText = pEdit->GetText();
OUString aStartText = aFullText.copy( 0, (sal_Int32)aSel.Max() );
- sal_Int32 nStart = mpImplLB->GetCurrentPos();
+ sal_Int32 nStart = mpImplLB->GetCurrentPos();
if ( nStart == LISTBOX_ENTRY_NOTFOUND )
nStart = 0;
@@ -303,7 +303,10 @@ void ComboBox::ImplAutocompleteHandler( Edit* pEdit )
else if ( eAction == AUTOCOMPLETE_TABBACKWARD )
{
bForward = false;
- nStart = nStart ? nStart - 1 : mpImplLB->GetEntryList()->GetEntryCount()-1;
+ if (nStart)
+ nStart = nStart - 1;
+ else if (mpImplLB->GetEntryList()->GetEntryCount())
+ nStart = mpImplLB->GetEntryList()->GetEntryCount()-1;
}
sal_Int32 nPos = LISTBOX_ENTRY_NOTFOUND;