[Libreoffice-commits] core.git: sc/source

[Eike Rathke (via logerrit)]

 sc/source/ui/optdlg/tpformula.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 381bc9d9acd461415cf81eef71ec3dd935a07b62
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Fri Jun 11 22:22:13 2021 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Fri Jun 11 23:50:44 2021 +0200

    Related: tdf#127013 Check loaded separators for validity
    
    ... not only if something is present at all.
    That way future restrictions can reset separators.
    
    Change-Id: I738bcb9e052e8dbecb0a6cd07bbae8f4a8ea1c35
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117072
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins

diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 2f24e0714e71..c7d29e03dbc6 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -372,9 +372,9 @@ void ScTpFormulaOptions::Reset(const SfxItemSet* rCoreSet)
     OUString aSepArrayRow = aOpt.GetFormulaSepArrayRow();
     OUString aSepArrayCol = aOpt.GetFormulaSepArrayCol();
 
-    if (aSep.getLength() == 1 && aSepArrayRow.getLength() == 1 && aSepArrayCol.getLength() == 1)
+    if (IsValidSeparator(aSep, false) && IsValidSeparator(aSepArrayRow, true) && IsValidSeparator(aSepArrayCol, true))
     {
-        // Each separator must be one character long.
+        // Each and all separators must be valid.
         mxEdSepFuncArg->set_text(aSep);
         mxEdSepArrayCol->set_text(aSepArrayCol);
         mxEdSepArrayRow->set_text(aSepArrayRow);