diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-15 13:35:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-15 18:01:38 +0200 |
| commit | 921ae49cd7e332d7e1ad702efe2198b2780cc829 (patch) | |
| tree | 4ea9f607f5ad8bc040ada2ffbaa40030f2202464 /svtools | |
| parent | Update git submodules (diff) | |
| download | core-921ae49cd7e332d7e1ad702efe2198b2780cc829.tar.gz core-921ae49cd7e332d7e1ad702efe2198b2780cc829.zip | |
restore RemoveItem mnHighItemId handling
Change-Id: I9aa094d50f7bc52fd379fa2e315037b81bb53df2
Reviewed-on: https://gerrit.libreoffice.org/61796
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/control/valueset.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
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(); } } |