diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2021-12-09 08:43:27 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2022-06-29 09:04:07 +0200 |
| commit | ae2b901849bbc6a1a75ea3c9b855676617e0958e (patch) | |
| tree | 6e63b27320e56ed008706c583698aa518e7ffedc /include | |
| parent | 3d210f998928cb00e6989d9c2ad64ef1fa699175 (diff) | |
ODP import/export: refer to theme from shape text color
Refer to the 12 pre-defined colors by name + don't write the attribute
for the case when there is no theme.
(cherry picked from commit 91f649a119d4b7ece26f9737a38663664953a57a)
Conflicts:
xmloff/source/token/tokens.txt
Change-Id: Ib6ab5b7b34d896a36e04309bf0cb410998acce01
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136527
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/xmloff/xmltoken.hxx | 13 | ||||
| -rw-r--r-- | include/xmloff/xmltypes.hxx | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index f26c4871ec35..85f6ca74847d 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -3468,6 +3468,19 @@ namespace xmloff::token { XML_LINKED_STYLE_NAME, XML_THEME, + XML_THEME_COLOR, + XML_DK1, + XML_LT1, + XML_DK2, + XML_LT2, + XML_ACCENT1, + XML_ACCENT2, + XML_ACCENT3, + XML_ACCENT4, + XML_ACCENT5, + XML_ACCENT6, + XML_HLINK, + XML_FOLHLINK, XML_CONTENT_CONTROL, XML_SHOWING_PLACE_HOLDER, diff --git a/include/xmloff/xmltypes.hxx b/include/xmloff/xmltypes.hxx index 625e3a5b9c68..3711e5d5db52 100644 --- a/include/xmloff/xmltypes.hxx +++ b/include/xmloff/xmltypes.hxx @@ -293,6 +293,7 @@ #define XML_TYPE_GRAPHIC (XML_TEXT_TYPES_START + 127) #define XML_SW_TYPE_PRESPAGE_BACKSIZE (XML_TEXT_TYPES_START + 128) #define XML_SW_TYPE_RTLGUTTER (XML_TEXT_TYPES_START + 129) +#define XML_TYPE_THEME_COLOR (XML_TEXT_TYPES_START + 130) #endif // INCLUDED_XMLOFF_XMLTYPES_HXX |