diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-05-18 13:20:07 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-21 21:40:03 +0200 |
commit | 52eb2804bb4403e74483ee49bfcb4539065d7143 (patch) | |
tree | 772c2adba0f2049e3a7b981e7a918148749ccb22 /vcl/source/control | |
parent | 2632adfbc2a664ab99de7e24d6fcd6841a10b6f1 (diff) |
weld ScSortDlg, ScTabPageSortOptions and ScTabPageSortFields
Change-Id: I103e5e3670f8c95c1f480ce0c36e08c3de74e900
Reviewed-on: https://gerrit.libreoffice.org/54541
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/control')
-rw-r--r-- | vcl/source/control/combobox.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index d54c628df8a3..4508d34022fc 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -917,6 +917,8 @@ void ComboBox::RemoveEntryAt(sal_Int32 const nPos) void ComboBox::Clear() { + if (!m_pImpl->m_pImplLB) + return; m_pImpl->m_pImplLB->Clear(); CallEventListeners( VclEventId::ComboboxItemRemoved, reinterpret_cast<void*>(-1) ); } @@ -955,6 +957,8 @@ 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(); } @@ -987,7 +991,12 @@ void ComboBox::SetDoubleClickHdl(const Link<ComboBox&,void>& rLink) { m_pImpl->m const Link<ComboBox&,void>& ComboBox::GetDoubleClickHdl() const { return m_pImpl->m_DoubleClickHdl; } -void ComboBox::SetEntryActivateHdl(const Link<Edit&,void>& rLink) { m_pImpl->m_pSubEdit->SetActivateHdl(rLink); } +void ComboBox::SetEntryActivateHdl(const Link<Edit&,void>& rLink) +{ + if (!m_pImpl->m_pSubEdit) + return; + m_pImpl->m_pSubEdit->SetActivateHdl(rLink); +} long ComboBox::CalcWindowSizePixel(sal_uInt16 nLines) const { |