diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-07-14 09:10:13 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-07-14 09:12:04 +0200 |
| commit | b7b2887d62ea249310f02f03c4ce31cbd8f21307 (patch) | |
| tree | cb178ffbc9329308214b20ce8e0f990eda8793e1 /oox | |
| parent | d8e5a0db64fa022b54bddc42b1b1db0c1ddfe2d1 (diff) | |
Revert "tdf#109067 Fix default value of rotWithShape"
This reverts commit 1b08f129677c1109aae1fadc72ae68ebb7df7cb0. The
change was Jenkins-verified, but just rebasing it on top of latest
master (without getting conflicts) broke the test added in the commit.
So let's revert it for now to have time to find out why does the test
fail on top of latest master.
Change-Id: I3bce24e54fb07df2dd460fb0f01d44516b3fcd0d
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/fillproperties.cxx | 4 | ||||
| -rw-r--r-- | oox/source/export/drawingml.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index 41ab6ae222bc..314ff5822695 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -362,8 +362,8 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap, if ( bFlipV ) nShapeRotation = -nShapeRotation; - // "rotate with shape" set to false -> do not rotate - if ( !maGradientProps.moRotateWithShape.get( true ) ) + // "rotate with shape" not set, or set to false -> do not rotate + if ( !maGradientProps.moRotateWithShape.get( false ) ) nShapeRotation = 0; if( maGradientProps.moGradientPath.has() ) diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index ee151225f122..ddb91babb7c5 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -386,14 +386,14 @@ void DrawingML::WriteGradientFill( const Reference< XPropertySet >& rXPropSet ) // If we have no gradient stops that means original gradient were defined by a theme. if( aGradientStops.hasElements() ) { - mpFS->startElementNS( XML_a, XML_gradFill, XML_rotWithShape, "0", FSEND ); + mpFS->startElementNS( XML_a, XML_gradFill, FSEND ); WriteGrabBagGradientFill(aGradientStops, aGradient); mpFS->endElementNS( XML_a, XML_gradFill ); } } else { - mpFS->startElementNS( XML_a, XML_gradFill, XML_rotWithShape, "0", FSEND ); + mpFS->startElementNS( XML_a, XML_gradFill, FSEND ); WriteGradientFill(aGradient); mpFS->endElementNS( XML_a, XML_gradFill ); } @@ -1053,7 +1053,7 @@ void DrawingML::WriteBlipFill( const Reference< XPropertySet >& rXPropSet, const { SAL_INFO("oox.shape", "URL: " << sBitmapURL); - mpFS->startElementNS( nXmlNamespace , XML_blipFill, XML_rotWithShape, "0", FSEND ); + mpFS->startElementNS( nXmlNamespace , XML_blipFill, FSEND ); WriteBlip( rXPropSet, sBitmapURL, bRelPathToMedia ); |