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

[Michael Stahl (via logerrit)]

 sw/source/filter/ww8/ww8par5.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 84694f256560bd28287f9f3a4e13800b6ff6d1ba
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Fri Jul 10 17:13:08 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Thu Jul 16 10:32:37 2020 +0200

    tdf#134618 sw: WW8 import: don't insert fieldmark for SHAPE field
    
    Follow DomainMapper_Impl::CloseFieldCommand() and just don't waste
    effort creating a fieldmark that doesn't provide any benefit.
    
    This should avoid any fieldmark related problems introduced in
    e511a0ca5dde6d731bb126bbfe21768867890102..d9030ad6298e2f49ee63489d6158ea6ad23c0111
    
    Change-Id: I6688dcda1e3b41ac648f3d69740f05d34bb46191
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98542
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit 4e0aa38afd674f5ad16b4bc3222dc393543ad915)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98469
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 694782a1e1ed..cbf45b2fbbfa 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -624,7 +624,7 @@ sal_uInt16 SwWW8ImplReader::End_Field()
             }
             default:
                 OUString aCode = m_aFieldStack.back().GetBookmarkCode();
-                if ( !aCode.isEmpty() )
+                if (!aCode.isEmpty() && !aCode.trim().startsWith("SHAPE"))
                 {
                     // Unhandled field with stored code
                     SwPosition aEndPos = *m_pPaM->GetPoint();