diff options
| author | Tibor Nagy <nagy.tibor2@nisz.hu> | 2022-01-04 14:38:47 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-02-03 10:04:46 +0100 |
| commit | 59b16fdf4e25db134ed52457c857eae5241a75e5 (patch) | |
| tree | 05553189dafd51aee5bf5fce99c44dfc2549795d /oox | |
| parent | 8e9830755c17c3351f074b251f30f3216b481214 (diff) | |
tdf#137675 PPTX export: adding missing fill="none" to a:path
Follow-up to commit 9310e47e2ce71348a16e5412131946348833f4b2
"tdf#101122 DOCX custom shape export: remove bad fill".
Change-Id: I2acdae3964c31ee366387d9938fe366405dcace9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127944
Tested-by: Jenkins
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 22b66d4083d34cbce2b7b48daeed3152bf9877b7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129330
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/drawingml.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 4731f556967e..e1062795e3ae 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -3712,9 +3712,14 @@ bool DrawingML::WriteCustomGeometry( XML_r, "r", XML_b, "b"); mpFS->startElementNS(XML_a, XML_pathLst); + std::optional<OString> sFill; + if (HasEnhancedCustomShapeSegmentCommand(rXShape, css::drawing::EnhancedCustomShapeSegmentCommand::NOFILL)) + sFill = "none"; // for possible values see ST_PathFillMode in OOXML standard + if ( aPathSize.hasElements() ) { mpFS->startElementNS( XML_a, XML_path, + XML_fill, sFill, XML_w, OString::number(aPathSize[0].Width), XML_h, OString::number(aPathSize[0].Height) ); } @@ -3741,6 +3746,7 @@ bool DrawingML::WriteCustomGeometry( nYMax = nY; } mpFS->startElementNS( XML_a, XML_path, + XML_fill, sFill, XML_w, OString::number(nXMax - nXMin), XML_h, OString::number(nYMax - nYMin) ); } |