summaryrefslogtreecommitdiff
path: root/oox/source/drawingml/scene3dcontext.cxx
diff options
context:
space:
mode:
authorJacobo Aragunde Pérez <jaragunde@igalia.com>2014-05-12 11:46:50 +0200
committerJacobo Aragunde Pérez <jaragunde@igalia.com>2014-05-13 10:28:54 +0200
commite8679367c9020c22a787f441c4d5a43647986e0f (patch)
tree347698f62e231a5dc69ba42bec0869a02eb60ade /oox/source/drawingml/scene3dcontext.cxx
parentac9f7c8d1abffe882093f93ea70dc5e31d28a7a2 (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 'oox/source/drawingml/scene3dcontext.cxx')
-rw-r--r--oox/source/drawingml/scene3dcontext.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/oox/source/drawingml/scene3dcontext.cxx b/oox/source/drawingml/scene3dcontext.cxx
index 124a74183f48..ec9204b94a25 100644
--- a/oox/source/drawingml/scene3dcontext.cxx
+++ b/oox/source/drawingml/scene3dcontext.cxx
@@ -78,6 +78,8 @@ Shape3DPropertiesContext::Shape3DPropertiesContext( ContextHandler2Helper& rPare
mr3DProperties.mnContourW = rAttribs.getInteger( XML_contourW, 0 );
if( rAttribs.hasAttribute( XML_z ) )
mr3DProperties.mnShapeZ = rAttribs.getInteger( XML_z, 0 );
+ if( rAttribs.hasAttribute( XML_prstMaterial ) )
+ mr3DProperties.mnMaterial = rAttribs.getToken( XML_prstMaterial, XML_none );
}
ContextHandlerRef Shape3DPropertiesContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )