diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-16 13:53:30 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-01-03 09:56:37 +0100 |
| commit | b8ab56a69ed1668a31a7acf214a5baf47fe403d9 (patch) | |
| tree | 0ad40e7b09d412e7108162f623882576312e31d8 | |
| parent | 21f771534a03650aa4c410a5f69da296773cd685 (diff) | |
m_bHasActive must be false after last visible entry is removed
...otherwise, ExtensionBox_Impl::RecalcAll would crash in CalcActiveHeight(-1).
Change-Id: If399825951c79b821ed44ebefa19d1032ab4f850
(cherry picked from commit 661f7bdefc8215f742951727b93395d47293cf0e)
Reviewed-on: https://gerrit.libreoffice.org/7097
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 19d274956ca8..0d48d55ea2e9 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -1224,7 +1224,13 @@ void ExtensionBox_Impl::checkEntries() if ( nPos < m_nActive ) m_nActive -= 1; else if ( ( nPos == m_nActive ) && ( nPos == (long) m_vEntries.size() - 1 ) ) + { m_nActive -= 1; + if (m_nActive == -1) + { + m_bHasActive = false; + } + } m_vRemovedEntries.push_back( *iIndex ); m_vEntries.erase( iIndex ); iIndex = m_vEntries.begin() + nPos; |