diff options
| author | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-05-12 19:13:06 +0200 |
|---|---|---|
| committer | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-05-13 10:28:55 +0200 |
| commit | 4b4f7e17ad5571482111f1574f7e4b313531cfde (patch) | |
| tree | 18851e00fec5a2946833a64c8f327c5c67efcf25 /include | |
| parent | e8679367c9020c22a787f441c4d5a43647986e0f (diff) | |
ooxml: Preserve shape 3d effects: extrusion and contour colors
Shapes 3D effects can specify colors for extrusion and contours like
in the following example:
<a:sp3d extrusionH="25400" prstMaterial="metal">
<a:extrusionClr>
<a:schemeClr val="accent5">
<a:lumMod val="40000"/>
<a:lumOff val="60000"/>
</a:schemeClr>
</a:extrusionClr>
<a:contourClr>
<a:srgbClr val="3333FF"/>
</a:contourClr>
</a:sp3d>
Colors can be theme-defined or set in RGB and can contain
transformations.
This patch preserves all the color information using the shape grab
bag and modifies an existing unit test to add this check.
Change-Id: Ida168affd4ca2135d0bd8f97135dc1cd1e74165a
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/drawingml/shape3dproperties.hxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/oox/drawingml/shape3dproperties.hxx b/include/oox/drawingml/shape3dproperties.hxx index e57ac942bf8a..5c3eaa00ead2 100644 --- a/include/oox/drawingml/shape3dproperties.hxx +++ b/include/oox/drawingml/shape3dproperties.hxx @@ -64,6 +64,8 @@ struct Shape3DProperties OptValue< sal_Int32 > mnContourW; OptValue< sal_Int32 > mnShapeZ; OptValue< sal_Int32 > mnMaterial; + Color maExtrusionColor; + Color maContourColor; OptValue< BevelProperties > maTopBevelProperties; OptValue< BevelProperties > maBottomBevelProperties; @@ -79,8 +81,11 @@ struct Shape3DProperties css::uno::Sequence< css::beans::PropertyValue > getCameraAttributes(); css::uno::Sequence< css::beans::PropertyValue > getLightRigAttributes(); - css::uno::Sequence< css::beans::PropertyValue > getShape3DAttributes(); + css::uno::Sequence< css::beans::PropertyValue > getShape3DAttributes( + const GraphicHelper& rGraphicHelper, sal_Int32 rPhClr = API_RGB_TRANSPARENT ); css::uno::Sequence< css::beans::PropertyValue > getBevelAttributes( BevelProperties rProps ); + css::uno::Sequence< css::beans::PropertyValue > getColorAttributes( + const Color& rColor, const GraphicHelper& rGraphicHelper, sal_Int32 rPhClr ); }; |