[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/source

Caolán McNamara caolanm at redhat.com
Wed Oct 15 09:25:54 PDT 2014


 vcl/source/control/edit.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0c88c13e769bc4c521f3f966c02ea21a3cb8d928
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 15 13:47:09 2014 +0100

    Resolves: fdo#85032 max len property of -1 -> crash
    
    Change-Id: Ief903c619204f01784e93fd5e2d582632cef032e
    (cherry picked from commit e45136f1ff9d817dfec27a6a20ba29fffc6c54bf)
    Reviewed-on: https://gerrit.libreoffice.org/11985
    Reviewed-by: Matthew Francis <mjay.francis at gmail.com>
    Tested-by: Matthew Francis <mjay.francis at gmail.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index f117e3f..906355f 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2437,7 +2437,7 @@ bool Edit::IsInsertMode() const
 
 void Edit::SetMaxTextLen(sal_Int32 nMaxLen)
 {
-    mnMaxTextLen = nMaxLen ? nMaxLen : EDIT_NOLIMIT;
+    mnMaxTextLen = nMaxLen > 0 ? nMaxLen : EDIT_NOLIMIT;
 
     if ( mpSubEdit )
         mpSubEdit->SetMaxTextLen( mnMaxTextLen );


More information about the Libreoffice-commits mailing list