summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2012-03-22 10:34:24 +0100
committerMiklos Vajna <vmiklos@suse.cz>2012-03-22 11:03:26 +0100
commit51cfbf0cfaec395a99a00f2c20fcba96de9a4427 (patch)
treee4255430ae83bea9f123c10074be8bd72822294f /sw
parenta75fd2d50e8c0ad82bcd0bbfeafd6a7f0153b7ba (diff)
n#751054 fix VML import of absolutely positioned pictures
There were multiple issues here: - convertEmuToHmm() not handling negative values - position:absolute style property being ignored - mso-position-vertical-relative is not converted to text::RelOrientation - SwAnchoredDrawObject::_SetPositioningAttr() re-positioning already positioned objects - DomainMapper_Impl::PushShapeContext() inserting positioned objects as character
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/layout/anchoreddrawobject.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index 90db5a34da90..735878f98ea9 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -798,12 +798,15 @@ void SwAnchoredDrawObject::_SetPositioningAttr()
// --> #i71182#
// only change position - do not lose other attributes
SwFmtHoriOrient aHori( GetFrmFmt().GetHoriOrient() );
- aHori.SetPos( nHoriPos );
+ // If the object is already positioned, leave it alone.
+ if (!aHori.GetPos())
+ aHori.SetPos( nHoriPos );
GetFrmFmt().SetFmtAttr( aHori );
SwFmtVertOrient aVert( GetFrmFmt().GetVertOrient() );
- aVert.SetPos( nVertPos );
+ if (!aVert.GetPos())
+ aVert.SetPos( nVertPos );
GetFrmFmt().SetFmtAttr( aVert );
// --> #i36010# - set layout direction of the position