diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-10 15:06:53 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-04-14 14:40:35 +0200 |
commit | a5d5f9e0a86871c2c7735f0bea3021eee4c0f41a (patch) | |
tree | b487867ffc41452701815ba4843c1e95dbab7857 /desktop | |
parent | 82853774abe5722efd09939fea411829fcd15a72 (diff) |
rhbz#1197614: Fix calculation of m_bHasActive when removing active element
Assume m_vEntries.size() == 2; assume first element (nPos == 0) is m_bActive,
gets removed, so m_nActive would have stayed at 0 and m_bHasActive at true; then
assume second element (again nPos == 0, due to the removed element) is m_bNew,
so nPos <= m_nActive is true and m_nActive gets updated to 1 (and m_bHasActive
remains true); then selectEntry(nNewPos) (nNewPos == 0) would have tried to
reset m_vEntries[1]->m_bActive but now m_vEntries.size() == 1.
Change-Id: I31d3bbe97ca99f880aa99bdea015f7c0457f8331
(cherry picked from commit 97d4c1a8100c63091401736c93d6bbbb371d5b37)
Reviewed-on: https://gerrit.libreoffice.org/15231
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index ab5e0494289f..3b50aaff978d 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -1041,7 +1041,6 @@ long ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > & //access to m_nActive must be guarded if ( !m_bInCheckMode && m_bHasActive && ( m_nActive >= nPos ) ) m_nActive += 1; - guard.clear(); if ( IsReallyVisible() ) @@ -1178,6 +1177,7 @@ void ExtensionBox_Impl::prepareChecking() void ExtensionBox_Impl::checkEntries() { long nNewPos = -1; + long nChangedActivePos = -1; long nPos = 0; bool bNeedsUpdate = false; @@ -1201,15 +1201,19 @@ void ExtensionBox_Impl::checkEntries() } else { // remove entry from list + if (nPos < nNewPos) { + --nNewPos; + } + if (nPos < nChangedActivePos) { + --nChangedActivePos; + } if ( nPos < m_nActive ) m_nActive -= 1; - else if ( ( nPos == m_nActive ) && ( nPos == (long) m_vEntries.size() - 1 ) ) + else if ( nPos == m_nActive ) { - m_nActive -= 1; - if (m_nActive == -1) - { - m_bHasActive = false; - } + nChangedActivePos = nPos; + m_nActive = -1; + m_bHasActive = false; } m_vRemovedEntries.push_back( *iIndex ); m_vEntries.erase( iIndex ); @@ -1225,6 +1229,9 @@ void ExtensionBox_Impl::checkEntries() if ( nNewPos != - 1) selectEntry( nNewPos ); + else if (nChangedActivePos != -1) { + selectEntry(nChangedActivePos); + } if ( bNeedsUpdate ) { |