summaryrefslogtreecommitdiff
path: root/sw/source/core/unocore/unomap.cxx
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2020-10-30 20:30:40 +0100
committerMichael Stahl <michael.stahl@cib.de>2020-11-02 15:45:40 +0100
commitdd24e21bb4f183048a738314934fc3f02ec093f1 (patch)
tree1374bc6cf16b530d14a8e9af04148b15bf7793f4 /sw/source/core/unocore/unomap.cxx
parentf269467ab5b73999c7ae7edbd0d5dd605d006090 (diff)
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 <michael.stahl@cib.de>
Diffstat (limited to 'sw/source/core/unocore/unomap.cxx')
-rw-r--r--sw/source/core/unocore/unomap.cxx11
1 files changed, 11 insertions, 0 deletions
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index a609da4d53d9..0ae02dedefed 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -560,6 +560,17 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
m_aMapEntriesArr[nPropertyId] = GetBookmarkPropertyMap();
}
break;
+ case PROPERTY_MAP_FIELDMARK:
+ {
+ static SfxItemPropertyMapEntry const aFieldmarkMap_Impl[] =
+ {
+ // FIXME: is this supposed to actually exist as UNO property, or is it supposed to be in the "parameters" of the field?
+ { u"Checked", 0, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+ { u"", 0, css::uno::Type(), 0, 0 }
+ };
+ m_aMapEntriesArr[nPropertyId] = aFieldmarkMap_Impl;
+ }
+ break;
case PROPERTY_MAP_PARAGRAPH_EXTENSIONS:
{
m_aMapEntriesArr[nPropertyId] = GetParagraphExtensionsPropertyMap();