diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-07-10 17:13:08 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-07-14 16:50:13 +0200 |
| commit | 0db72dda395a1ee3b7e45ba2c5d5be1457389c29 (patch) | |
| tree | 3d19029afab56626ddba4c2469366ed37e4955fe | |
| parent | a096a4e89aab69b9bb529e7f35aea8b9c8b26ac1 (diff) | |
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@cib.de>
(cherry picked from commit 4e0aa38afd674f5ad16b4bc3222dc393543ad915)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98468
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 95e96f9357b6..9178b7961c82 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -613,7 +613,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(); |