diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-10-30 20:30:40 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-11-02 15:45:40 +0100 |
| commit | dd24e21bb4f183048a738314934fc3f02ec093f1 (patch) | |
| tree | 1374bc6cf16b530d14a8e9af04148b15bf7793f4 /sw/inc/unomap.hxx | |
| parent | f269467ab5b73999c7ae7edbd0d5dd605d006090 (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/inc/unomap.hxx')
| -rw-r--r-- | sw/inc/unomap.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx index caee6bc5c209..1cd22609f02e 100644 --- a/sw/inc/unomap.hxx +++ b/sw/inc/unomap.hxx @@ -125,7 +125,8 @@ struct SfxItemPropertyMapEntry; #define PROPERTY_MAP_ACCESSIBILITY_TEXT_ATTRIBUTE 99 #define PROPERTY_MAP_TABLE_STYLE 100 #define PROPERTY_MAP_CELL_STYLE 101 -#define PROPERTY_MAP_END 102 +#define PROPERTY_MAP_FIELDMARK 102 +#define PROPERTY_MAP_END 103 //S&E #define WID_WORDS 0 |