|
 |
f0633d |
From f232b831d439bac53a662c32032c7a0abd430d5e Mon Sep 17 00:00:00 2001
|
|
|
f0633d |
From: Stephan Bergmann <sbergman@redhat.com>
|
|
|
f0633d |
Date: Mon, 16 Dec 2013 13:53:30 +0100
|
|
|
f0633d |
Subject: [PATCH 075/109] m_bHasActive must be false after last visible entry
|
|
|
f0633d |
is removed
|
|
|
f0633d |
MIME-Version: 1.0
|
|
|
f0633d |
Content-Type: text/plain; charset=UTF-8
|
|
|
f0633d |
Content-Transfer-Encoding: 8bit
|
|
|
f0633d |
|
|
|
f0633d |
...otherwise, ExtensionBox_Impl::RecalcAll would crash in CalcActiveHeight(-1).
|
|
|
f0633d |
|
|
|
f0633d |
Change-Id: If399825951c79b821ed44ebefa19d1032ab4f850
|
|
|
f0633d |
(cherry picked from commit 661f7bdefc8215f742951727b93395d47293cf0e)
|
|
|
f0633d |
Reviewed-on: https://gerrit.libreoffice.org/7097
|
|
|
f0633d |
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
|
|
|
f0633d |
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f0633d |
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f0633d |
---
|
|
|
f0633d |
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 6 ++++++
|
|
|
f0633d |
1 file changed, 6 insertions(+)
|
|
|
f0633d |
|
|
|
f0633d |
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
|
|
|
f0633d |
index 19d2749..0d48d55 100644
|
|
|
f0633d |
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
|
|
|
f0633d |
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
|
|
|
f0633d |
@@ -1224,7 +1224,13 @@ void ExtensionBox_Impl::checkEntries()
|
|
|
f0633d |
if ( nPos < m_nActive )
|
|
|
f0633d |
m_nActive -= 1;
|
|
|
f0633d |
else if ( ( nPos == m_nActive ) && ( nPos == (long) m_vEntries.size() - 1 ) )
|
|
|
f0633d |
+ {
|
|
|
f0633d |
m_nActive -= 1;
|
|
|
f0633d |
+ if (m_nActive == -1)
|
|
|
f0633d |
+ {
|
|
|
f0633d |
+ m_bHasActive = false;
|
|
|
f0633d |
+ }
|
|
|
f0633d |
+ }
|
|
|
f0633d |
m_vRemovedEntries.push_back( *iIndex );
|
|
|
f0633d |
m_vEntries.erase( iIndex );
|
|
|
f0633d |
iIndex = m_vEntries.begin() + nPos;
|
|
|
f0633d |
--
|
|
|
f0633d |
1.8.4.2
|
|
|
f0633d |
|