[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - vcl/source

[Caolán McNamara]

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

New commits:
commit 87aae2e900da3cc441497c6b1666a143108baf0e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 21 12:18:36 2016 +0100

    Resolves: tdf#100558 last 'section' of date field not incremented
    
    presumably a regression from...
    
    commit 3cad6c806e5247ce20b78eb688551aa5d872b934
    Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
    Date:   Fri Mar 1 21:47:10 2013 +0100
    
        Replace (Xub)String with OUString in vcl(field)
    
    where UniString::Search returned a max short on not-found
    while OUString::indexOf returns a -1
    
    Change-Id: Ia3ef80dd318375ccdb3bdcee9bed7b70bf67cae1
    (cherry picked from commit 82913e694a4169f9ddeef399e659aec78cc9c8d6)
    Reviewed-on: https://gerrit.libreoffice.org/27374
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index b3e7c8fb..0a136da 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -1342,7 +1342,7 @@ void DateField::ImplDateSpinArea( bool bUp )
                 for ( sal_Int8 i = 1; i <= 3; i++ )
                 {
                     nPos = aText.indexOf( aDateSep, nPos );
-                    if ( nPos >= (sal_Int32)aSelection.Max() )
+                    if (nPos < 0 || nPos >= (sal_Int32)aSelection.Max())
                     {
                         nDateArea = i;
                         break;