summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2020-06-02 14:15:14 +0200
committerMiklos Vajna <vmiklos@collabora.com>2021-01-06 11:15:22 +0100
commit4e7ab90a0a1380b3ec618306c434373b56f2d67b (patch)
tree86a14d3fbc6745a33de4f8bb3dcf1299099f3c41
parenta8fac83b0719f2bc70d5a68a6db570af78017916 (diff)
tdf#133555 xmloff: ODF export: don't produce text:drop-down in ODF 1.2
This was added in ODF 1.3 as OFFICE-3881, but it's actually ancient and was written by OOo 2 already, just somehow forgotten to add it to ODF. Change-Id: I322fac471c940334f886a7c61769922ae03ee89b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95359 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108791 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
-rw-r--r--xmloff/source/text/txtflde.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 76b08ddc61fe..60388d88d4ba 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -1861,6 +1861,11 @@ void XMLTextFieldExport::ExportFieldHelper(
case FIELD_ID_DROP_DOWN:
{
+ // tdf#133555 don't export in strict ODF versions that don't have it
+ if (GetExport().getSaneDefaultVersion() <= SvtSaveOptions::ODFSVER_012)
+ {
+ break;
+ }
ProcessString(XML_NAME, GetStringProperty(gsPropertyName, rPropSet));
ProcessString(XML_HELP,
GetStringProperty(gsPropertyHelp, rPropSet), true);