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

[Caolán McNamara (via logerrit)]

 sc/source/filter/excel/xeescher.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 66a61b73fd743509c075ba48ab59172fba03c8ee
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Nov 17 14:12:37 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Nov 17 21:55:48 2020 +0100

    crashtesting: clamp assert failure, hi < lo
    
    asserts since...
    
    commit bf4bbc3c2174b21577b8878bc3197923ba44a029
    Date:   Thu Nov 12 15:38:13 2020 +0200
    
        replace std::max(std::min()) with std::clamp
    
    but looks wrong since...
    
    commit ff916ccce1527b63aad17bbae0ad02a834cd31d6
    Date:   Tue Sep 30 13:51:36 2008 +0000
    
        CWS-TOOLING: integrate CWS dr63
    
    -                mnScrollMax = limit_cast< sal_Int16 >( nApiValue, mnScrollMin, EXC_OBJ_SBS_MAXSCROLL );
    +                mnScrollMax = limit_cast< sal_uInt16 >( nApiValue, mnScrollMin, EXC_OBJ_SCROLLBAR_MIN );
    
    Change-Id: I002c764ed7129b1a66a7c827422b9d64034c6e53
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106012
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index daf2a2777b23..22c2462df750 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -864,7 +864,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference<
             if( aCtrlProp.GetProperty( nApiValue, "ScrollValueMin" ) )
                 mnScrollMin = limit_cast< sal_uInt16 >( nApiValue, EXC_OBJ_SCROLLBAR_MIN, EXC_OBJ_SCROLLBAR_MAX );
             if( aCtrlProp.GetProperty( nApiValue, "ScrollValueMax" ) )
-                mnScrollMax = limit_cast< sal_uInt16 >( nApiValue, mnScrollMin, EXC_OBJ_SCROLLBAR_MIN );
+                mnScrollMax = limit_cast< sal_uInt16 >( nApiValue, mnScrollMin, EXC_OBJ_SCROLLBAR_MAX );
             if( aCtrlProp.GetProperty( nApiValue, "ScrollValue" ) )
                 mnScrollValue = limit_cast< sal_uInt16 >( nApiValue, mnScrollMin, mnScrollMax );
             if( aCtrlProp.GetProperty( nApiValue, "LineIncrement" ) )