summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-06-08 11:35:15 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-06-08 11:36:47 +0100
commitf120abb446bf3f5230ed06a3b148654dde36bb94 (patch)
treeec66f499aa0d51598b3455ed98c67e7456726a3a
parent8dcf60ecbe9c159831ece3b6201882f1d0033472 (diff)
Resolves: rhbz#1343766 a11y queries during dispose trigger combobox crashes
Change-Id: I29863ca95e64ccd31795f78c29c89ff35009d718
-rw-r--r--vcl/source/control/combobox.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index c9f24b0eebfd..b3716f0bc28e 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1015,11 +1015,15 @@ OUString ComboBox::GetEntry( sal_Int32 nPos ) const
sal_Int32 ComboBox::GetEntryCount() const
{
+ if (!m_pImpl->m_pImplLB)
+ return 0;
return m_pImpl->m_pImplLB->GetEntryList()->GetEntryCount() - m_pImpl->m_pImplLB->GetEntryList()->GetMRUCount();
}
bool ComboBox::IsTravelSelect() const
{
+ if (!m_pImpl->m_pImplLB)
+ return false;
return m_pImpl->m_pImplLB->IsTravelSelect();
}
@@ -1036,6 +1040,8 @@ void ComboBox::EnableMultiSelection( bool bMulti )
bool ComboBox::IsMultiSelectionEnabled() const
{
+ if (!m_pImpl->m_pImplLB)
+ return false;
return m_pImpl->m_pImplLB->IsMultiSelectionEnabled();
}