diff options
| author | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-05-16 11:38:18 +0200 |
|---|---|---|
| committer | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-05-16 14:11:23 +0200 |
| commit | 73ad72e820ed3de346efa1914432a7f2c6264dde (patch) | |
| tree | 9a4bb88d177629f27fb46656ac2b178cb036ca55 /oox | |
| parent | be415a0f9a65d44d1042b313141f49c617bedd93 (diff) | |
ooxml: Preserve effects on pictures
If a picture contains some 2D (glow, shadow...) or 3D effect
(rotation, extrusion...), we prevent the importer from transforming
it into a XTextContent so the XShape grab bag is not removed and
the effects are preserved using the existing mechanisms. Added a unit
test for this issue, and modified some existing unit tests to match
the new behaviour.
Change-Id: I3b87069ea208604383a592d34d0a4ceb6b0f9fc7
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/shapes.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index c9eaa6fa384d..82d2b5e7e793 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -530,6 +530,10 @@ void ShapeExport::WriteGraphicObjectShapePart( Reference< XShape > xShape, const WritePresetShape( "rect" ); // graphic object can come with the frame (bnc#654525) WriteOutline( xShapeProps ); + + WriteShapeEffects( xShapeProps ); + WriteShape3DEffects( xShapeProps ); + pFS->endElementNS( mnXmlNamespace, XML_spPr ); pFS->endElementNS( mnXmlNamespace, XML_pic ); |