sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx | 2 +-
sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx | 4 ++--
sc/source/ui/inc/TableFillingAndNavigationTools.hxx | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 740175916fd4cea821249201fa2af1fb2a3db867
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Sat Dec 8 18:19:12 2018 +0100
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Sat Dec 8 22:30:46 2018 +0100
Resolves: tdf#80583 create range list string with proper delimiter
... which is the to be used function parameter separator here. The
current document's grammar (from which the separator is obtained
in ScRangeList::Format() if not specified) may differ from the
forced English grammar later when compiling the formula, and all
formula expressions to be inserted use the language independent
';' semicolon function parameter separator.
Change-Id: I7a3deb6d50fc57ed434ede1f00bbe8c5c1361e0f
Reviewed-on: https://gerrit.libreoffice.org/64819
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 470a91cb041782e29664212d096bb16873ba57a0)
Reviewed-on: https://gerrit.libreoffice.org/64823
diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index 154bd2f73c34..a655c8c1bd51 100644
--- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
@@ -334,7 +334,7 @@ void
ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
// Sum of Squares
aTemplate.setTemplate("=DEVSQ(%RANGE_LIST%)");
- aTemplate.applyRangeList("%RANGE_LIST%", aRangeList);
+ aTemplate.applyRangeList("%RANGE_LIST%", aRangeList, ';');
output.writeFormula(aTemplate.getTemplate());
output.nextColumn();
diff --git a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
index 9c972d84b636..376dd26c5e32 100644
--- a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
+++ b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
@@ -69,10 +69,10 @@ void FormulaTemplate::applyRange(const OUString& aVariable,
const ScRange& aRang
mTemplate = mTemplate.replaceAll(aVariable, aString);
}
-void FormulaTemplate::applyRangeList(const OUString& aVariable, const
ScRangeList& aRangeList)
+void FormulaTemplate::applyRangeList(const OUString& aVariable, const
ScRangeList& aRangeList, sal_Unicode cDelimiter)
{
OUString aString;
- aRangeList.Format(aString, ScRefFlags::RANGE_ABS_3D, mpDoc,
mpDoc->GetAddressConvention());
+ aRangeList.Format(aString, ScRefFlags::RANGE_ABS_3D, mpDoc,
mpDoc->GetAddressConvention(), cDelimiter);
mTemplate = mTemplate.replaceAll(aVariable, aString);
}
diff --git a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx
b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx
index 65bd90a3db24..dd5cdcae1e51 100644
--- a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx
+++ b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx
@@ -41,7 +41,7 @@ public:
void autoReplaceUses3D(bool bUse3D) { mbUse3D = bUse3D; }
void applyRange(const OUString& aVariable, const ScRange& aRange,
bool b3D = true);
- void applyRangeList(const OUString& aVariable, const ScRangeList&
aRangeList);
+ void applyRangeList(const OUString& aVariable, const ScRangeList&
aRangeList, sal_Unicode cDelimiter );
void applyAddress(const OUString& aVariable, const ScAddress&
aAddress, bool b3D = true);
void applyString(const OUString& aVariable, const OUString& aValue);
void applyNumber(const OUString& aVariable, sal_Int32 aValue);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
