editengine-columns: ODF support [API CHANGE]

Desktop / LibreOffice - Mike Kaganski [collabora.com] - 8 June 2021 12:50 UTC

This uses existing ODF markup, as used by Writer's text frame: style::columns child element of style:graphic-properties, its fo:column-count and fo:column-gap attributes. No ODF extension is required.

Since currently only columns with same width and spacing are implemented, without additional settings, style:column child elements are exported, but ignored on import.

This adds new property to css::drawing::TextProperties service: TextColumns (of type css::text::XTextColumns).

Change-Id: I7e63293e5814b281ceec8a9632e696322d3629e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116035

95ebd24a629b editengine-columns: ODF support [API CHANGE]
include/svl/solar.hrc | 2 +-
include/svx/SvxXTextColumns.hxx | 22 ++
include/svx/svdotext.hxx | 4 +
include/svx/unoshprp.hxx | 6 +-
offapi/com/sun/star/drawing/TextProperties.idl | 8 +
sd/qa/unit/data/odg/two_columns.odg | Bin 0 -> 14726 bytes
sd/qa/unit/export-tests.cxx | 69 +++++
sd/source/core/stlsheet.cxx | 13 +
svx/Library_svxcore.mk | 1 +
svx/source/svdraw/svdotext.cxx | 20 ++
svx/source/unodraw/SvxXTextColumns.cxx | 325 ++++++++++++++++++++++
svx/source/unodraw/unomod.cxx | 5 +
svx/source/unodraw/unopool.cxx | 7 +
svx/source/unodraw/unoshape.cxx | 39 +++
sw/inc/unomap.hxx | 11 -
sw/inc/unosett.hxx | 65 -----
sw/source/core/layout/atrfrm.cxx | 116 +++++++-
sw/source/core/unocore/unocoll.cxx | 3 +-
sw/source/core/unocore/unomap.cxx | 17 --
sw/source/core/unocore/unomap1.cxx | 6 -
sw/source/core/unocore/unosett.cxx | 291 -------------------
xmloff/source/draw/XMLShapePropertySetContext.cxx | 3 +
xmloff/source/draw/sdpropls.cxx | 6 +
xmloff/source/text/XMLTextColumnsExport.cxx | 2 +
xmloff/source/text/txtprhdl.cxx | 3 +
25 files changed, 637 insertions(+), 407 deletions(-)

Upstream: cgit.freedesktop.org


  • Share