Mike Kaganski
be205bb214
Carry the GraphicClipPolyPolygon UNO property on graphic-object shapes through ODF save/reload as a new <coext:graphic-clip-poly> child of <draw:frame> with the polygon serialised as svg:d (the same SVG d-path encoding draw:path uses). A new XML_GRAPHIC_CLIP_POLY token is added in lockstep across xmltoken.hxx, xmltoken.cxx, and tokens.txt so the XMLTokenEnum and FastParser tables stay aligned. The element is taken before the frame decides what its shape child is, and applied when the frame ends: an empty presentation object has no draw:image for the polygon to follow, so the polygon comes first and the shape it belongs on does not exist until then. A placeholder saved to ODF came back unclipped otherwise, which is the shape of file our own save writes. It goes on the image the frame keeps, which is not always the last one it saw: a frame with a replacement image holds several, and the ones that lose are taken off the page and disposed. Export goes through a new ImpExportGraphicClipPoly helper called from ImpExportGraphicObjectShape alongside ImpExportSignatureLine and ImpExportQRCode (under ODFSVER_EXTENDED). Import is handled in SdXMLFrameShapeContext::createFastChildContext, which is where <draw:frame> children land - the GraphicObjectShape sub-context is nested inside that and never sees this sibling directly. The element is added to the extended ODF schema next to loext-signatureline and loext-qrcode, so a document carrying it validates, and is listed in the Collabora ODF extensions notes. Signed-off-by: Mike Kaganski <mike.kaganski@collabora.com> Change-Id: Ib9ae65c1b6f2d8fdb28ae086fd7e2be2f8a8ee24 Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/9191 Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> Tested-by: Jenkins CPCI <releng@collaboraoffice.com> (cherry picked from commit b7a56041afda6b658b6b16bb51a5939295c40d75) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/210122 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Schemas for Validating ODF Files
Schemas that can be used for validating ODF files
subdirs:
mathml2: W3C MathML 2.0 XML Schema (needed for Math embedded objects)odf1.0,odf1.1,odf1.2: official OASIS RelaxNG schemasodf1.3: current OASIS draft ODF 1.3 RelaxNG schemalibreoffice: draft ODF schema, with additional LO extensions
The extension schema in libreoffice/ is used by all unit tests if
--with-export-validation is given, which is the default.
Notably this means that if you add a new feature to the ODF filters and you add the required unit test for the new feature, then most likely the test will fail with a complaint from the validator; in this case the schema needs to be updated to contain the new elements and attributes.
The extension schema uses the RelaxNG "include" feature to refer to the ODF
schema; this means that it only contains those parts of the schema that
actually need to be changed - this works well in many cases because the ODF
schema is quite well structured with many named patterns, but unfortunately
there are a few places where that isn't the case and large chunks needed to be
copied to override them.
In the easy case, to add an attribute you just want to search for the
corresponding element, which will have a "foo-attlist" named pattern, and then
add another attribute like this:
<rng:define name="draw-enhanced-geometry-attlist" combine="interleave"> rng:optional <rng:attribute name="drawooo:sub-view-size"> <rng:ref name="string"/> </rng:attribute> </rng:optional> </rng:define>
Currently only the features that are actually exported in the unit tests have been added to the schema; there is still some work to do here to add everything; the crashtesting script also does ODF validation of all files and now also uses the custom schema.
Unfortunately it turned out that there are a lot of extensions already for which no proposal exists [1], and in many cases not even an entry on the Wiki [2], so clearly something like this extension schema is needed.
[1] git grep TODO schema/libreoffice