cui/Library_cui.mk | 1 + include/svx/diagram/datamodel.hxx | 25 +++++++++++++------------ svx/Library_svxcore.mk | 1 + 3 files changed, 15 insertions(+), 12 deletions(-)
New commits: commit ce4c154e8b254f3bcd59ea46b3db4bd3d5a26058 Author: Michael Stahl <[email protected]> AuthorDate: Thu Dec 8 18:27:06 2022 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Fri Dec 9 12:08:47 2022 +0000 svx: fix unmaintainable TypeConstant definition Add one new token and every test in CppunitTest_sd_import_tests-smartart fails. Change-Id: I0d79a5000fc2ef9b699ffca3d75199e9479cf561 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143834 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index e967e4491419..85f779cc964d 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -27,6 +27,7 @@ $(eval $(call gb_Library_add_defs,cui,\ $(eval $(call gb_Library_use_custom_headers,cui,\ officecfg/registry \ + oox/generated \ )) $(eval $(call gb_Library_use_sdk_api,cui)) diff --git a/include/svx/diagram/datamodel.hxx b/include/svx/diagram/datamodel.hxx index 42b04fb216f2..756fdd1aff2c 100644 --- a/include/svx/diagram/datamodel.hxx +++ b/include/svx/diagram/datamodel.hxx @@ -30,23 +30,24 @@ #include <com/sun/star/xml/dom/XDocument.hpp> #include <com/sun/star/drawing/XShape.hpp> +#include <oox/token/tokens.hxx> namespace svx::diagram { enum TypeConstant { XML_none = 0, - XML_type = 395, - XML_asst = 680, - XML_doc = 1924, - XML_node = 3596, - XML_norm = 3609, - XML_parOf = 3878, - XML_parTrans = 3879, - XML_pres = 4085, - XML_presOf = 4090, - XML_presParOf = 4091, - XML_rel = 4298, - XML_sibTrans = 4746, + XML_type = oox::XML_Type, + XML_asst = oox::XML_asst, + XML_doc = oox::XML_doc, + XML_node = oox::XML_node, + XML_norm = oox::XML_norm, + XML_parOf = oox::XML_parOf, + XML_parTrans = oox::XML_parTrans, + XML_pres = oox::XML_pres, + XML_presOf = oox::XML_presOf, + XML_presParOf = oox::XML_presParOf, + XML_rel = oox::XML_rel, + XML_sibTrans = oox::XML_sibTrans, }; /** A Connection diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 925228c8959d..6a1c0b5de352 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_add_sdi_headers,svxcore,svx/sdi/svxslots)) $(eval $(call gb_Library_use_custom_headers,svxcore,\ officecfg/registry \ + oox/generated \ )) $(eval $(call gb_Library_use_sdk_api,svxcore))
