diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-06-14 11:23:13 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-06-15 10:45:11 +0200 |
| commit | 559d194d80a20b17ba6aa6f94a7749bcc59c871e (patch) | |
| tree | 7213ad3b6ab2201d4274d82164eab60c4db3088b /include/oox | |
| parent | 4f4bc1ffc02ea1e0a18942322fdb0ade597c392c (diff) | |
fdo#58819 DOCX VML export: fix shape size for rotated shapes
The problem is that we wrote the size of the shape itself, while VML wants the
bounding box here. The WW8 export ignores the rectangle given in
EscherEx::Commit(), uses SdrObject::GetSnapRect() instead and later refines the
position by using the point got in WW8AttributeOutput::OutputFlyFrame_Impl(),
see PlcDrawObj::WritePlc().
Do the same in the VML export, i.e. ignore the Rectangle we get in
VMLExport::Commit() and use SdrObject::GetSnapRect() + the point given
in DocxAttributeOutput::OutputFlyFrame_Impl() instead.
Change-Id: I5adbdf205792c87f92c1ddf1cf674f87e11eb54e
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/export/vmlexport.hxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx index 31f5241b5ab6..57f888996d50 100644 --- a/include/oox/export/vmlexport.hxx +++ b/include/oox/export/vmlexport.hxx @@ -53,6 +53,9 @@ class OOX_DLLPUBLIC VMLExport : public EscherEx /// Anchoring. sal_Int16 m_eHOri, m_eVOri, m_eHRel, m_eVRel; + /// Parent position. + const Point* m_pNdTopLeft; + /// The object we're exporting. const SdrObject* m_pSdrObject; @@ -83,7 +86,9 @@ public: /// Export the sdr object as VML. /// /// Call this when you need to export the object as VML. - sal_uInt32 AddSdrObject( const SdrObject& rObj, const sal_Int16 eHOri = -1, const sal_Int16 eVOri = -1, const sal_Int16 eHRel = -1, const sal_Int16 eVRel = -1 ); + sal_uInt32 AddSdrObject( const SdrObject& rObj, const sal_Int16 eHOri = -1, + const sal_Int16 eVOri = -1, const sal_Int16 eHRel = -1, const + sal_Int16 eVRel = -1, const Point* pNdTopLeft = 0 ); protected: /// Add an attribute to the generated <v:shape/> element. |