oox/source/vml/vmlshape.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 711958d8afcf7704b19e8f656aeac3cd7569e0f5
Author: Pierre-Eric Pelloux-Prayer <[email protected]>
Date: Wed Sep 5 10:17:27 2012 +0200
Fix docx 'absolute' frame position import
Frames with absolute position style must be vertically placed relative
to 'Margin', otherwise parent paragraph style may modify their Y coord.
Change-Id: Ifae8f73ad9c6aa98b67283663cfc37dd847ff095
Reviewed-on: https://gerrit.libreoffice.org/561
Reviewed-by: LuboÅ¡ LuÅák <[email protected]>
Tested-by: LuboÅ¡ LuÅák <[email protected]>
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index a32030b..759947a 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -384,8 +384,12 @@ void lcl_SetAnchorType(PropertySet& rPropSet, const
ShapeTypeModel& rTypeModel)
rPropSet.setProperty(PROP_AnchorType,
text::TextContentAnchorType_AT_PAGE);
}
else
+ {
// Map to as-character by default, that fixes vertical position of
some textframes.
rPropSet.setProperty(PROP_AnchorType,
text::TextContentAnchorType_AT_CHARACTER);
+ }
+ // Vertical placement relative to margin, because parent style must
not modify vertical position
+ rPropSet.setProperty(PROP_VertOrientRelation,
text::RelOrientation::FRAME);
}
else if( rTypeModel.maPosition == "relative" )
{ // I'm not very sure this is correct either.
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
