formula/inc/core_resource.hrc | 2
formula/source/core/api/FormulaCompiler.cxx | 10
include/formula/FormulaCompiler.hxx | 5
sc/inc/tokenstringcontext.hxx | 11
sc/qa/unit/data/fods/tdf162177_Eastersunday.fods | 303 +++++++++++++++++++++++
sc/qa/unit/subsequent_filters_test5.cxx | 27 ++
sc/source/core/tool/compiler.cxx | 3
sc/source/filter/xml/xmlexprt.cxx | 2
8 files changed, 360 insertions(+), 3 deletions(-)
New commits:
commit c377e211785c799a56cd72a9ecba9611d5993311
Author: Regina Henschel <rb.hensc...@t-online.de>
AuthorDate: Thu Oct 24 22:12:25 2024 +0200
Commit: Regina Henschel <rb.hensc...@t-online.de>
CommitDate: Wed Nov 6 00:55:37 2024 +0100
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.kagan...@collabora.com>
Reviewed-by: Regina Henschel <rb.hensc...@t-online.de>
diff --git a/formula/inc/core_resource.hrc b/formula/inc/core_resource.hrc
index 45e0aa62507d..72acc083c14a 100644
--- a/formula/inc/core_resource.hrc
+++ b/formula/inc/core_resource.hrc
@@ -428,7 +428,7 @@ const std::pair<const char *, int>
RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF[] =
{ "WEEKNUM" , SC_OPCODE_WEEK },
{ "ISOWEEKNUM" , SC_OPCODE_ISOWEEKNUM },
{ "ORG.LIBREOFFICE.WEEKNUM_OOO" , SC_OPCODE_WEEKNUM_OOO },
- { "ORG.OPENOFFICE.EASTERSUNDAY" , SC_OPCODE_EASTERSUNDAY },
+ { "EASTERSUNDAY" , SC_OPCODE_EASTERSUNDAY },
{ "WEEKDAY" , SC_OPCODE_GET_DAY_OF_WEEK },
{ "NETWORKDAYS" , SC_OPCODE_NETWORKDAYS },
{ "COM.MICROSOFT.NETWORKDAYS.INTL" , SC_OPCODE_NETWORKDAYS_MS },
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index 2d192e0bd5f2..e67911f5e573 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -2609,6 +2609,16 @@ const FormulaToken*
FormulaCompiler::CreateStringFromToken( OUStringBuffer& rBuf
else
rBuffer.append( mxSymbols->getSymbol( eOp));
}
+ else if ( eOp == ocEasterSunday)
+ {
+ // EASTERSUNDAY belongs to ODFF since ODF 1.4
+ if (m_oODFSavingVersion.has_value()
+ && m_oODFSavingVersion.value() >= SvtSaveOptions::ODFSVER_012
+ && m_oODFSavingVersion.value() < SvtSaveOptions::ODFSVER_014)
+ rBuffer.append(u"ORG.OPENOFFICE." + mxSymbols->getSymbol(eOp));
+ else
+ rBuffer.append(mxSymbols->getSymbol(eOp));
+ }
else if( static_cast<sal_uInt16>(eOp) < mxSymbols->getSymbolCount())
// Keyword:
rBuffer.append( mxSymbols->getSymbol( eOp));
else
diff --git a/include/formula/FormulaCompiler.hxx
b/include/formula/FormulaCompiler.hxx
index 7e4477b53d6d..793a87245cf0 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -23,6 +23,7 @@
#include <memory>
#include <unordered_map>
#include <vector>
+#include <optional>
#include <com/sun/star/uno/Sequence.hxx>
#include <formula/formuladllapi.h>
@@ -35,6 +36,7 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <tools/debug.hxx>
+#include <unotools/saveopt.hxx>
#define FORMULA_MAXJUMPCOUNT 32 /* maximum number of jumps (ocChoose) */
#define FORMULA_MAXTOKENS 8192 /* maximum number of tokens in formula */
@@ -431,6 +433,9 @@ protected:
std::unordered_set<OUString> aNameSet;
} m_aLambda;
+ // ODF version at time of saving. Set by ScXMLExport::WriteCell().
+ std::optional< SvtSaveOptions::ODFSaneDefaultVersion > m_oODFSavingVersion;
+
public:
enum InitSymbols
{
diff --git a/sc/inc/tokenstringcontext.hxx b/sc/inc/tokenstringcontext.hxx
index d6292e5dcbb5..7421120dd2a6 100644
--- a/sc/inc/tokenstringcontext.hxx
+++ b/sc/inc/tokenstringcontext.hxx
@@ -50,6 +50,8 @@ class SC_DLLPUBLIC CompileFormulaContext
ScDocument& mrDoc;
formula::FormulaGrammar::Grammar meGram;
std::vector<OUString> maTabNames;
+ // Used in FormulaCompiler::CreateStringFromToken(), set by
ScXMLExport::WriteCell()
+ std::optional<SvtSaveOptions::ODFSaneDefaultVersion> m_oODFSavingVersion;
void updateTabNames();
@@ -60,6 +62,15 @@ public:
formula::FormulaGrammar::Grammar getGrammar() const { return meGram; }
void setGrammar(formula::FormulaGrammar::Grammar eGram);
+ void setODFSavingVersion(SvtSaveOptions::ODFSaneDefaultVersion
eDefaultVersion)
+ {
+ m_oODFSavingVersion = eDefaultVersion;
+ }
+ std::optional<SvtSaveOptions::ODFSaneDefaultVersion> getODFSavingVersion()
+ {
+ return m_oODFSavingVersion;
+ }
+
const std::vector<OUString>& getTabNames() const { return maTabNames; }
ScDocument& getDoc() { return mrDoc; }
diff --git a/sc/qa/unit/data/fods/tdf162177_Eastersunday.fods
b/sc/qa/unit/data/fods/tdf162177_Eastersunday.fods
new file mode 100644
index 000000000000..ed4a1bf6fe75
--- /dev/null
+++ b/sc/qa/unit/data/fods/tdf162177_Eastersunday.fods
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<office:document
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:ooow="http://openoffice.org/200
4/writer" xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:tableooo="http://openoffice.org/2009/table";
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:drawooo="http://openoffice.org/2010/draw";
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns
:css3t="http://www.w3.org/TR/css3-text/";
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
office:version="1.3"
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ <office:meta><meta:initial-creator>Regina
Henschel</meta:initial-creator><meta:creation-date>2024-10-29T11:43:18.649000000</meta:creation-date><dc:date>2024-10-29T11:45:07.934000000</dc:date><dc:creator>Regina
Henschel</dc:creator><meta:editing-duration>PT1M49S</meta:editing-duration><meta:editing-cycles>1</meta:editing-cycles><meta:generator>LibreOffice_7.6.7/7.6.7.2$Windows_X86_64
LibreOffice_project/dd47e4b30cb7dab30588d6c79c651f218165e3c5</meta:generator><meta:document-statistic
meta:table-count="1" meta:cell-count="1" meta:object-count="0"/></office:meta>
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop"
config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft"
config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth"
config:type="int">2258</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight"
config:type="int">452</config:config-item>
+ <config:config-item-map-indexed config:name="Views">
+ <config:config-item-map-entry>
+ <config:config-item config:name="ViewId"
config:type="string">view1</config:config-item>
+ <config:config-item-map-named config:name="Tables">
+ <config:config-item-map-entry config:name="Sheet1">
+ <config:config-item config:name="CursorPositionX"
config:type="int">0</config:config-item>
+ <config:config-item config:name="CursorPositionY"
config:type="int">0</config:config-item>
+ <config:config-item config:name="ActiveSplitRange"
config:type="short">2</config:config-item>
+ <config:config-item config:name="PositionLeft"
config:type="int">0</config:config-item>
+ <config:config-item config:name="PositionRight"
config:type="int">0</config:config-item>
+ <config:config-item config:name="PositionTop"
config:type="int">0</config:config-item>
+ <config:config-item config:name="PositionBottom"
config:type="int">0</config:config-item>
+ <config:config-item config:name="ZoomType"
config:type="short">0</config:config-item>
+ <config:config-item config:name="ZoomValue"
config:type="int">100</config:config-item>
+ <config:config-item config:name="PageViewZoomValue"
config:type="int">60</config:config-item>
+ <config:config-item config:name="ShowGrid"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="AnchoredTextOverflowLegacy"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="LegacySingleLineFontwork"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ConnectorUseSnapRect"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IgnoreBreakAfterMultilineField"
config:type="boolean">false</config:config-item>
+ </config:config-item-map-entry>
+ </config:config-item-map-named>
+ <config:config-item config:name="ActiveTable"
config:type="string">Sheet1</config:config-item>
+ <config:config-item config:name="HorizontalScrollbarWidth"
config:type="int">1253</config:config-item>
+ <config:config-item config:name="ZoomType"
config:type="short">0</config:config-item>
+ <config:config-item config:name="ZoomValue"
config:type="int">100</config:config-item>
+ <config:config-item config:name="PageViewZoomValue"
config:type="int">60</config:config-item>
+ <config:config-item config:name="ShowPageBreakPreview"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ShowZeroValues"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="ShowNotes"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="ShowFormulasMarks"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ShowGrid"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="GridColor"
config:type="int">12632256</config:config-item>
+ <config:config-item config:name="ShowPageBreaks"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="FormulaBarHeight"
config:type="short">1</config:config-item>
+ <config:config-item config:name="HasSheetTabs"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsOutlineSymbolsSet"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsValueHighlightingEnabled"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsSnapToRaster"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="RasterIsVisible"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="RasterResolutionX"
config:type="int">1000</config:config-item>
+ <config:config-item config:name="RasterResolutionY"
config:type="int">1000</config:config-item>
+ <config:config-item config:name="RasterSubdivisionX"
config:type="int">1</config:config-item>
+ <config:config-item config:name="RasterSubdivisionY"
config:type="int">1</config:config-item>
+ <config:config-item config:name="IsRasterAxisSynchronized"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="AnchoredTextOverflowLegacy"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="LegacySingleLineFontwork"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ConnectorUseSnapRect"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IgnoreBreakAfterMultilineField"
config:type="boolean">false</config:config-item>
+ </config:config-item-map-entry>
+ </config:config-item-map-indexed>
+ </config:config-item-set>
+ <config:config-item-set config:name="ooo:configuration-settings">
+ <config:config-item config:name="AllowPrintJobCancel"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="ApplyUserData"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="AutoCalculate"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="CharacterCompressionType"
config:type="short">0</config:config-item>
+ <config:config-item config:name="EmbedAsianScriptFonts"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="EmbedComplexScriptFonts"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="EmbedFonts"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="EmbedLatinScriptFonts"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="EmbedOnlyUsedFonts"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="GridColor"
config:type="int">12632256</config:config-item>
+ <config:config-item config:name="HasColumnRowHeaders"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="HasSheetTabs"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="ImagePreferredDPI"
config:type="int">0</config:config-item>
+ <config:config-item config:name="IsDocumentShared"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsKernAsianPunctuation"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsOutlineSymbolsSet"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsRasterAxisSynchronized"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsSnapToRaster"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="LinkUpdateMode"
config:type="short">3</config:config-item>
+ <config:config-item config:name="LoadReadonly"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrinterName" config:type="string"/>
+ <config:config-item config:name="PrinterPaperFromSetup"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrinterSetup" config:type="base64Binary"/>
+ <config:config-item config:name="RasterIsVisible"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="RasterResolutionX"
config:type="int">1000</config:config-item>
+ <config:config-item config:name="RasterResolutionY"
config:type="int">1000</config:config-item>
+ <config:config-item config:name="RasterSubdivisionX"
config:type="int">1</config:config-item>
+ <config:config-item config:name="RasterSubdivisionY"
config:type="int">1</config:config-item>
+ <config:config-item config:name="SaveThumbnail"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="SaveVersionOnClose"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ShowFormulasMarks"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ShowGrid"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="ShowNotes"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="ShowPageBreaks"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="ShowZeroValues"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="SyntaxStringRef"
config:type="short">2</config:config-item>
+ <config:config-item config:name="UpdateFromTemplate"
config:type="boolean">true</config:config-item>
+ <config:config-item-map-named config:name="ScriptConfiguration">
+ <config:config-item-map-entry config:name="Sheet1">
+ <config:config-item config:name="CodeName"
config:type="string">Sheet1</config:config-item>
+ </config:config-item-map-entry>
+ </config:config-item-map-named>
+ </config:config-item-set>
+ </office:settings>
+ <office:scripts>
+ <office:script script:language="ooo:Basic">
+ <ooo:libraries xmlns:ooo="http://openoffice.org/2004/office";
xmlns:xlink="http://www.w3.org/1999/xlink";>
+ <ooo:library-embedded ooo:name="Standard"/>
+ </ooo:libraries>
+ </office:script>
+ </office:scripts>
+ <office:font-face-decls>
+ <style:font-face style:name="Liberation Sans"
svg:font-family="'Liberation Sans'" style:font-family-generic="swiss"
style:font-pitch="variable"/>
+ <style:font-face style:name="Lucida Sans" svg:font-family="'Lucida
Sans'" style:font-family-generic="system" style:font-pitch="variable"/>
+ <style:font-face style:name="Microsoft YaHei"
svg:font-family="'Microsoft YaHei'"
style:font-family-generic="system" style:font-pitch="variable"/>
+ </office:font-face-decls>
+ <office:styles>
+ <style:default-style style:family="table-cell">
+ <style:paragraph-properties style:tab-stop-distance="1.25cm"/>
+ <style:text-properties style:font-name="Liberation Sans"
fo:font-size="10pt" fo:language="de" fo:country="DE"
style:font-name-asian="Microsoft YaHei" style:font-size-asian="10pt"
style:language-asian="zh" style:country-asian="CN"
style:font-name-complex="Lucida Sans" style:font-size-complex="10pt"
style:language-complex="hi" style:country-complex="IN"/>
+ </style:default-style>
+ <style:default-style style:family="graphic">
+ <style:graphic-properties svg:stroke-color="#3465a4"
draw:fill-color="#729fcf" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.3cm"
draw:shadow-offset-y="0.3cm" style:writing-mode="page"/>
+ <style:paragraph-properties style:text-autospace="ideograph-alpha"
style:punctuation-wrap="simple" style:line-break="strict"
style:writing-mode="page" style:font-independent-line-spacing="false">
+ <style:tab-stops/>
+ </style:paragraph-properties>
+ <style:text-properties style:use-window-font-color="true"
loext:opacity="0%" fo:font-family="'Liberation Serif'"
style:font-family-generic="roman" style:font-pitch="variable"
fo:font-size="12pt" fo:language="de" fo:country="DE"
style:letter-kerning="true" style:font-family-asian="'Segoe UI'"
style:font-family-generic-asian="system" style:font-pitch-asian="variable"
style:font-size-asian="12pt" style:language-asian="zh" style:country-asian="CN"
style:font-family-complex="Tahoma" style:font-family-generic-complex="system"
style:font-pitch-complex="variable" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN"/>
+ </style:default-style>
+ <style:style style:name="Default" style:family="graphic"/>
+ <style:style style:name="Note" style:family="graphic"
style:parent-style-name="Default">
+ <style:graphic-properties draw:stroke="solid"
draw:marker-start="Arrowheads_20_1" draw:marker-start-width="0.2cm"
draw:marker-start-center="false" draw:fill="solid" draw:fill-color="#ffffc0"
draw:auto-grow-height="true" draw:auto-grow-width="false"
fo:padding-top="0.1cm" fo:padding-bottom="0.1cm" fo:padding-left="0.1cm"
fo:padding-right="0.1cm" draw:shadow="visible" draw:shadow-offset-x="0.1cm"
draw:shadow-offset-y="0.1cm"/>
+ <style:text-properties style:font-name="Liberation Sans"
fo:font-family="'Liberation Sans'" style:font-family-generic="swiss"
style:font-pitch="variable" fo:font-size="10pt"
style:font-name-asian="Microsoft YaHei"
style:font-family-asian="'Microsoft YaHei'"
style:font-family-generic-asian="system" style:font-pitch-asian="variable"
style:font-size-asian="10pt" style:font-name-complex="Lucida Sans"
style:font-family-complex="'Lucida Sans'"
style:font-family-generic-complex="system" style:font-pitch-complex="variable"
style:font-size-complex="10pt"/>
+ </style:style>
+ <number:number-style style:name="N0">
+ <number:number number:min-integer-digits="1"/>
+ </number:number-style>
+ <style:style style:name="Default" style:family="table-cell"/>
+ <style:style style:name="Heading" style:family="table-cell"
style:parent-style-name="Default">
+ <style:table-cell-properties fo:wrap-option="no-wrap"
style:shrink-to-fit="false"/>
+ <style:text-properties fo:color="#000000" fo:font-size="24pt"
fo:font-style="normal" fo:font-weight="bold" style:font-size-asian="24pt"
style:font-style-asian="normal" style:font-weight-asian="bold"
style:font-size-complex="24pt" style:font-style-complex="normal"
style:font-weight-complex="bold"/>
+ </style:style>
+ <style:style style:name="Heading_20_1" style:display-name="Heading 1"
style:family="table-cell" style:parent-style-name="Heading">
+ <style:table-cell-properties fo:wrap-option="no-wrap"
style:shrink-to-fit="false"/>
+ <style:text-properties fo:font-size="18pt" style:font-size-asian="18pt"
style:font-size-complex="18pt"/>
+ </style:style>
+ <style:style style:name="Heading_20_2" style:display-name="Heading 2"
style:family="table-cell" style:parent-style-name="Heading">
+ <style:table-cell-properties fo:wrap-option="no-wrap"
style:shrink-to-fit="false"/>
+ <style:text-properties fo:font-size="12pt" style:font-size-asian="12pt"
style:font-size-complex="12pt"/>
+ </style:style>
+ <style:style style:name="Text" style:family="table-cell"
style:parent-style-name="Default">
+ <style:table-cell-properties fo:wrap-option="no-wrap"
style:shrink-to-fit="false"/>
+ </style:style>
+ <style:style style:name="Note" style:family="table-cell"
style:parent-style-name="Text">
+ <style:table-cell-properties fo:background-color="#ffffcc"
style:diagonal-bl-tr="none" style:diagonal-tl-br="none"
fo:wrap-option="no-wrap" fo:border="0.74pt solid #808080"
style:shrink-to-fit="false"/>
+ <style:text-properties fo:color="#333333"/>
+ </style:style>
+ <style:style style:name="Footnote" style:family="table-cell"
style:parent-style-name="Text">
+ <style:table-cell-properties fo:wrap-option="no-wrap"
style:shrink-to-fit="false"/>
+ <style:text-properties fo:color="#808080" fo:font-style="italic"
style:font-style-asian="italic" style:font-style-complex="italic"/>
+ </style:style>
+ <style:style style:name="Hyperlink" style:family="table-cell"
style:parent-style-name="Text">
+ <style:table-cell-properties fo:wrap-option="no-wrap"
style:shrink-to-fit="false"/>
+ <style:text-properties fo:color="#0000ee"
style:text-underline-style="solid" style:text-underline-width="auto"
style:text-underline-color="#0000ee"/>
+ </style:style>
+ <style:style style:name="Status" style:family="table-cell"
style:parent-style-name="Default">
+ <style:table-cell-properties fo:wrap-option="no-wrap"
style:shrink-to-fit="false"/>
+ </style:style>
+ <style:style style:name="Good" style:family="table-cell"
style:parent-style-name="Status">
+ <style:table-cell-properties fo:background-color="#ccffcc"
fo:wrap-option="no-wrap" style:shrink-to-fit="false"/>
+ <style:text-properties fo:color="#006600"/>
+ </style:style>
+ <style:style style:name="Neutral" style:family="table-cell"
style:parent-style-name="Status">
+ <style:table-cell-properties fo:background-color="#ffffcc"
fo:wrap-option="no-wrap" style:shrink-to-fit="false"/>
+ <style:text-properties fo:color="#996600"/>
+ </style:style>
+ <style:style style:name="Bad" style:family="table-cell"
style:parent-style-name="Status">
+ <style:table-cell-properties fo:background-color="#ffcccc"
fo:wrap-option="no-wrap" style:shrink-to-fit="false"/>
+ <style:text-properties fo:color="#cc0000"/>
+ </style:style>
+ <style:style style:name="Warning" style:family="table-cell"
style:parent-style-name="Status">
+ <style:table-cell-properties fo:wrap-option="no-wrap"
style:shrink-to-fit="false"/>
+ <style:text-properties fo:color="#cc0000"/>
+ </style:style>
+ <style:style style:name="Error" style:family="table-cell"
style:parent-style-name="Status">
+ <style:table-cell-properties fo:background-color="#cc0000"
fo:wrap-option="no-wrap" style:shrink-to-fit="false"/>
+ <style:text-properties fo:color="#ffffff" fo:font-weight="bold"
style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+ </style:style>
+ <style:style style:name="Accent" style:family="table-cell"
style:parent-style-name="Default">
+ <style:table-cell-properties fo:wrap-option="no-wrap"
style:shrink-to-fit="false"/>
+ <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold"
style:font-weight-complex="bold"/>
+ </style:style>
+ <style:style style:name="Accent_20_1" style:display-name="Accent 1"
style:family="table-cell" style:parent-style-name="Accent">
+ <style:table-cell-properties fo:background-color="#000000"
fo:wrap-option="no-wrap" style:shrink-to-fit="false"/>
+ <style:text-properties fo:color="#ffffff"/>
+ </style:style>
+ <style:style style:name="Accent_20_2" style:display-name="Accent 2"
style:family="table-cell" style:parent-style-name="Accent">
+ <style:table-cell-properties fo:background-color="#808080"
fo:wrap-option="no-wrap" style:shrink-to-fit="false"/>
+ <style:text-properties fo:color="#ffffff"/>
+ </style:style>
+ <style:style style:name="Accent_20_3" style:display-name="Accent 3"
style:family="table-cell" style:parent-style-name="Accent">
+ <style:table-cell-properties fo:background-color="#dddddd"
fo:wrap-option="no-wrap" style:shrink-to-fit="false"/>
+ </style:style>
+ <style:style style:name="Result" style:family="table-cell"
style:parent-style-name="Default">
+ <style:table-cell-properties fo:wrap-option="no-wrap"
style:shrink-to-fit="false"/>
+ <style:text-properties fo:font-style="italic"
style:text-underline-style="solid" style:text-underline-width="auto"
style:text-underline-color="font-color" fo:font-weight="bold"
style:font-style-asian="italic" style:font-weight-asian="bold"
style:font-style-complex="italic" style:font-weight-complex="bold"/>
+ </style:style>
+ <draw:marker draw:name="Arrowheads_20_1" draw:display-name="Arrowheads 1"
svg:viewBox="0 0 20 30" svg:d="M10 0l-10 30h20z"/>
+ </office:styles>
+ <office:automatic-styles>
+ <style:style style:name="co1" style:family="table-column">
+ <style:table-column-properties fo:break-before="auto"
style:column-width="2.258cm"/>
+ </style:style>
+ <style:style style:name="ro1" style:family="table-row">
+ <style:table-row-properties style:row-height="0.452cm"
fo:break-before="auto" style:use-optimal-row-height="true"/>
+ </style:style>
+ <style:style style:name="ta1" style:family="table"
style:master-page-name="Default">
+ <style:table-properties table:display="true" style:writing-mode="lr-tb"/>
+ </style:style>
+ <number:number-style style:name="N2">
+ <number:number number:decimal-places="2" number:min-decimal-places="2"
number:min-integer-digits="1"/>
+ </number:number-style>
+ <number:date-style style:name="N37" number:automatic-order="true">
+ <number:day number:style="long"/>
+ <number:text>.</number:text>
+ <number:month number:style="long"/>
+ <number:text>.</number:text>
+ <number:year/>
+ </number:date-style>
+ <style:style style:name="ce1" style:family="table-cell"
style:parent-style-name="Default" style:data-style-name="N37"/>
+ <style:page-layout style:name="pm1">
+ <style:page-layout-properties style:writing-mode="lr-tb"/>
+ <style:header-style>
+ <style:header-footer-properties fo:min-height="0.75cm"
fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-bottom="0.25cm"/>
+ </style:header-style>
+ <style:footer-style>
+ <style:header-footer-properties fo:min-height="0.75cm"
fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.25cm"/>
+ </style:footer-style>
+ </style:page-layout>
+ <style:page-layout style:name="pm2">
+ <style:page-layout-properties style:writing-mode="lr-tb"/>
+ <style:header-style>
+ <style:header-footer-properties fo:min-height="0.75cm"
fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-bottom="0.25cm"
fo:border="1.5pt solid #000000" fo:padding="0.018cm"
fo:background-color="#c0c0c0">
+ <style:background-image/>
+ </style:header-footer-properties>
+ </style:header-style>
+ <style:footer-style>
+ <style:header-footer-properties fo:min-height="0.75cm"
fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.25cm"
fo:border="1.5pt solid #000000" fo:padding="0.018cm"
fo:background-color="#c0c0c0">
+ <style:background-image/>
+ </style:header-footer-properties>
+ </style:footer-style>
+ </style:page-layout>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page style:name="Default" style:page-layout-name="pm1">
+ <style:header>
+ <text:p><text:sheet-name>???</text:sheet-name></text:p>
+ </style:header>
+ <style:header-left style:display="false"/>
+ <style:header-first style:display="false"/>
+ <style:footer>
+ <text:p>Page <text:page-number>1</text:page-number></text:p>
+ </style:footer>
+ <style:footer-left style:display="false"/>
+ <style:footer-first style:display="false"/>
+ </style:master-page>
+ <style:master-page style:name="Report" style:page-layout-name="pm2">
+ <style:header>
+ <style:region-left>
+
<text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p>
+ </style:region-left>
+ <style:region-right>
+ <text:p><text:date style:data-style-name="N2"
text:date-value="2024-10-29">00.00.0000</text:date>,
<text:time>00:00:00</text:time></text:p>
+ </style:region-right>
+ </style:header>
+ <style:header-left style:display="false"/>
+ <style:header-first style:display="false"/>
+ <style:footer>
+ <text:p>Page <text:page-number>1</text:page-number><text:s/>/
<text:page-count>99</text:page-count></text:p>
+ </style:footer>
+ <style:footer-left style:display="false"/>
+ <style:footer-first style:display="false"/>
+ </style:master-page>
+ </office:master-styles>
+ <office:body>
+ <office:spreadsheet>
+ <table:calculation-settings table:case-sensitive="false"
table:search-criteria-must-apply-to-whole-cell="false"
table:automatic-find-labels="false" table:use-regular-expressions="false"
table:use-wildcards="true">
+ <table:iteration table:maximum-difference="0.0001"/>
+ </table:calculation-settings>
+ <table:table table:name="Sheet1" table:style-name="ta1">
+ <table:table-column table:style-name="co1"
table:default-cell-style-name="ce1"/>
+ <table:table-row table:style-name="ro1">
+ <table:table-cell table:formula="of:=ORG.OPENOFFICE.EASTERSUNDAY(2024)"
office:value-type="date" office:date-value="2024-03-31"
calcext:value-type="date">
+ <text:p>31.03.24</text:p>
+ </table:table-cell>
+ </table:table-row>
+ </table:table>
+ <table:named-expressions/>
+ </office:spreadsheet>
+ </office:body>
+</office:document>
\ No newline at end of file
diff --git a/sc/qa/unit/subsequent_filters_test5.cxx
b/sc/qa/unit/subsequent_filters_test5.cxx
index a4ff94307c6b..a49945bb1032 100644
--- a/sc/qa/unit/subsequent_filters_test5.cxx
+++ b/sc/qa/unit/subsequent_filters_test5.cxx
@@ -108,6 +108,33 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest5, testTdf162963_ODF)
0);
}
+CPPUNIT_TEST_FIXTURE(ScFiltersTest5, testTdf162177_EastersundayODF14)
+{
+ // EASTERSUNDAY was added to ODFF in ODF 1.4. LibreOffice has written it as
+ // ORG.OPENOFFICE.EASTERSUNDAY for ODF 1.2 and ODF 1.3.
+ Resetter resetter([]() {
SetODFDefaultVersion(SvtSaveOptions::ODFVER_LATEST); });
+ createScDoc("fods/tdf162177_Eastersunday.fods");
+
+ // File has it as ORG.OPENOFFICE.EASTERSUNDAY in ODF 1.3. Test, that it is
read correctly.
+ ScDocument* pDoc = getScDoc();
+ OUString aFormula = pDoc->GetFormula(0, 0, 0);
+ CPPUNIT_ASSERT_EQUAL(u"=EASTERSUNDAY(2024)"_ustr, aFormula);
+
+ // Verify that saving to ODF1.3 produces ORG.OPENOFFICE.EASTERSUNDAY
+ SetODFDefaultVersion(SvtSaveOptions::ODFDefaultVersion::ODFVER_013);
+ save(u"calc8"_ustr); // this saves to .ods not to .fods
+ xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr);
+ const OString sPath =
"/office:document-content/office:body/office:spreadsheet/table:table/"
+ "table:table-row/table:table-cell"_ostr;
+ assertXPath(pXmlDoc, sPath, "formula",
u"of:=ORG.OPENOFFICE.EASTERSUNDAY(2024)");
+
+ // Verify that saving to ODF1.4 produces EASTERSUNDAY
+ SetODFDefaultVersion(SvtSaveOptions::ODFDefaultVersion::ODFVER_014);
+ save(u"calc8"_ustr); // this saves to .ods not to .fods
+ pXmlDoc = parseExport(u"content.xml"_ustr);
+ assertXPath(pXmlDoc, sPath, "formula", u"of:=EASTERSUNDAY(2024)");
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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);
