From d54264e34c1ccc0eaf4178ab165a843028500223 Mon Sep 17 00:00:00 2001 From: Tibor Nagy Date: Wed, 5 Aug 2020 14:29:49 +0200 Subject: tdf#133071 DOCX import: fix vertical alignment to bottom page margin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The relative vertical alignment (top, center and bottom) of bottom page margin wasn't handled. Co-authored-by: Attila Szűcs (NISZ) Change-Id: Ib41a8790f88ef004390787e3673a209dadd86457 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100170 Tested-by: László Németh Reviewed-by: László Németh --- cui/source/tabpages/swpossizetabpage.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cui') diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 54bb58f2c999..e78826bc5105 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -259,14 +259,14 @@ FrmMap const aHParaHtmlAbsMap[] = constexpr auto VERT_PARA_REL = LB::VertFrame|LB::VertPrintArea| - LB::RelPageFrame|LB::RelPagePrintArea; + LB::RelPageFrame|LB::RelPagePrintArea|LB::RelPagePrintAreaBottom; FrmMap const aVParaMap[] = { {SvxSwFramePosString::TOP, SvxSwFramePosString::TOP, VertOrientation::TOP, VERT_PARA_REL}, {SvxSwFramePosString::BOTTOM, SvxSwFramePosString::BOTTOM, VertOrientation::BOTTOM, VERT_PARA_REL}, {SvxSwFramePosString::CENTER_VERT, SvxSwFramePosString::CENTER_VERT, VertOrientation::CENTER, VERT_PARA_REL}, - {SvxSwFramePosString::FROMTOP, SvxSwFramePosString::FROMTOP, VertOrientation::NONE, VERT_PARA_REL|LB::RelPagePrintAreaBottom} + {SvxSwFramePosString::FROMTOP, SvxSwFramePosString::FROMTOP, VertOrientation::NONE, VERT_PARA_REL} }; FrmMap const aVParaHtmlMap[] = -- cgit