[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source

Michael Stahl (via logerrit) logerrit at kemper.freedesktop.org
Wed Jan 29 11:47:38 UTC 2020


 sw/source/core/text/porlay.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit b0d3f24d40182605cf65c38001d80f816d67a049
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Jan 22 12:19:54 2020 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Jan 29 12:47:10 2020 +0100

    sw_redlinehide: fix SwScriptInfo hidden text
    
    A missing update of nOffset in SwScriptInfo::InitScriptInfo(); it must
    be updated for every extent but it's not for the last one in a node.
    
    test case:
     ab
     cd
    Delete "bc", hide "d", but "a" disappears.
    
    (regression from 0e26d48ad7f18deac8447a306215f79d5c62be27)
    
    Change-Id: I99fb88409e184a61866f908722b4430a53914153
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87201
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit 53cd5d1f50d3da4efe0938aa340f6a57a0b8501d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87247
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index eea5dbd4a622..82fd102d232b 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -803,6 +803,7 @@ void SwScriptInfo::InitScriptInfo(const SwTextNode& rNode,
                     }
                 }
             }
+            nOffset += TextFrameIndex(iter->nEnd - iter->nStart);
         }
     }
     else


More information about the Libreoffice-commits mailing list