summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2017-11-07 09:29:30 +0300
committerAndras Timar <andras.timar@collabora.com>2018-01-17 08:42:49 +0100
commit96d0467f65c97c3e3fc1af0fa22224bb01b6c59c (patch)
treebfc45bcd4e4e090f31a9c9704dd30c1b34b4027c /sfx2
parent5023bece87a6d4bccf5fe8e72f21be70fac86b16 (diff)
tdf#112352 ooxmlimport: ALWAYS treat 1st nextpage w/cols as cont
fix 5.4 regression from 4605bd46984125a99b0e993b71efa6edb411699f. When there are columns, if a nextpage section doesn't contain any other "page style" details we treat it as a continuous break, If we don't, the column info becomes part of the style itself, and not just a section property. However, the very first section is troublesome - by definition it DOES contain page style details, and so if the document starts with columns, the default style would gain the column attribute. Usually that results in a mess, so lets make sure that we avoid that also in the case where headers/footers are defined. Reviewed-on: https://gerrit.libreoffice.org/44505 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit afc96d263959d10e457b54a574f0829d20e99df4) Change-Id: I7e08a9218e4304206579ed064bc92c9604d4470e Reviewed-on: https://gerrit.libreoffice.org/46638 Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 2bdfe1355c4c571e71bd4197d5814c6e15fb8db7)
Diffstat (limited to 'sfx2')
0 files changed, 0 insertions, 0 deletions