[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - xmloff/source

Michael Stahl (via logerrit) logerrit at kemper.freedesktop.org
Wed Jan 6 10:15:57 UTC 2021


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

New commits:
commit 4e7ab90a0a1380b3ec618306c434373b56f2d67b
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Jun 2 14:15:14 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Jan 6 11:15:22 2021 +0100

    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>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108791
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

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


More information about the Libreoffice-commits mailing list