diff options
| author | Muthu Subramanian <sumuthu@suse.com> | 2011-12-08 16:47:56 +0530 |
|---|---|---|
| committer | Muthu Subramanian <sumuthu@suse.com> | 2011-12-08 16:47:56 +0530 |
| commit | 704ee5bc859499f5fe824f66f9607b554c135c66 (patch) | |
| tree | 673ae42bf09bf637dbf6b57a4ca6fe01c6b764bb /oox | |
| parent | re-enable the java fax wizard by using the correct ?start url (diff) | |
| download | core-704ee5bc859499f5fe824f66f9607b554c135c66.tar.gz core-704ee5bc859499f5fe824f66f9607b554c135c66.zip | |
n#719989: Rotation needs to be done post flipping.
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 2b81eac2db75..d7168233e865 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -509,18 +509,6 @@ Reference< XShape > Shape::createAndInsert( aFillProperties.pushToPropMap( aShapeProps, rGraphicHelper, mnRotation, nFillPhClr ); aLineProperties.pushToPropMap( aShapeProps, rGraphicHelper, nLinePhClr ); - // Moved here because the properties like Flip needs to be applied before - // applying the rotation property - if( bIsCustomShape ) - { - if ( mbFlipH ) - mpCustomShapePropertiesPtr->setMirroredX( sal_True ); - if ( mbFlipV ) - mpCustomShapePropertiesPtr->setMirroredY( sal_True ); - OSL_TRACE("==cscode== shape name: '%s'", rtl::OUStringToOString(msName, RTL_TEXTENCODING_UTF8 ).getStr()); - mpCustomShapePropertiesPtr->pushToPropSet( rFilterBase, xSet, mxShape ); - } - // applying autogrowheight property before setting shape size, because // the shape size might be changed if currently autogrowheight is true // we must also check that the PropertySet supports the property. @@ -534,6 +522,16 @@ Reference< XShape > Shape::createAndInsert( if( aServiceName != OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GroupShape")) ) PropertySet( xSet ).setProperties( aShapeProps ); + if( bIsCustomShape ) + { + if ( mbFlipH ) + mpCustomShapePropertiesPtr->setMirroredX( sal_True ); + if ( mbFlipV ) + mpCustomShapePropertiesPtr->setMirroredY( sal_True ); + OSL_TRACE("==cscode== shape name: '%s'", rtl::OUStringToOString(msName, RTL_TEXTENCODING_UTF8 ).getStr()); + mpCustomShapePropertiesPtr->pushToPropSet( rFilterBase, xSet, mxShape ); + } + // in some cases, we don't have any text body. if( getTextBody() ) { |