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

[Andreas Heinisch (via logerrit)]

 sc/source/ui/dbgui/scuiasciiopt.cxx |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit d043e092d9115629f1394ae0b6c25d899460f127
Author:     Andreas Heinisch <andreas.heinisch at yahoo.de>
AuthorDate: Thu Jun 24 10:19:16 2021 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Mon Jun 28 10:11:24 2021 +0200

    tdf#58250 - Show custom unicode separator in the csv import dialog
    
    Change-Id: I5924ba3c5b0b96a744e2c2e63632b383b371e485
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117766
    Tested-by: Jenkins
    Reviewed-by: Andreas Heinisch <andreas.heinisch at yahoo.de>
    (cherry picked from commit 8712d2cb78808bd17399605a70862d7920e63c9a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117858
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 6757aab5572a..b66403492961 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -644,13 +644,9 @@ void ScImportAsciiDlg::SaveParameters()
 
 void ScImportAsciiDlg::SetSeparators()
 {
-    OString sString(OUStringToOString(maFieldSeparators,
-        RTL_TEXTENCODING_MS_1252));
-    const char *aSep = sString.getStr();
-    sal_Int32 len = maFieldSeparators.getLength();
-    for (int i = 0; i < len; ++i)
+    for (sal_Int32 i = 0; i < maFieldSeparators.getLength(); ++i)
     {
-        switch( aSep[i] )
+        switch (maFieldSeparators[i])
         {
             case '\t':  mxCkbTab->set_active(true);        break;
             case ';':   mxCkbSemicolon->set_active(true);  break;
@@ -658,7 +654,7 @@ void ScImportAsciiDlg::SetSeparators()
             case ' ':   mxCkbSpace->set_active(true);      break;
             default:
                 mxCkbOther->set_active(true);
-                mxEdOther->set_text(mxEdOther->get_text() + OUStringChar(aSep[i]));
+                mxEdOther->set_text(mxEdOther->get_text() + OUStringChar(maFieldSeparators[i]));
         }
     }
 }