[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

 vcl/source/control/combobox.cxx |    6 ------
 vcl/source/control/listbox.cxx  |    2 --
 2 files changed, 8 deletions(-)

New commits:
commit 82ce1d2cd27f7d6fe8046a74d0b7d8866b75c458
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 21 17:32:10 2016 +0100

    These fixes aren't needed after all.
    
    The root problem was instead fixed by...
    
    commit 144e73f50c49333f61c6f27b882be9dbc232ceb4
    Author: Noel Grandin <noel at peralex.com>
    Date:   Tue Dec 22 09:05:32 2015 +0200
    
        fix Link::operator<
    
        so that it is consistent with operator==
    
    Revert "Related: rhbz#1343766 a11y queries during dispose trigger listbox crashes"
    
    This reverts commit c615943bda57eadfa73c14a7314938aabe0bd16f.
    
    Revert "Resolves: rhbz#1343766 a11y queries during dispose trigger combobox crashes"
    
    This reverts commit f120abb446bf3f5230ed06a3b148654dde36bb94.

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 415f1e2..77b9c2e 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1000,15 +1000,11 @@ 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();
 }
 
@@ -1025,8 +1021,6 @@ void ComboBox::EnableMultiSelection( bool bMulti )
 
 bool ComboBox::IsMultiSelectionEnabled() const
 {
-    if (!m_pImpl->m_pImplLB)
-        return false;
     return m_pImpl->m_pImplLB->IsMultiSelectionEnabled();
 }
 
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index defffb2..5b35044 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -1190,8 +1190,6 @@ void ListBox::EnableMultiSelection( bool bMulti, bool bStackSelection )
 
 bool ListBox::IsMultiSelectionEnabled() const
 {
-    if (!mpImplLB)
-        return false;
     return mpImplLB->IsMultiSelectionEnabled();
 }