diff options
| author | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-05-12 11:46:50 +0200 |
|---|---|---|
| committer | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-05-13 10:28:54 +0200 |
| commit | e8679367c9020c22a787f441c4d5a43647986e0f (patch) | |
| tree | 347698f62e231a5dc69ba42bec0869a02eb60ade /include | |
| parent | ac9f7c8d1abffe882093f93ea70dc5e31d28a7a2 (diff) | |
ooxml: Preserve shape 3d effects: material
Shapes 3D effects can specify a material like in the following example:
<a:sp3d prstMaterial="metal" z="488950" />
This patch preserves the prstMaterial attribute in the sp3d tag using
the shape grab bag and modifies an existing unit test to add this
check.
Change-Id: I7be2dbbcc7e599d5f0fb8fa53ec1d180c18d8ebd
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/drawingml/shape3dproperties.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/oox/drawingml/shape3dproperties.hxx b/include/oox/drawingml/shape3dproperties.hxx index 32e0f27ae56b..e57ac942bf8a 100644 --- a/include/oox/drawingml/shape3dproperties.hxx +++ b/include/oox/drawingml/shape3dproperties.hxx @@ -63,6 +63,7 @@ struct Shape3DProperties OptValue< sal_Int32 > mnExtrusionH; OptValue< sal_Int32 > mnContourW; OptValue< sal_Int32 > mnShapeZ; + OptValue< sal_Int32 > mnMaterial; OptValue< BevelProperties > maTopBevelProperties; OptValue< BevelProperties > maBottomBevelProperties; @@ -74,6 +75,7 @@ struct Shape3DProperties OUString getLightRigName( sal_Int32 nElement ); OUString getLightRigDirName( sal_Int32 nElement ); OUString getBevelPresetTypeString( sal_Int32 nType ); + OUString getPresetMaterialTypeString( sal_Int32 nType ); css::uno::Sequence< css::beans::PropertyValue > getCameraAttributes(); css::uno::Sequence< css::beans::PropertyValue > getLightRigAttributes(); |