diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-27 13:59:25 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-27 18:54:30 +0100 |
commit | 913ed8398667dfd0d6f03923507e14c8e2642c90 (patch) | |
tree | fca4fbdecd19516e3a417e97b671e49126ae00ae /include | |
parent | 53a8e2f75da778c953b509efadca890ff0936c2f (diff) |
remove duplicate tokens from xmloff
Which causes trouble when converting stuff to use FastParser APIs.
I see we used to use dummy entries to avoid perfhash complaining, which
is fine for exporting, but doesn't work when we use these constants for
fast-parser importing, because the imported element/attribute ends up
mapped to what looks like the "wrong" constant.
So let's just make the constants match their textual representation.
Change-Id: I173d4b1e5fedede18375a6f7c15b1f36a48e4063
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89627
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/xmloff/xmltoken.hxx | 39 |
1 files changed, 4 insertions, 35 deletions
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index 3089bb6e9e72..40e4f5b55b02 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -158,16 +158,16 @@ namespace xmloff { namespace token { XML_NP_LO_EXT, XML_N_LO_EXT, + // enhanced fields + XML_N_FIELD, + XML_NP_FIELD, + // units - XML_UNIT_MM, XML_UNIT_M, - XML_UNIT_KM, XML_UNIT_CM, XML_UNIT_PT, XML_UNIT_PC, XML_UNIT_FOOT, - XML_UNIT_MILES, - XML_UNIT_INCH, // any other XML_1, @@ -293,8 +293,6 @@ namespace xmloff { namespace token { XML_BACKGROUND_COLOR, XML_BACKGROUND_IMAGE, XML_BACKGROUND_NO_REPEAT, - XML_BACKGROUND_REPEAT, - XML_BACKGROUND_STRETCH, XML_BAR, XML_BASE64BINARY, XML_BASE_CELL_ADDRESS, @@ -379,7 +377,6 @@ namespace xmloff { namespace token { XML_CASE_SENSITIVE, XML_CASEMAP_CAPITALIZE, XML_CASEMAP_LOWERCASE, - XML_CASEMAP_NORMAL, XML_CASEMAP_SMALL_CAPS, XML_CASEMAP_UPPERCASE, XML_CATEGORIES, @@ -426,7 +423,6 @@ namespace xmloff { namespace token { XML_CLOSE, XML_CLOSE_HORIZONTAL, XML_CLOSE_VERTICAL, - XML_CM, XML_CN, XML_CODE, XML_CODEBASE, @@ -445,7 +441,6 @@ namespace xmloff { namespace token { XML_COLUMN_WIDTH, XML_COLUMNALIGN, XML_COLUMNS, - XML_COLUMNSPLIT_AUTO, XML_COLUMNSPLIT_AVOID, XML_COMBINE_ENTRIES, XML_COMBINE_ENTRIES_WITH_DASH, @@ -933,13 +928,11 @@ namespace xmloff { namespace token { XML_GOURAUD, XML_GRADIENT, XML_GRADIENT_ANGLE, - XML_GRADIENT_BORDER, XML_GRADIENT_STEP_COUNT, XML_GRADIENT_STYLE, XML_GRADIENT_TABLE, XML_GRADIENTSTYLE_AXIAL, XML_GRADIENTSTYLE_ELLIPSOID, - XML_GRADIENTSTYLE_LINEAR, XML_GRADIENTSTYLE_RADIAL, XML_GRADIENTSTYLE_RECTANGULAR, XML_GRADIENTSTYLE_SQUARE, @@ -961,11 +954,7 @@ namespace xmloff { namespace token { XML_HANGING, XML_HAS_PERSISTENT_DATA, XML_HATCH, - XML_HATCH_DISTANCE, - XML_HATCH_STYLE, XML_HATCH_TABLE, - XML_HATCHSTYLE_DOUBLE, - XML_HATCHSTYLE_SINGLE, XML_HATCHSTYLE_TRIPLE, XML_HEADER, XML_HEADER_FIRST, @@ -1089,7 +1078,6 @@ namespace xmloff { namespace token { XML_JUSTIFY, XML_JUSTIFY_SINGLE_WORD, XML_KEEP_WITH_NEXT, - XML_KERNING_NORMAL, XML_KEY, XML_KEY1, XML_KEY2, @@ -1373,8 +1361,6 @@ namespace xmloff { namespace token { XML_ON_UPDATE_KEEP_STYLES, XML_ONLINE, XML_ONLINE_TEXT, - XML_OPAQUE_BACKGROUND, - XML_OPAQUE_FOREGROUND, XML_OPEN, XML_OPEN_HORIZONTAL, XML_OPEN_VERTICAL, @@ -1471,25 +1457,15 @@ namespace xmloff { namespace token { XML_POSITION_RIGHT, XML_POSITION_TOP, XML_POSITIVE_COLOR, - XML_POSTURE_ITALIC, - XML_POSTURE_NORMAL, XML_POSTURE_OBLIQUE, XML_POWER, XML_PRECISION_AS_SHOWN, XML_PREFIX, XML_PRESENTATION, - XML_PRESENTATION_CHART, - XML_PRESENTATION_GRAPHIC, - XML_PRESENTATION_NOTES, - XML_PRESENTATION_OBJECT, XML_PRESENTATION_ORGCHART, XML_PRESENTATION_OUTLINE, - XML_PRESENTATION_PAGE, XML_PRESENTATION_PAGE_LAYOUT, XML_PRESENTATION_PAGE_LAYOUT_NAME, - XML_PRESENTATION_SUBTITLE, - XML_PRESENTATION_TABLE, - XML_PRESENTATION_TITLE, XML_PREVIOUS, XML_PREVIOUS_PAGE, XML_PRINT, @@ -1507,9 +1483,6 @@ namespace xmloff { namespace token { XML_PROJECTION, XML_PROPERTIES, XML_PROTECT, - XML_PROTECT_CONTENT, - XML_PROTECT_POSITION, - XML_PROTECT_SIZE, XML_PROTECTED, XML_PROTECTION_KEY, XML_PROTECTION_KEY_DIGEST_ALGORITHM, @@ -2071,8 +2044,6 @@ namespace xmloff { namespace token { XML_WAVYLINE_FROM_RIGHT, XML_WAVYLINE_FROM_TOP, XML_WEEK_OF_YEAR, - XML_WEIGHT_BOLD, - XML_WEIGHT_NORMAL, XML_WHITE, XML_WHOLE_PAGE, XML_WIDOWS, @@ -3233,8 +3204,6 @@ namespace xmloff { namespace token { XML_FIELDMARK, XML_FIELDMARK_START, XML_FIELDMARK_END, - XML_N_FIELD, - XML_NP_FIELD, XML_IMAGE_SCALE, XML_ISOTROPIC, |