[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - xmloff/source

[Michael Stahl (via logerrit)]

 xmloff/source/text/txtflde.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 02b577f2f2f8bfea144ad156a55eec6e2b06ad7b
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Jun 2 14:15:14 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed Jun 3 12:53:57 2020 +0200

    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 at cib.de>
    (cherry picked from commit d5b290dea1c8a8088b654ba8364906922b4c3a43)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95321
    Tested-by: Michael Stahl <michael.stahl at cib.de>

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);