diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-07-10 17:13:08 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-07-16 10:32:37 +0200 |
| commit | 84694f256560bd28287f9f3a4e13800b6ff6d1ba (patch) | |
| tree | 97d1bce0e160913410913bb9d88357e354043b81 | |
| parent | d449d92b8f1b8c6b572acfd80efe42a875059faf (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/+/98469
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
| -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 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(); |