diff options
| author | Regina Henschel <rb.henschel@t-online.de> | 2024-10-24 22:12:25 +0200 |
|---|---|---|
| committer | Regina Henschel <rb.henschel@t-online.de> | 2024-11-06 00:55:37 +0100 |
| commit | c377e211785c799a56cd72a9ecba9611d5993311 (patch) | |
| tree | 5d8a786c6d7dbdb0792599158c447dffcd58713e /sc/source | |
| parent | 957fea5f3d554c870903687d56e49d4777b69ef8 (diff) | |
tdf#162177 Adapt function EASTERSUNDAY to ODF 1.4
This includes writing ORG.OPENOFFICE.EASTERSUNDAY for ODF 1.3 and
ODF 1.2.
Change-Id: Ifa19021060f0d0223234c1ca1109300908e2dda1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175736
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Regina Henschel <rb.henschel@t-online.de>
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/core/tool/compiler.cxx | 3 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index b7b6e1e239aa..a80671e0b3a5 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -1883,6 +1883,7 @@ ScCompiler::ScCompiler( sc::CompileFormulaContext& rCxt, const ScAddress& rPos, maTabNames(rCxt.getTabNames()) { SetGrammar(rCxt.getGrammar()); + m_oODFSavingVersion = rCxt.getODFSavingVersion(); } ScCompiler::ScCompiler( ScDocument& rDocument, const ScAddress& rPos, ScTokenArray& rArr, @@ -3000,7 +3001,7 @@ bool ScCompiler::ParseOpCode( const OUString& rName, bool bInArray ) // Renamed old names, still accept them: { "B", ocB }, // B -> BINOM.DIST.RANGE { "TDIST", ocTDist }, // TDIST -> LEGACY.TDIST - { "EASTERSUNDAY", ocEasterSunday }, // EASTERSUNDAY -> ORG.OPENOFFICE.EASTERSUNDAY + { "ORG.OPENOFFICE.EASTERSUNDAY", ocEasterSunday }, // ORG.OPENOFFICE.EASTERSUNDAY -> EASTERSUNDAY { "ZGZ", ocRRI }, // ZGZ -> RRI { "COLOR", ocColor }, // COLOR -> ORG.LIBREOFFICE.COLOR { "GOALSEEK", ocBackSolver }, // GOALSEEK -> ORG.OPENOFFICE.GOALSEEK diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 21ba6a6aed0c..c30254a9c703 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3214,7 +3214,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) const formula::FormulaGrammar::Grammar eGrammar = pDoc->GetStorageGrammar(); mpCompileFormulaCxt.reset(new sc::CompileFormulaContext(*pDoc, eGrammar)); } - + mpCompileFormulaCxt->setODFSavingVersion(getSaneDefaultVersion()); OUString aFormula = pFormulaCell->GetFormula(*mpCompileFormulaCxt); sal_uInt16 nNamespacePrefix = (mpCompileFormulaCxt->getGrammar() == formula::FormulaGrammar::GRAM_ODFF ? XML_NAMESPACE_OF : XML_NAMESPACE_OOOC); |