diff options
| author | Tibor Nagy <nagy.tibor2@nisz.hu> | 2020-09-10 14:13:37 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-09-15 12:11:39 +0200 |
| commit | cf0c04d5fc85acbe6cbeb090de6a739a0d5a8d30 (patch) | |
| tree | e9443b103b289ac43ec5fbcee13216001f7766c4 /oox | |
| parent | 9d2ce7ef8ea225369ec9a2e6a9b6b7a031f1a708 (diff) | |
tdf#103611 sw: fix vertical alignment to page bottom margin
Allow to align objects to page bottom margin vertically in
Position and Size settings. Fix also DOCX import of VML shapes.
Co-authored-by: Attila Szűcs (NISZ)
Change-Id: I78db2553ee9d963b18a2d580b1cbb76c1917ac0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102379
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/vml/vmlshape.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 905548bafb9e..eb0f886c32b6 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -608,6 +608,10 @@ static void lcl_SetAnchorType(PropertySet& rPropSet, const ShapeTypeModel& rType { rPropSet.setProperty(PROP_VertOrientRelation, text::RelOrientation::PAGE_PRINT_AREA); } + else if (rTypeModel.maPositionVerticalRelative == "bottom-margin-area") + { + rPropSet.setProperty(PROP_VertOrientRelation, text::RelOrientation::PAGE_PRINT_AREA_BOTTOM); + } else { rPropSet.setProperty(PROP_VertOrientRelation, text::RelOrientation::FRAME); @@ -663,9 +667,9 @@ static void lcl_SetAnchorType(PropertySet& rPropSet, const ShapeTypeModel& rType else if ( rTypeModel.maPositionVertical == "bottom" ) rPropSet.setAnyProperty(PROP_VertOrient, makeAny(text::VertOrientation::BOTTOM)); else if ( rTypeModel.maPositionVertical == "inside" ) - rPropSet.setAnyProperty(PROP_VertOrient, makeAny(text::VertOrientation::LINE_TOP)); + rPropSet.setAnyProperty(PROP_VertOrient, makeAny(text::VertOrientation::TOP)); else if ( rTypeModel.maPositionVertical == "outside" ) - rPropSet.setAnyProperty(PROP_VertOrient, makeAny(text::VertOrientation::LINE_BOTTOM)); + rPropSet.setAnyProperty(PROP_VertOrient, makeAny(text::VertOrientation::BOTTOM)); lcl_setSurround( rPropSet, rTypeModel, rGraphicHelper ); } |