summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2021-01-25 21:05:12 +0100
committerMichael Stahl <michael.stahl@allotropia.de>2021-01-26 10:36:55 +0100
commitb708f31bf5f2993bf3f9fb2a832267f02bf90eac (patch)
tree2542faa46130bab466a79689410190110e93d1f9 /svx
parent2988bd19eff4053d557ef9d1e70aa7b75665cbcb (diff)
tdf#134605 DOCX export: fix unexpected loss of footer margin
Regression from commit 51534ac2b9747975945acb6a1e1ba5cc6d73f5c2 (tdf#127778 DOCX import: fix unexpected heading on non-first page ..., 2020-05-11), which replaced an import fix with an export fix. What was missed there is the import fix handled both headers and footers, while the export fix only handled headers. Fix the problem by doing the same mapping for footers: if a follow page style has no footer, but the first page style has, then take the margin from that one. The import side did the opposite of this already. (cherry picked from commit 80b360085f5974fbb3abe49a88b20f4d39704fb5) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport16.cxx Change-Id: Ibb191db4136bce0ad5e4bf14dcea15f5955bd298 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109933 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'svx')
0 files changed, 0 insertions, 0 deletions