include/unotools/saveopt.hxx | 2 ++
schema/libreoffice/OpenDocument-v1.4+libreoffice-schema.rng | 1 +
unotools/source/config/saveopt.cxx | 2 ++
xmloff/source/core/xmlexp.cxx | 1 +
4 files changed, 6 insertions(+)
New commits:
commit a36e806c21108af3a6985625c983265ba8404930
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Sep 2 16:54:18 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Sep 24 14:49:55 2024 +0200
ODF 1.4: Add ODFVER_014 and ODFSVER_014
Change-Id: I0aa1b6a1f9eec3932b76f5ad0649c462884ffa68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172767
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Jenkins
diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx
index 9cd6367615bd..222b4b78fe9f 100644
--- a/include/unotools/saveopt.hxx
+++ b/include/unotools/saveopt.hxx
@@ -44,6 +44,7 @@ namespace SvtSaveOptions
ODFVER_012_EXT_COMPAT = 8, // ODF 1.2 extended, but with compatibility
fallbacks
ODFVER_012_EXTENDED = 9, // ODF 1.2 extended
ODFVER_013 = 10, // ODF 1.3
+ ODFVER_014 = 11, // ODF 1.4
ODFVER_LATEST = SAL_MAX_ENUM, // ODF latest version with
enhancements
};
@@ -59,6 +60,7 @@ namespace SvtSaveOptions
ODFSVER_012_EXTENDED = 11, ///< ODF 1.2 extended
ODFSVER_013 = 12, ///< ODF 1.3
ODFSVER_013_EXTENDED = 13, ///< ODF 1.3 extended
+ ODFSVER_014 = 14, ///< ODF 1.4
ODFSVER_FUTURE_EXTENDED = 1000 | ODFSVER_EXTENDED, ///< current
extension, unknown future ODF version
// The latest defined standard. Adapt when a new one is published.
diff --git a/schema/libreoffice/OpenDocument-v1.4+libreoffice-schema.rng
b/schema/libreoffice/OpenDocument-v1.4+libreoffice-schema.rng
index 686ba7981b1b..eeaeda439504 100644
--- a/schema/libreoffice/OpenDocument-v1.4+libreoffice-schema.rng
+++ b/schema/libreoffice/OpenDocument-v1.4+libreoffice-schema.rng
@@ -48,6 +48,7 @@
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
<rng:attribute name="office:version">
<!-- FIXME remove this hack once we write 1.3 -->
<rng:choice>
+ <rng:value>1.4</rng:value>
<rng:value>1.3</rng:value>
<rng:value>1.2</rng:value>
</rng:choice>
diff --git a/unotools/source/config/saveopt.cxx
b/unotools/source/config/saveopt.cxx
index 42e52bb2147f..7623d8acca35 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -84,6 +84,8 @@ SvtSaveOptions::ODFSaneDefaultVersion
GetODFSaneDefaultVersion(SvtSaveOptions::O
return SvtSaveOptions::ODFSVER_012_EXTENDED;
case SvtSaveOptions::ODFVER_013:
return SvtSaveOptions::ODFSVER_013;
+ case SvtSaveOptions::ODFVER_014:
+ return SvtSaveOptions::ODFSVER_014;
}
return SvtSaveOptions::ODFSVER_LATEST_EXTENDED;
}
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 895386726c2a..aecf57d1b9a9 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1212,6 +1212,7 @@ auto SvXMLExport::GetODFVersionAttributeValue() const ->
char const*
char const* pVersion(nullptr);
switch (getSaneDefaultVersion())
{
+ case SvtSaveOptions::ODFSVER_014: pVersion = "1.4"; break;
case SvtSaveOptions::ODFSVER_013_EXTENDED: [[fallthrough]];
case SvtSaveOptions::ODFSVER_013: pVersion = "1.3"; break;
case SvtSaveOptions::ODFSVER_012_EXTENDED: [[fallthrough]];
