[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sc/source

[Eike Rathke (via logerrit)]

 sc/source/ui/docshell/impex.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 881fb6f7c06444c58551f71730d97c51a840fbf5
Author:     Eike Rathke <er...@redhat.com>
AuthorDate: Thu Nov 10 20:40:44 2022 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Nov 15 11:13:06 2022 +0100

    Resolves: tdf#151947 Merging separators must not scan for field end
    
    Regression introduced with
    
        commit cf777cfcb22647b1f2d6ace307fbcc4f6d2cca30
        CommitDate: Sun Oct 2 17:07:06 2022 +0200
    
            Resolves: tdf#125110 tdf#151211 Disentangle the convoluted 
CSV/TSV-clip import
    
    a copy-paste replacement logic error.
    
    Change-Id: Ibd699a4edfa9f88da26d888afa8567ee34e78a5e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142572
    Reviewed-by: Eike Rathke <er...@redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit 5db9d8356c8fdc732942357cd2171ba27eda8647)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142527
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 3be11884ca72..3f80f88ef9b6 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1924,7 +1924,7 @@ const sal_Unicode* 
ScImportExport::ScanNextFieldFromString( const sal_Unicode* p
     }
     if ( bMergeSeps )           // skip following delimiters
     {
-        while (!lcl_isFieldEnd( *p, pSeps))
+        while (*p && ScGlobal::UnicodeStrChr( pSeps, *p))
             p++;
     }
     return p;