diff options
| author | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-05-05 17:24:59 +0200 |
|---|---|---|
| committer | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-05-06 16:32:28 +0200 |
| commit | 1b7773cb071c7bbf60ea023551f35375b6120d4a (patch) | |
| tree | 01caeb4b93ffd64c3865c551691d3adc1b698f3d /include | |
| parent | 8d2a5c16c7e487b407aced891da17e5c2486f2ff (diff) | |
oox: preserve scene3d/camera effects on shapes.
Shapes can contain 3D effects like in the following example:
<a:scene3d>
<a:camera prst="isometricLeftDown" zoom="150000"/>
<a:lightRig rig="threePt" dir="t"/>
</a:scene3d>
This patch preserves the a:camera tag and its attributes using the
shape grab bag. It also adds a unit test for this case.
Change-Id: Ic6a78031d2e1fb84a2bacd97b5cc9c55d9dbaa95
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/drawingml/shape3dproperties.hxx | 4 | ||||
| -rw-r--r-- | include/oox/export/drawingml.hxx | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/oox/drawingml/shape3dproperties.hxx b/include/oox/drawingml/shape3dproperties.hxx index d39aee8dc400..9d89753867ab 100644 --- a/include/oox/drawingml/shape3dproperties.hxx +++ b/include/oox/drawingml/shape3dproperties.hxx @@ -46,6 +46,10 @@ struct Shape3DProperties /** Overwrites all members that are explicitly set in rSourceProps. */ void assignUsed( const Shape3DProperties& rSourceProps ); + + OUString getCameraPrstName( sal_Int32 nElement ); + + css::uno::Sequence< css::beans::PropertyValue > getCameraAttributes(); }; diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index 7793e6bff2a3..852387deec0b 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -174,6 +174,7 @@ public: void WriteFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropSet ); void WriteShapeStyle( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet ); void WriteShapeEffects( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet ); + void WriteShape3DEffects( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet ); static void ResetCounters(); |