diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-10-18 16:21:00 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2019-10-23 13:07:52 +0200 |
| commit | 6eb1c2304d257d16858b7b51cad63f1dc2bde88b (patch) | |
| tree | 64041f71c3d1ee7fd91885ab5175c30799a71594 /include | |
| parent | 26599f049df7c52eca001ba52a0684888201e1ba (diff) | |
xmloff: ODF import: reimplement fieldmark-start/fieldmark-end
This needs to work in a similar way to writerfilter, because it has the
same problem: fieldmark has 3 positions but attach() only recieves 2
positions.
Insert the fieldmark at the fieldmark-start and move the cursor before
the CH_TXT_ATR_FIELDEND character, and when the fieldmark-end arrives,
move the cursor forward again.
This will slightly change the import of invalid documents, e.g.
when a fieldmark-end is missing, but that seems not so important and
without a name attribute on the fieldmark-end we can't do any better.
Change-Id: I3f0bd738277f56a999e79e4def911101b64b07e7
Reviewed-on: https://gerrit.libreoffice.org/81082
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/xmloff/txtimp.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index f2db2826cf2d..db79f9c24dbd 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -566,7 +566,7 @@ public: OUString FindActiveBookmarkName(); void pushFieldCtx( const OUString& name, const OUString& type ); - void popFieldCtx(); + css::uno::Reference<css::text::XFormField> popFieldCtx(); void addFieldParam( const OUString& name, const OUString& value ); void setCurrentFieldParamsTo(css::uno::Reference< css::text::XFormField> const &xFormField); OUString getCurrentFieldType(); |