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

[Caolán McNamara (via logerrit)]

 sw/qa/core/data/ww8/pass/ofz47205-1.doc |binary
 sw/source/filter/ww8/ww8scan.cxx        |    5 ++---
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit d0eae1767bb7643d382d9a64393ae2ba85fc7646
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon May 9 20:32:06 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue May 10 11:38:30 2022 +0200

    ofz#47205 import never completed
    
    keep nEndPos and nStartPos consistent if there is no following piece
    
    Change-Id: Iaa0840eb9a60c429d60ff449aed0a2f981306b0c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134093
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/qa/core/data/ww8/pass/ofz47205-1.doc 
b/sw/qa/core/data/ww8/pass/ofz47205-1.doc
new file mode 100644
index 000000000000..acbb4830d553
Binary files /dev/null and b/sw/qa/core/data/ww8/pass/ofz47205-1.doc differ
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 6af7980248ce..51aa725e36b8 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -3557,9 +3557,8 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
                 }
                 else
                 {
-                    if (m_ePLCF == CHP)
-                        p->nEndPos = nCpEnd;
-                    else
+                    p->nEndPos = nCpEnd;
+                    if (m_ePLCF != CHP)
                     {
                         /*
                         If the FKP FC that was found was greater than the FC