diff options
| author | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2013-10-29 19:10:40 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-11-14 12:46:21 +0100 |
| commit | 5c7ede91afaf334cd6faa099ae3f7c1d6cc929c8 (patch) | |
| tree | f9ea43b037b41eefb701dd41bfd82b3b395fb79e /oox | |
| parent | 8e0aec74cadcc7ad0fe38d52f542c6a6643308ae (diff) | |
fdo#70457: Preserve rotation of embedded bitmaps from docx
When importing bitmaps coming from VML code, we were mistakenly ignoring
rotation information: we have just added it to the existing XShape object.
In the case of bitmaps expressed in DrawingML, the code was transforming
them into SwXTextGraphicObjects which don't have rotation information.
We are now preventing that transformation when rotation value differs from
zero, leaving the XShape object that was built in the first pass through
the document.
Added a unit test.
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Reviewed on:
https://gerrit.libreoffice.org/6484
Change-Id: I40100f8919894e48c005f8ed445bb5cad4f58d8b
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/vml/vmlshape.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 5346b7db4c98..7b8c9eb66195 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -695,6 +695,9 @@ Reference< XShape > SimpleShape::createPictureObject( const Reference< XShapes > aPropSet.setProperty(PROP_VertOrientPosition, rShapeRect.Y); aPropSet.setProperty(PROP_Opaque, sal_False); } + // fdo#70457: preserve rotation information + if ( !maTypeModel.maRotation.isEmpty() ) + lcl_SetRotation( aPropSet, maTypeModel.maRotation.toInt32() ); lcl_SetAnchorType(aPropSet, maTypeModel); } |