diff options
| author | Justin Luth <justin.luth@collabora.com> | 2021-04-10 12:00:15 +0200 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2021-04-10 18:04:35 +0200 |
| commit | a6e271621843f454d92bc2c73a4425ad4afd1211 (patch) | |
| tree | c5ed919dcea2b4dd7ef95fb78894f0143f9c5367 /sw/source/filter/ww8 | |
| parent | a0d4955ba650ace35b7fd411a9670be1032e6982 (diff) | |
tdf#120761 doc import: fix z-order background logic
At first I thought I didn't need to jump
past the hell layer, but then a good night
of sleep told me I better revisit this,
and test a few a my assumptions.
Unfortunately, I don't know how to design
a test document with the specific order
I would need to test this.
So I had to settle for proving it on paper.
I did confirm that BodyText in the background
is still higher than header text in the foreground,
so indeed the header is always the lowest position.
Change-Id: I2054c8fc3ec1e1e7a211397cebe9aff145d701be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113906
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw/source/filter/ww8')
| -rw-r--r-- | sw/source/filter/ww8/ww8graf2.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index 13bf81c97c9f..3e785a9093f5 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -131,6 +131,16 @@ sal_uLong wwZOrderer::GetEscherObjectPos( sal_uLong nSpId, ++aIter; } } + if (!bInHellLayer) + { + while (aIter != aEnd) + { + if (!aIter->mbInHellLayer || (_bInHeaderFooter && !aIter->mbInHeaderFooter)) + break; + nRet += aIter->mnNoInlines + 1; + ++aIter; + } + } while (aIter != aEnd) { // insert object in page header|footer |