schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng | 7 +------ xmloff/source/text/txtparae.cxx | 7 ------- 2 files changed, 1 insertion(+), 13 deletions(-)
New commits: commit 1e7cab690d238f8e644e28a3de54c4deeec12a23 Author: Michael Stahl <michael.st...@allotropia.de> AuthorDate: Wed Jul 5 17:09:05 2023 +0200 Commit: Michael Stahl <michael.st...@allotropia.de> CommitDate: Thu Jul 6 09:29:16 2023 +0200 xmloff: ODF export: stop producing decorative on draw:frame etc. The attribute was moved to the style graphic-properties in commit 2721520ca37654056c3d509657c50ee42e3dcae4, which is in 7.5.2 so users likely have upgraded from 7.5.0/7.5.1 and this can be removed now. Change-Id: I69ef3e2e501af21f04df440bf176e46f651d671b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154074 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@allotropia.de> diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng index 6bb2c6972b7c..65023b2f47ff 100644 --- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng +++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng @@ -3550,12 +3550,6 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1. </rng:define> <rng:define name="draw-frame-attlist" combine="interleave"> - <!-- https://issues.oasis-open.org/browse/OFFICE-4136 --> - <rng:optional> - <rng:attribute name="loext:decorative"> - <rng:ref name="boolean"/> - </rng:attribute> - </rng:optional> <!-- TODO(vmiklos) no proposal for multi-page floating tables --> <rng:optional> <rng:attribute name="loext:may-break-between-pages"> @@ -3565,6 +3559,7 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1. </rng:define> <rng:define name="style-graphic-properties-attlist" combine="interleave"> + <!-- https://issues.oasis-open.org/browse/OFFICE-4142 --> <rng:optional> <rng:attribute name="loext:decorative"> <rng:ref name="boolean"/> diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 3591e4c41c02..ee609884eb3b 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -3143,13 +3143,6 @@ XMLShapeExportFlags XMLTextParagraphExport::addTextFrameAttributes( } } - // TODO remove - if (xPropSetInfo->hasPropertyByName("Decorative") - && rPropSet->getPropertyValue("Decorative").get<bool>()) - { - GetExport().AddAttribute(XML_NAMESPACE_LO_EXT, XML_DECORATIVE, XML_TRUE); - } - if (xPropSetInfo->hasPropertyByName("IsSplitAllowed") && rPropSet->getPropertyValue("IsSplitAllowed").get<bool>()) {