diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-02-12 03:34:03 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-02-12 03:34:54 +0100 |
commit | 1779d2a3dde60cf705702fcb132bba46aa38fc5b (patch) | |
tree | 7fab7ea1fd06d9e4f10083697453ab9189dd121e /oox | |
parent | 18837a11fff1a93dc489c5427339bcfec4bed6e2 (diff) |
nasty merge error
Change-Id: I5afaf03c5aee417ea40cea65b2ac51dde7c35918
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/export/drawingml.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 42fec3f4593d..050b9319e009 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -349,6 +349,7 @@ void DrawingML::WriteGradientFill( Reference< XPropertySet > rXPropSet ) mpFS->endElementNS( XML_a, XML_gradFill ); } } + void DrawingML::WriteGrabBagGradientFill( Sequence< PropertyValue > aGradientStops, awt::Gradient rGradient ) { // write back the original gradient @@ -440,7 +441,6 @@ void DrawingML::WriteGradientFill( awt::Gradient rGradient ) FSEND ); break; } - mpFS->endElementNS( XML_a, XML_gradFill ); } void DrawingML::WriteLineArrow( Reference< XPropertySet > rXPropSet, sal_Bool bLineStart ) |