svtools/source/control/valueset.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
New commits: commit 921ae49cd7e332d7e1ad702efe2198b2780cc829 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Oct 15 13:35:20 2018 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Oct 15 18:01:38 2018 +0200 restore RemoveItem mnHighItemId handling Change-Id: I9aa094d50f7bc52fd379fa2e315037b81bb53df2 Reviewed-on: https://gerrit.libreoffice.org/61796 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 7c851be2acb1..730b2a87aea7 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -2706,9 +2706,10 @@ void SvtValueSet::RemoveItem( sal_uInt16 nItemId ) } // reset variables - if (mnSelItemId == nItemId) + if (mnHighItemId == nItemId || mnSelItemId == nItemId) { mnCurCol = 0; + mnHighItemId = 0; mnSelItemId = 0; mbNoSelection = true; } @@ -2727,11 +2728,12 @@ void SvtValueSet::Clear() // reset variables mnFirstLine = 0; mnCurCol = 0; + mnHighItemId = 0; mnSelItemId = 0; mbNoSelection = true; mbFormat = true; - if (IsReallyVisible() && IsUpdateMode()) + if ( IsReallyVisible() && IsUpdateMode() ) Invalidate(); } @@ -3603,7 +3605,7 @@ void SvtValueSet::SetColCount( sal_uInt16 nNewCols ) mnUserCols = nNewCols; mbFormat = true; queue_resize(); - if ( IsReallyVisible() && IsUpdateMode() ) + if (IsReallyVisible() && IsUpdateMode()) Invalidate(); } } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
