diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-10-15 12:41:37 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2019-10-23 13:03:14 +0200 |
| commit | a0fa6911a013dc5cc844fdbee13132a467f4a437 (patch) | |
| tree | 76e2953f987b34b06cddf7bff647e7899cfa3df6 | |
| parent | 19a559b0ec9b806519c405651d6d2b2e14712b4a (diff) | |
sw: fix copying of fieldmarks in lcl_CopyBookmarks()
Surprisingly this handles CHECKBOX_FIELDMARK differently than the others
but clearly it's a bug not to copy a fully selected TEXT_FIELDMARK as
seen in CppunitTest_sw_ooxmlexport testMultiPageToc, where a header is
copied with its CH_TXT_ATR_FIELD* but not the fieldmark.
Change-Id: Ibf4d934ea834c1ac9fe4e541259605a745246049
Reviewed-on: https://gerrit.libreoffice.org/80914
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
| -rw-r--r-- | sw/source/core/doc/DocumentContentOperationsManager.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index baff9f898f4d..c7faedd49eab 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -251,7 +251,10 @@ namespace if ( rMarkStart >= rStt && rMarkEnd <= rEnd && ( bIsNotOnBoundary || aMarkType == IDocumentMarkAccess::MarkType::ANNOTATIONMARK - || aMarkType == IDocumentMarkAccess::MarkType::CHECKBOX_FIELDMARK ) ) + || aMarkType == IDocumentMarkAccess::MarkType::TEXT_FIELDMARK + || aMarkType == IDocumentMarkAccess::MarkType::CHECKBOX_FIELDMARK + || aMarkType == IDocumentMarkAccess::MarkType::DROPDOWN_FIELDMARK + || aMarkType == IDocumentMarkAccess::MarkType::DATE_FIELDMARK)) { vMarksToCopy.push_back(pMark); } |