summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2022-11-10 20:40:44 +0100
committerEike Rathke <erack@redhat.com>2022-11-11 14:24:25 +0100
commit5db9d8356c8fdc732942357cd2171ba27eda8647 (patch)
treecb6041d564f7c3716b76614bfb2bd946598159a9
parent37e95b4d6754d2c77a76a84ce51a0b18df93927f (diff)
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 <erack@redhat.com> Tested-by: Jenkins
-rw-r--r--sc/source/ui/docshell/impex.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 5ef0cca91c28..1b8d715890b9 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1919,7 +1919,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;