[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - svl/source

[Eike Rathke (via logerrit)]

 svl/source/numbers/zforfind.cxx |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit c2034ec38e586a9374e0d971e510649cd04f7c77
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Sat Jul 4 01:17:13 2020 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Jul 10 17:11:58 2020 +0200

    Resolves: tdf#134490 do not skip all trailing '-' or '/' of the start string
    
    Skip *one* of them under the condition that a month name was
    actually recognized.
    
    A horrible implementation of
    
        commit b00fc9462d26083b6d09f72ea44abb1e11546b63
        CommitDate: Wed Sep 15 11:54:10 2010 +0200
    
            sc-date-fix.diff: Parse 'june-2007' as June 1 2007 in en-US locales
    
    Change-Id: I0800c4f0b33aa1413bde558d710fe467e4380262
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97903
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit 348e78b8ccd04b59140c7f83504c7823b2ffbe8c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98073
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98504
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index ad42df620743..e1b7c856f6e4 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -2387,14 +2387,13 @@ bool ImpSvNumberInputScan::ScanStartString( const OUString& rString )
                 }
             }
         }
+        // Skip one trailing '-' or '/' character to recognize June-2007
+        if (nMonth && nPos + 1 == rString.getLength())
+        {
+            SkipChar('-', rString, nPos) || SkipChar('/', rString, nPos);
+        }
     }
 
-    // skip any trailing '-' or '/' chars
-    if (nPos < rString.getLength())
-    {
-        while (SkipChar ('-', rString, nPos) || SkipChar ('/', rString, nPos))
-            ; // do nothing
-    }
     if (nPos < rString.getLength()) // not everything consumed
     {
         // Does input StartString equal StartString of format?