diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-09-27 15:55:43 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-09-27 16:37:46 +0200 |
| commit | 421a23bb36bbf51edfabc58b7d2cd28ad37719d0 (patch) | |
| tree | 9f2f47bc093e77fecc3c0fcfa2d8877d28b55ca2 /sw/source/uibase/dochdl/swdtflvr.cxx | |
| parent | 7e0cb70d7fb9024f5ebf1ea988df90f0ee30baf2 (diff) | |
tdf#112679 sw: fix copying of fieldmarks
Aha, now we know that the reason for the defensive programming
in lcl_AssureFieldMarksSet() was that there are actually 2
different use-cases for it: usually a new mark is inserted,
so there are no dummy characters and they must be inserted.
However when copying text, the dummy characters are copied too,
so they must not be inserted, or we get duplicate fieldmarks.
This also reverts commit d4036d3a89b65a4912f62e3930eb1a31cd90a16b
which fixed the problem only for CHECKBOX_FIELDMARK in a
different way.
(regression from bb069fe7b8b6a24f9ff4df4c7052961e17ea3a8c)
Change-Id: I3c99b8c6d720951655198e682018794337859373
Diffstat (limited to 'sw/source/uibase/dochdl/swdtflvr.cxx')
| -rw-r--r-- | sw/source/uibase/dochdl/swdtflvr.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 74f7c18f725b..3f0ebad4116a 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -3755,7 +3755,8 @@ bool SwTrnsfrDdeLink::WriteData( SvStream& rStrm ) ::sw::mark::IMark* const pNewMark = pMarkAccess->makeMark( aPaM, sMarkName, - IDocumentMarkAccess::MarkType::BOOKMARK); + IDocumentMarkAccess::MarkType::BOOKMARK, + ::sw::mark::InsertMode::New); rServerObject.SetDdeBookmark(*pNewMark); } |