Rebased ref, commits from common ancestor:
commit 5fff29bd5d1bb3ee47bc3ef36f7bd2ad0044df97
Author: Serge Krot
Date: Wed Dec 13 17:13:35 2017 +0100
tdf#43569 DOC input: insert ConditionalText field instead of field marks
In case of IF field input inside DOC
sw/inc/docufld.hxx| 11 +
sw/qa/extras/odfexport/data/tdf43569_conditionalfield.doc |binary
sw/qa/extras/odfexport/odfexport.cxx | 108 ++
sw/source/core/fields/docufld.cxx | 100
sw/inc/IDocumentContentOperations.hxx |2 -
sw/qa/extras/mailmerge/data/sections_first_last.odt |binary
sw/qa/extras/mailmerge/mailmerge.cxx| 38 +++
sw/source/core/doc/docnew.cxx | 40 +++-