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 /cui | |
| 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 'cui')
| -rw-r--r-- | cui/source/tabpages/swpossizetabpage.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index e78826bc5105..803b56081007 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -308,7 +308,7 @@ static FrmMap aHCharHtmlAbsMap[] = // #i18732# - allow vertical alignment at page areas // #i22341# - handle <LB::RelChar> on its own constexpr auto VERT_CHAR_REL = LB::VertFrame|LB::VertPrintArea| - LB::RelPageFrame|LB::RelPagePrintArea; + LB::RelPageFrame|LB::RelPagePrintArea|LB::RelPagePrintAreaBottom; static FrmMap aVCharMap[] = { @@ -323,7 +323,7 @@ static FrmMap aVCharMap[] = {SvxSwFramePosString::BOTTOM, SvxSwFramePosString::BOTTOM, VertOrientation::BOTTOM, VERT_CHAR_REL|LB::RelChar}, {SvxSwFramePosString::BELOW, SvxSwFramePosString::BELOW, VertOrientation::CHAR_BOTTOM, LB::RelChar}, {SvxSwFramePosString::CENTER_VERT, SvxSwFramePosString::CENTER_VERT, VertOrientation::CENTER, VERT_CHAR_REL|LB::RelChar}, - {SvxSwFramePosString::FROMTOP, SvxSwFramePosString::FROMTOP, VertOrientation::NONE, VERT_CHAR_REL|LB::RelPagePrintAreaBottom}, + {SvxSwFramePosString::FROMTOP, SvxSwFramePosString::FROMTOP, VertOrientation::NONE, VERT_CHAR_REL}, {SvxSwFramePosString::FROMBOTTOM, SvxSwFramePosString::FROMBOTTOM, VertOrientation::NONE, LB::RelChar|LB::VertLine}, {SvxSwFramePosString::TOP, SvxSwFramePosString::TOP, VertOrientation::LINE_TOP, LB::VertLine}, {SvxSwFramePosString::BOTTOM, SvxSwFramePosString::BOTTOM, VertOrientation::LINE_BOTTOM, LB::VertLine}, |