summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2013-05-29 14:47:54 +0200
committerMiklos Vajna <vmiklos@suse.cz>2013-05-30 17:00:22 +0200
commit429b722cb63e3da76527540fb3754e11531e2cf6 (patch)
treea96f94d75e872022e7ddd53c80afc730bff80ff3
parente242e44038dd6ffbb3f3e51148336bbdbddb90e9 (diff)
bnc#817956 VML import of mso-position-vertical-relative:margin
(cherry picked from commit f2720b87093968670e3fb47d24d4952f1631a654) Conflicts: oox/source/vml/vmlshape.cxx Change-Id: I86464c44022ef8c8a8037d4228bb2a6409fc77af
-rw-r--r--oox/source/vml/vmlshape.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 9c4ff1062f0b..32ab75672679 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -413,6 +413,11 @@ void lcl_SetAnchorType(PropertySet& rPropSet, const ShapeTypeModel& rTypeModel)
else
// Map to as-character by default, that fixes vertical position of some textframes.
rPropSet.setProperty(PROP_AnchorType, text::TextContentAnchorType_AT_CHARACTER);
+
+ if ( rTypeModel.maPositionVerticalRelative == "margin" )
+ {
+ rPropSet.setProperty(PROP_VertOrientRelation, text::RelOrientation::PAGE_PRINT_AREA);
+ }
}
else if( rTypeModel.maPosition == "relative" )
{ // I'm not very sure this is correct either.