[Libreoffice-commits] core.git: sw/source

[Justin Luth (via logerrit)]

 sw/source/filter/ww8/ww8graf2.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit a6e271621843f454d92bc2c73a4425ad4afd1211
Author:     Justin Luth <justin.luth at collabora.com>
AuthorDate: Sat Apr 10 12:00:15 2021 +0200
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Sat Apr 10 18:04:35 2021 +0200

    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 at sil.org>

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