summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2020-06-02 14:15:14 +0200
committerMichael Stahl <michael.stahl@cib.de>2020-06-03 12:53:57 +0200
commit02b577f2f2f8bfea144ad156a55eec6e2b06ad7b (patch)
tree9c9b6d55ca714ab901c7aa013fedfc0e3cd4f063 /xmloff
parentadf34e587b6373f17bf122d3d810fdae89a7c7dd (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> (cherry picked from commit d5b290dea1c8a8088b654ba8364906922b4c3a43) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95321 Tested-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'xmloff')
-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 20f92eca2640..61396f58ce2a 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -1862,6 +1862,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);