From dd24e21bb4f183048a738314934fc3f02ec093f1 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 30 Oct 2020 20:30:40 +0100 Subject: sw: return SwXFieldmark in SwXFieldEnumeration * Implement text::XTextField in SwXFieldmark * That requires overriding XTextContent, just forward to SwXBookmark * Also override XServiceInfo implementation in SwXFieldmark * Add a PropertySetInfo for SwXFieldmark, which doesn't support "Hidden" or "Condition" properties of SwXBookmark * in SwXFieldmark::setFieldType(), only allow sensible new types * fix DomainMapper_Impl assumptions that if it implements XTextField it can't be a fieldmark, which caused CppunitTest_sw_ooxmlexport10 testTdf92157 to fail with a SAXException caused by some disposed SwXTextCursor Change-Id: I1ae2e9cb99ea784040874517e4d1af7e59d24405 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105083 Tested-by: Jenkins Reviewed-by: Michael Stahl --- sw/inc/IDocumentMarkAccess.hxx | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'sw/inc/IDocumentMarkAccess.hxx') diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx index 13bd7fdc0d7c..1ad39701d02b 100644 --- a/sw/inc/IDocumentMarkAccess.hxx +++ b/sw/inc/IDocumentMarkAccess.hxx @@ -312,6 +312,14 @@ class IDocumentMarkAccess // Fieldmarks + /** returns a STL-like random access iterator to the begin of the sequence of fieldmarks. + */ + virtual const_iterator_t getFieldmarksBegin() const =0; + + /** returns a STL-like random access iterator to the end of the sequence of fieldmarks. + */ + virtual const_iterator_t getFieldmarksEnd() const =0; + /// get Fieldmark for CH_TXT_ATR_FIELDSTART/CH_TXT_ATR_FIELDEND at rPos virtual ::sw::mark::IFieldmark* getFieldmarkAt(const SwPosition& rPos) const =0; virtual ::sw::mark::IFieldmark* getFieldmarkFor(const SwPosition& pos) const =0; -- cgit