[Libreoffice-commits] core.git: svtools/source

[Libreoffice Gerrit user]

 svtools/source/control/valueset.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0df11c2388e4bf901e985d8041c410ba032efc61
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri Nov 9 10:30:47 2018 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sat Nov 10 10:42:17 2018 +0100

    tdf#120703 PVS: revert commit 8ae988054a12b43250d030661a2fb6b297f8aee7
    
    ... which is apparently not needed anymore for #i41635. The revert allows
    to properly skip "deselect" accessible event when there's no selection
    previously.
    
    Also removed the other identical correction, which was added in commit
    4883fd31141c3598b25a123033297f847cd18552.
    
    Change-Id: I87c629d679b5c253a3864061074bfde77507fb12
    Reviewed-on: https://gerrit.libreoffice.org/63231
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 25bdbe3607d9..407fcf3019f0 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1761,7 +1761,7 @@ void ValueSet::SelectItem( sal_uInt16 nItemId )
     if ( !((mnSelItemId != nItemId) || mbNoSelection) )
         return;
 
-    sal_uInt16 nOldItem = mnSelItemId ? mnSelItemId : 1;
+    const sal_uInt16 nOldItem = mnSelItemId;
     mnSelItemId = nItemId;
     mbNoSelection = false;
 
@@ -2857,7 +2857,7 @@ void SvtValueSet::SelectItem( sal_uInt16 nItemId )
     if ( !((mnSelItemId != nItemId) || mbNoSelection) )
         return;
 
-    sal_uInt16 nOldItem = mnSelItemId ? mnSelItemId : 1;
+    const sal_uInt16 nOldItem = mnSelItemId;
     mnSelItemId = nItemId;
     mbNoSelection = false;