include/xmloff/shapeimport.hxx | 84 --- include/xmloff/txtimp.hxx | 261 ----------- sc/source/filter/xml/xmlimprt.hxx | 84 --- sw/source/filter/xml/xmltbli.cxx | 32 - xmloff/inc/SchXMLImport.hxx | 124 ----- xmloff/inc/XMLLineNumberingImportContext.hxx | 18 xmloff/source/chart/SchXMLAxisContext.cxx | 9 xmloff/source/style/XMLFontStylesContext.cxx | 13 xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx | 19 xmloff/source/text/XMLFootnoteImportContext.cxx | 9 xmloff/source/text/XMLIndexSourceBaseContext.hxx | 40 - xmloff/source/text/XMLSectionImportContext.cxx | 17 xmloff/source/text/txtfldi.cxx | 14 13 files changed, 724 deletions(-)
New commits: commit c3f628e7905da6ff4586a0ee429af5769dd6f4eb Author: Noel <noelgran...@gmail.com> AuthorDate: Tue Dec 8 12:20:32 2020 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Tue Dec 8 18:59:23 2020 +0100 remove now unused XML_TOK_ constants Change-Id: I73da015abc824194b88c53b87170c987d24080a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107411 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index a047b0865ae7..4dc7634b651c 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -45,90 +45,6 @@ class XMLSdPropHdlFactory; class SvXMLImportPropertyMapper; class XMLTableImport; - -enum SdXMLGroupShapeElemTokenMap -{ - XML_TOK_GROUP_GROUP, - XML_TOK_GROUP_RECT, - XML_TOK_GROUP_LINE, - XML_TOK_GROUP_CIRCLE, - XML_TOK_GROUP_ELLIPSE, - XML_TOK_GROUP_POLYGON, - XML_TOK_GROUP_POLYLINE, - XML_TOK_GROUP_PATH, - - XML_TOK_GROUP_CONTROL, - XML_TOK_GROUP_CONNECTOR, - XML_TOK_GROUP_MEASURE, - XML_TOK_GROUP_PAGE, - XML_TOK_GROUP_CAPTION, - - XML_TOK_GROUP_CHART, - XML_TOK_GROUP_3DSCENE, - - XML_TOK_GROUP_FRAME, - - XML_TOK_GROUP_CUSTOM_SHAPE, - - XML_TOK_GROUP_ANNOTATION, - - XML_TOK_GROUP_A -}; - -enum SdXMLFrameShapeElemTokenMap -{ - XML_TOK_FRAME_TEXT_BOX, - XML_TOK_FRAME_IMAGE, - XML_TOK_FRAME_OBJECT, - XML_TOK_FRAME_OBJECT_OLE, - XML_TOK_FRAME_PLUGIN, - XML_TOK_FRAME_FLOATING_FRAME, - XML_TOK_FRAME_APPLET, - XML_TOK_FRAME_TABLE -}; - -enum SdXML3DSceneShapeElemTokenMap -{ - XML_TOK_3DSCENE_3DSCENE, - XML_TOK_3DSCENE_3DCUBE, - XML_TOK_3DSCENE_3DSPHERE, - XML_TOK_3DSCENE_3DLATHE, - XML_TOK_3DSCENE_3DEXTRUDE -}; - -enum SdXML3DObjectAttrTokenMap -{ - XML_TOK_3DOBJECT_DRAWSTYLE_NAME, - XML_TOK_3DOBJECT_TRANSFORM -}; - -enum SdXML3DPolygonBasedAttrTokenMap -{ - XML_TOK_3DPOLYGONBASED_VIEWBOX, - XML_TOK_3DPOLYGONBASED_D -}; - -enum SdXML3DCubeObjectAttrTokenMap -{ - XML_TOK_3DCUBEOBJ_MINEDGE, - XML_TOK_3DCUBEOBJ_MAXEDGE -}; - -enum SdXML3DSphereObjectAttrTokenMap -{ - XML_TOK_3DSPHEREOBJ_CENTER, - XML_TOK_3DSPHEREOBJ_SIZE -}; - -enum SdXML3DLightAttrTokenMap -{ - XML_TOK_3DLIGHT_DIFFUSE_COLOR, - XML_TOK_3DLIGHT_DIRECTION, - XML_TOK_3DLIGHT_ENABLED, - XML_TOK_3DLIGHT_SPECULAR -}; - - // dr3d:3dlight context class SdXML3DLightContext final : public SvXMLImportContext diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index c8a1c80e4425..9259747bd94d 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -65,267 +65,6 @@ namespace util { struct DateTime; } namespace rtl { template <class reference_type> class Reference; } -enum SwXMLTextElemTokens -{ - XML_TOK_TEXT_P, - XML_TOK_TEXT_H, - XML_TOK_TEXT_LIST, - XML_TOK_TEXT_FRAME_PAGE, - XML_TOK_TABLE_TABLE, - XML_TOK_TEXT_VARFIELD_DECLS, - XML_TOK_TEXT_USERFIELD_DECLS, - XML_TOK_TEXT_SEQUENCE_DECLS, - XML_TOK_TEXT_DDE_DECLS, - XML_TOK_DRAW_A_PAGE, - XML_TOK_TEXT_SECTION, - XML_TOK_TEXT_TOC, - XML_TOK_TEXT_OBJECT_INDEX, - XML_TOK_TEXT_TABLE_INDEX, - XML_TOK_TEXT_ILLUSTRATION_INDEX, - XML_TOK_TEXT_USER_INDEX, - XML_TOK_TEXT_ALPHABETICAL_INDEX, - XML_TOK_TEXT_BIBLIOGRAPHY_INDEX, - XML_TOK_TEXT_INDEX_TITLE, - XML_TOK_TEXT_TRACKED_CHANGES, - XML_TOK_TEXT_CHANGE_START, - XML_TOK_TEXT_CHANGE_END, - XML_TOK_TEXT_CHANGE, - XML_TOK_TEXT_FORMS, - XML_TOK_TEXT_CALCULATION_SETTINGS, - XML_TOK_TEXT_AUTOMARK, - XML_TOK_TEXT_NUMBERED_PARAGRAPH -}; - -enum XMLTextPElemTokens -{ - XML_TOK_TEXT_SPAN, - XML_TOK_TEXT_TAB_STOP, - XML_TOK_TEXT_LINE_BREAK, - XML_TOK_TEXT_SOFT_PAGE_BREAK, - XML_TOK_TEXT_S, - XML_TOK_TEXT_FRAME, - XML_TOK_TEXT_HYPERLINK, - XML_TOK_TEXT_RUBY, - - XML_TOK_TEXT_NOTE, - XML_TOK_TEXT_BOOKMARK, - XML_TOK_TEXT_BOOKMARK_START, - XML_TOK_TEXT_BOOKMARK_END, - XML_TOK_TEXT_REFERENCE, - XML_TOK_TEXT_REFERENCE_START, - XML_TOK_TEXT_REFERENCE_END, - - XML_TOK_TEXT_TOC_MARK, // index marks - XML_TOK_TEXT_TOC_MARK_START, - XML_TOK_TEXT_TOC_MARK_END, - XML_TOK_TEXT_USER_INDEX_MARK, - XML_TOK_TEXT_USER_INDEX_MARK_START, - XML_TOK_TEXT_USER_INDEX_MARK_END, - XML_TOK_TEXT_ALPHA_INDEX_MARK, - XML_TOK_TEXT_ALPHA_INDEX_MARK_START, - XML_TOK_TEXT_ALPHA_INDEX_MARK_END, - - XML_TOK_TEXT_SENDER_FIRSTNAME, // sender fields - XML_TOK_TEXT_SENDER_LASTNAME, - XML_TOK_TEXT_SENDER_INITIALS, - XML_TOK_TEXT_SENDER_TITLE, - XML_TOK_TEXT_SENDER_POSITION, - XML_TOK_TEXT_SENDER_EMAIL, - XML_TOK_TEXT_SENDER_PHONE_PRIVATE, - XML_TOK_TEXT_SENDER_FAX, - XML_TOK_TEXT_SENDER_COMPANY, - XML_TOK_TEXT_SENDER_PHONE_WORK, - XML_TOK_TEXT_SENDER_STREET, - XML_TOK_TEXT_SENDER_CITY, - XML_TOK_TEXT_SENDER_POSTAL_CODE, - XML_TOK_TEXT_SENDER_COUNTRY, - XML_TOK_TEXT_SENDER_STATE_OR_PROVINCE, - - XML_TOK_TEXT_AUTHOR_NAME, // author fields - XML_TOK_TEXT_AUTHOR_INITIALS, - - XML_TOK_TEXT_DATE, // date & time fields - XML_TOK_TEXT_TIME, - - XML_TOK_TEXT_PAGE_NUMBER, // page number fields - XML_TOK_TEXT_PAGE_CONTINUATION_STRING, - - XML_TOK_TEXT_VARIABLE_SET, // variable fields - XML_TOK_TEXT_VARIABLE_GET, - XML_TOK_TEXT_VARIABLE_INPUT, - XML_TOK_TEXT_USER_FIELD_GET, - XML_TOK_TEXT_USER_FIELD_INPUT, - XML_TOK_TEXT_SEQUENCE, - XML_TOK_TEXT_EXPRESSION, - XML_TOK_TEXT_TEXT_INPUT, - - XML_TOK_TEXT_DATABASE_DISPLAY, // database fields - XML_TOK_TEXT_DATABASE_NEXT, - XML_TOK_TEXT_DATABASE_SELECT, - XML_TOK_TEXT_DATABASE_ROW_NUMBER, - XML_TOK_TEXT_DATABASE_NAME, - - XML_TOK_TEXT_DOCUMENT_CREATION_AUTHOR, //document info fields - XML_TOK_TEXT_DOCUMENT_CREATION_DATE, - XML_TOK_TEXT_DOCUMENT_CREATION_TIME, - XML_TOK_TEXT_DOCUMENT_DESCRIPTION, - XML_TOK_TEXT_DOCUMENT_PRINT_AUTHOR, - XML_TOK_TEXT_DOCUMENT_PRINT_DATE, - XML_TOK_TEXT_DOCUMENT_PRINT_TIME, - XML_TOK_TEXT_DOCUMENT_TITLE, - XML_TOK_TEXT_DOCUMENT_SUBJECT, - XML_TOK_TEXT_DOCUMENT_KEYWORDS, - XML_TOK_TEXT_DOCUMENT_REVISION, - XML_TOK_TEXT_DOCUMENT_EDIT_DURATION, - XML_TOK_TEXT_DOCUMENT_SAVE_AUTHOR, - XML_TOK_TEXT_DOCUMENT_SAVE_DATE, - XML_TOK_TEXT_DOCUMENT_SAVE_TIME, - XML_TOK_TEXT_DOCUMENT_USER_DEFINED, - - XML_TOK_TEXT_PLACEHOLDER, // misc. fields - XML_TOK_TEXT_CONDITIONAL_TEXT, - XML_TOK_TEXT_HIDDEN_TEXT, - XML_TOK_TEXT_HIDDEN_PARAGRAPH, - XML_TOK_TEXT_FILENAME, - XML_TOK_TEXT_CHAPTER, - XML_TOK_TEXT_TEMPLATENAME, - XML_TOK_TEXT_WORD_COUNT, // statistics/count fields - XML_TOK_TEXT_PARAGRAPH_COUNT, - XML_TOK_TEXT_TABLE_COUNT, - XML_TOK_TEXT_CHARACTER_COUNT, - XML_TOK_TEXT_IMAGE_COUNT, - XML_TOK_TEXT_OBJECT_COUNT, - XML_TOK_TEXT_PAGE_COUNT, - XML_TOK_TEXT_GET_PAGE_VAR, - XML_TOK_TEXT_SET_PAGE_VAR, - XML_TOK_TEXT_MACRO, - XML_TOK_TEXT_DDE, - XML_TOK_TEXT_REFERENCE_REF, - XML_TOK_TEXT_BOOKMARK_REF, - XML_TOK_TEXT_SEQUENCE_REF, - XML_TOK_TEXT_NOTE_REF, - XML_TOK_TEXT_SHEET_NAME, - XML_TOK_TEXT_PAGE_NAME, - XML_TOK_TEXT_BIBLIOGRAPHY_MARK, - XML_TOK_TEXT_ANNOTATION, - XML_TOK_TEXT_ANNOTATION_END, - XML_TOK_TEXT_NAME, - XML_TOK_TEXT_RESOLVED, - XML_TOK_TEXT_SCRIPT, - XML_TOK_TEXT_TABLE_FORMULA, - XML_TOK_TEXT_DROP_DOWN, - - // RDF metadata - XML_TOK_TEXT_META, - XML_TOK_TEXT_META_FIELD, - - // misc - XML_TOK_TEXTP_CHANGE_START, // TEXTP avoids clash with SwXMLTextElemTokens - XML_TOK_TEXTP_CHANGE_END, - XML_TOK_TEXTP_CHANGE, - XML_TOK_DRAW_A, - XML_TOK_TEXT_MEASURE, - - XML_TOK_DRAW_HEADER, - XML_TOK_DRAW_FOOTER, - XML_TOK_DRAW_DATE_TIME, - XML_TOK_TEXT_PAGE_CONTINUATION, - - XML_TOK_TEXT_FIELDMARK, - XML_TOK_TEXT_FIELDMARK_START, - XML_TOK_TEXT_FIELDMARK_END -}; - -enum XMLTextPAttrTokens -{ - XML_TOK_TEXT_P_XMLID, - XML_TOK_TEXT_P_ABOUT, - XML_TOK_TEXT_P_PROPERTY, - XML_TOK_TEXT_P_CONTENT, - XML_TOK_TEXT_P_DATATYPE, - XML_TOK_TEXT_P_TEXTID, - XML_TOK_TEXT_P_STYLE_NAME, - XML_TOK_TEXT_P_COND_STYLE_NAME, - XML_TOK_TEXT_P_OUTLINE_CONTENT_VISIBLE, - XML_TOK_TEXT_P_LEVEL, - XML_TOK_TEXT_P_IS_LIST_HEADER, - XML_TOK_TEXT_P_RESTART_NUMBERING, - XML_TOK_TEXT_P_START_VALUE -}; - -enum XMLTextNumberedParagraphAttrTokens -{ - XML_TOK_TEXT_NUMBERED_PARAGRAPH_XMLID, - XML_TOK_TEXT_NUMBERED_PARAGRAPH_LIST_ID, - XML_TOK_TEXT_NUMBERED_PARAGRAPH_LEVEL, - XML_TOK_TEXT_NUMBERED_PARAGRAPH_STYLE_NAME, - XML_TOK_TEXT_NUMBERED_PARAGRAPH_CONTINUE_NUMBERING, - XML_TOK_TEXT_NUMBERED_PARAGRAPH_START_VALUE -}; - -enum XMLTextListBlockAttrTokens -{ - XML_TOK_TEXT_LIST_BLOCK_XMLID, - XML_TOK_TEXT_LIST_BLOCK_STYLE_NAME, - XML_TOK_TEXT_LIST_BLOCK_CONTINUE_NUMBERING, - XML_TOK_TEXT_LIST_BLOCK_CONTINUE_LIST -}; - -enum XMLTextListBlockElemTokens -{ - XML_TOK_TEXT_LIST_HEADER, - XML_TOK_TEXT_LIST_ITEM -}; - -enum XMLTextFrameAttrTokens -{ - XML_TOK_TEXT_FRAME_STYLE_NAME, - XML_TOK_TEXT_FRAME_NAME, - XML_TOK_TEXT_FRAME_ANCHOR_TYPE, - XML_TOK_TEXT_FRAME_ANCHOR_PAGE_NUMBER, - XML_TOK_TEXT_FRAME_X, - XML_TOK_TEXT_FRAME_Y, - XML_TOK_TEXT_FRAME_WIDTH, - XML_TOK_TEXT_FRAME_REL_WIDTH, - XML_TOK_TEXT_FRAME_HEIGHT, - XML_TOK_TEXT_FRAME_MIN_HEIGHT, - XML_TOK_TEXT_FRAME_REL_HEIGHT, - XML_TOK_TEXT_FRAME_NEXT_CHAIN_NAME, - XML_TOK_TEXT_FRAME_HREF, - XML_TOK_TEXT_FRAME_Z_INDEX, - XML_TOK_TEXT_FRAME_TRANSFORM, - XML_TOK_TEXT_FRAME_CLASS_ID, - XML_TOK_TEXT_FRAME_CODE, - XML_TOK_TEXT_FRAME_OBJECT, - XML_TOK_TEXT_FRAME_ARCHIVE, - XML_TOK_TEXT_FRAME_MAY_SCRIPT, - XML_TOK_TEXT_FRAME_MIME_TYPE, - XML_TOK_TEXT_FRAME_APPLET_NAME, - XML_TOK_TEXT_FRAME_FRAME_NAME, - XML_TOK_TEXT_FRAME_NOTIFY_ON_UPDATE, - XML_TOK_TEXT_FRAME_MIN_WIDTH -}; - -enum XMLTextHyperlinkAttrTokens -{ - XML_TOK_TEXT_HYPERLINK_HREF, - XML_TOK_TEXT_HYPERLINK_NAME, - XML_TOK_TEXT_HYPERLINK_TARGET_FRAME, - XML_TOK_TEXT_HYPERLINK_SHOW, - XML_TOK_TEXT_HYPERLINK_STYLE_NAME, - XML_TOK_TEXT_HYPERLINK_VIS_STYLE_NAME, - XML_TOK_TEXT_HYPERLINK_SERVER_MAP -}; - -enum XMLTextContourAttrTokens -{ - XML_TOK_TEXT_CONTOUR_WIDTH, - XML_TOK_TEXT_CONTOUR_HEIGHT, - XML_TOK_TEXT_CONTOUR_VIEWBOX, - XML_TOK_TEXT_CONTOUR_POINTS, - XML_TOK_TEXT_CONTOUR_D, - XML_TOK_TEXT_CONTOUR_AUTO -}; enum XMLTextType { Body, diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index f0f246be02d5..c1fa72cd7b4d 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -58,90 +58,6 @@ class ScDrawObjData; } -enum ScXMLTableTokens -{ - XML_TOK_TABLE_NAMED_EXPRESSIONS, - XML_TOK_TABLE_COL_GROUP, - XML_TOK_TABLE_HEADER_COLS, - XML_TOK_TABLE_COLS, - XML_TOK_TABLE_COL, - XML_TOK_TABLE_ROW_GROUP, - XML_TOK_TABLE_HEADER_ROWS, - XML_TOK_TABLE_PROTECTION, - XML_TOK_TABLE_PROTECTION_EXT, - XML_TOK_TABLE_ROWS, - XML_TOK_TABLE_ROW, - XML_TOK_TABLE_SOURCE, - XML_TOK_TABLE_SCENARIO, - XML_TOK_TABLE_SHAPES, - XML_TOK_TABLE_FORMS, - XML_TOK_TABLE_EVENT_LISTENERS, - XML_TOK_TABLE_EVENT_LISTENERS_EXT, - XML_TOK_TABLE_CONDFORMATS -}; - -enum ScXMLTableRowsTokens -{ - XML_TOK_TABLE_ROWS_ROW_GROUP, - XML_TOK_TABLE_ROWS_HEADER_ROWS, - XML_TOK_TABLE_ROWS_ROWS, - XML_TOK_TABLE_ROWS_ROW -}; - -enum ScXMLTableRowTokens -{ - XML_TOK_TABLE_ROW_CELL, - XML_TOK_TABLE_ROW_COVERED_CELL -}; - -enum ScXMLTableRowAttrTokens -{ - XML_TOK_TABLE_ROW_ATTR_STYLE_NAME, - XML_TOK_TABLE_ROW_ATTR_VISIBILITY, - XML_TOK_TABLE_ROW_ATTR_REPEATED, - XML_TOK_TABLE_ROW_ATTR_DEFAULT_CELL_STYLE_NAME -// XML_TOK_TABLE_ROW_ATTR_USE_OPTIMAL_HEIGHT -}; - -enum ScXMLTableRowCellTokens -{ - XML_TOK_TABLE_ROW_CELL_P, - XML_TOK_TABLE_ROW_CELL_TABLE, - XML_TOK_TABLE_ROW_CELL_ANNOTATION, - XML_TOK_TABLE_ROW_CELL_DETECTIVE, - XML_TOK_TABLE_ROW_CELL_CELL_RANGE_SOURCE -}; - -enum ScXMLTableRowCellAttrTokens -{ - XML_TOK_TABLE_ROW_CELL_ATTR_STYLE_NAME, - XML_TOK_TABLE_ROW_CELL_ATTR_CONTENT_VALIDATION_NAME, - XML_TOK_TABLE_ROW_CELL_ATTR_SPANNED_ROWS, - XML_TOK_TABLE_ROW_CELL_ATTR_SPANNED_COLS, - XML_TOK_TABLE_ROW_CELL_ATTR_SPANNED_MATRIX_COLS, - XML_TOK_TABLE_ROW_CELL_ATTR_SPANNED_MATRIX_ROWS, - XML_TOK_TABLE_ROW_CELL_ATTR_REPEATED, - XML_TOK_TABLE_ROW_CELL_ATTR_VALUE_TYPE, - XML_TOK_TABLE_ROW_CELL_ATTR_NEW_VALUE_TYPE, - XML_TOK_TABLE_ROW_CELL_ATTR_VALUE, - XML_TOK_TABLE_ROW_CELL_ATTR_DATE_VALUE, - XML_TOK_TABLE_ROW_CELL_ATTR_TIME_VALUE, - XML_TOK_TABLE_ROW_CELL_ATTR_STRING_VALUE, - XML_TOK_TABLE_ROW_CELL_ATTR_BOOLEAN_VALUE, - XML_TOK_TABLE_ROW_CELL_ATTR_FORMULA, - XML_TOK_TABLE_ROW_CELL_ATTR_CURRENCY -}; - -enum ScXMLAnnotationAttrTokens -{ - XML_TOK_TABLE_ANNOTATION_ATTR_AUTHOR, - XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE, - XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE_STRING, - XML_TOK_TABLE_ANNOTATION_ATTR_DISPLAY, - XML_TOK_TABLE_ANNOTATION_ATTR_X, - XML_TOK_TABLE_ANNOTATION_ATTR_Y -}; - class SvXMLTokenMap; class XMLShapeImportHelper; class ScXMLChangeTrackingImportHelper; diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 33067c9e4c8e..77f7ee7f9128 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -78,38 +78,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; -namespace { - -enum SwXMLTableElemTokens -{ - XML_TOK_TABLE_HEADER_COLS, - XML_TOK_TABLE_COLS, - XML_TOK_TABLE_COL, - XML_TOK_TABLE_HEADER_ROWS, - XML_TOK_TABLE_ROWS, - XML_TOK_TABLE_ROW, - XML_TOK_OFFICE_DDE_SOURCE, -}; - -enum SwXMLTableCellAttrTokens -{ - XML_TOK_TABLE_XMLID, - XML_TOK_TABLE_STYLE_NAME, - XML_TOK_TABLE_NUM_COLS_SPANNED, - XML_TOK_TABLE_NUM_ROWS_SPANNED, - XML_TOK_TABLE_NUM_COLS_REPEATED, - XML_TOK_TABLE_FORMULA, - XML_TOK_TABLE_VALUE, - XML_TOK_TABLE_TIME_VALUE, - XML_TOK_TABLE_DATE_VALUE, - XML_TOK_TABLE_BOOLEAN_VALUE, - XML_TOK_TABLE_PROTECTED, - XML_TOK_TABLE_STRING_VALUE, - XML_TOK_TABLE_VALUE_TYPE, -}; - -} - class SwXMLTableCell_Impl { OUString aStyleName; diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx index 33b0f50d5764..6b8047afe638 100644 --- a/xmloff/inc/SchXMLImport.hxx +++ b/xmloff/inc/SchXMLImport.hxx @@ -23,130 +23,6 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/xmlictxt.hxx> -/* - these enums are used for the - SvXMLTokenMapEntries to distinguish - the tokens in switch-directives -*/ - -enum SchXMLDocElemTokenMap -{ - XML_TOK_DOC_AUTOSTYLES, - XML_TOK_DOC_STYLES, - XML_TOK_DOC_META, - XML_TOK_DOC_BODY -}; - -enum SchXMLTableElemTokenMap -{ - XML_TOK_TABLE_HEADER_COLS, - XML_TOK_TABLE_COLUMNS, - XML_TOK_TABLE_COLUMN, - XML_TOK_TABLE_HEADER_ROWS, - XML_TOK_TABLE_ROWS, - XML_TOK_TABLE_ROW -}; - -enum SchXMLChartElemTokenMap -{ - XML_TOK_CHART_PLOT_AREA, - XML_TOK_CHART_TITLE, - XML_TOK_CHART_SUBTITLE, - XML_TOK_CHART_LEGEND, - XML_TOK_CHART_TABLE -}; - -enum SchXMLPlotAreaElemTokenMap -{ - XML_TOK_PA_COORDINATE_REGION_EXT, - XML_TOK_PA_COORDINATE_REGION, - XML_TOK_PA_AXIS, - XML_TOK_PA_SERIES, - XML_TOK_PA_WALL, - XML_TOK_PA_FLOOR, - XML_TOK_PA_LIGHT_SOURCE, - XML_TOK_PA_STOCK_GAIN, - XML_TOK_PA_STOCK_LOSS, - XML_TOK_PA_STOCK_RANGE -}; - -enum SchXMLSeriesElemTokenMap -{ - XML_TOK_SERIES_DATA_POINT, - XML_TOK_SERIES_DATA_LABEL, - XML_TOK_SERIES_DOMAIN, - XML_TOK_SERIES_MEAN_VALUE_LINE, - XML_TOK_SERIES_REGRESSION_CURVE, - XML_TOK_SERIES_ERROR_INDICATOR, - XML_TOK_SERIES_PROPERTY_MAPPING -}; - -enum SchXMLPropertyMappingAttrTokenMap -{ - XML_TOK_PROPERTY_MAPPING_PROPERTY, - XML_TOK_PROPERTY_MAPPING_RANGE -}; - -enum SchXMLChartAttrMap -{ - XML_TOK_CHART_HREF, - XML_TOK_CHART_CLASS, - XML_TOK_CHART_WIDTH, - XML_TOK_CHART_HEIGHT, - XML_TOK_CHART_STYLE_NAME, - XML_TOK_CHART_COL_MAPPING, - XML_TOK_CHART_ROW_MAPPING, - XML_TOK_CHART_DATA_PILOT_SOURCE, -}; - -enum SchXMLPlotAreaAttrTokenMap -{ - XML_TOK_PA_X, - XML_TOK_PA_Y, - XML_TOK_PA_WIDTH, - XML_TOK_PA_HEIGHT, - XML_TOK_PA_STYLE_NAME, - XML_TOK_PA_TRANSFORM, - XML_TOK_PA_CHART_ADDRESS, - XML_TOK_PA_DS_HAS_LABELS, - XML_TOK_PA_VRP, - XML_TOK_PA_VPN, - XML_TOK_PA_VUP, - XML_TOK_PA_PROJECTION, - XML_TOK_PA_DISTANCE, - XML_TOK_PA_FOCAL_LENGTH, - XML_TOK_PA_SHADOW_SLANT, - XML_TOK_PA_SHADE_MODE, - XML_TOK_PA_AMBIENT_COLOR, - XML_TOK_PA_LIGHTING_MODE -}; - -enum SchXMLCellAttrMap -{ - XML_TOK_CELL_VAL_TYPE, - XML_TOK_CELL_VALUE -}; - -enum SchXMLSeriesAttrMap -{ - XML_TOK_SERIES_CELL_RANGE, - XML_TOK_SERIES_LABEL_ADDRESS, - XML_TOK_SERIES_LABEL_STRING, - XML_TOK_SERIES_ATTACHED_AXIS, - XML_TOK_SERIES_STYLE_NAME, - XML_TOK_SERIES_CHART_CLASS, - XML_TOK_SERIES_HIDE_LEGEND -}; - -enum SchXMLRegEquationAttrMap -{ - XML_TOK_REGEQ_STYLE_NAME, - XML_TOK_REGEQ_DISPLAY_EQUATION, - XML_TOK_REGEQ_DISPLAY_R_SQUARE, - XML_TOK_REGEQ_POS_X, - XML_TOK_REGEQ_POS_Y -}; - class SchXMLImport final : public SvXMLImport { private: diff --git a/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx index fd0f4597f934..7f44441da4e4 100644 --- a/xmloff/inc/XMLLineNumberingImportContext.hxx +++ b/xmloff/inc/XMLLineNumberingImportContext.hxx @@ -29,24 +29,6 @@ namespace com::sun::star { } -enum LineNumberingToken -{ - XML_TOK_LINENUMBERING_STYLE_NAME, - XML_TOK_LINENUMBERING_NUMBER_LINES, - XML_TOK_LINENUMBERING_COUNT_EMPTY_LINES, - XML_TOK_LINENUMBERING_COUNT_IN_TEXT_BOXES, - XML_TOK_LINENUMBERING_RESTART_NUMBERING, - XML_TOK_LINENUMBERING_OFFSET, - XML_TOK_LINENUMBERING_NUM_FORMAT, - XML_TOK_LINENUMBERING_NUM_LETTER_SYNC, - XML_TOK_LINENUMBERING_NUMBER_POSITION, - XML_TOK_LINENUMBERING_INCREMENT -// XML_TOK_LINENUMBERING_LINENUMBERING_CONFIGURATION, -// XML_TOK_LINENUMBERING_INCREMENT, -// XML_TOK_LINENUMBERING_LINENUMBERING_SEPARATOR, -}; - - /** import <text:linenumbering-configuration> elements */ class XMLLineNumberingImportContext final : public SvXMLStyleContext { diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx index 4447c093c566..17ba48af5c9e 100644 --- a/xmloff/source/chart/SchXMLAxisContext.cxx +++ b/xmloff/source/chart/SchXMLAxisContext.cxx @@ -819,15 +819,6 @@ DateScaleContext::DateScaleContext( namespace { -enum DateScaleAttributeTokens -{ - XML_TOK_DATESCALE_BASE_TIME_UNIT, - XML_TOK_DATESCALE_MAJOR_INTERVAL_VALUE, - XML_TOK_DATESCALE_MAJOR_INTERVAL_UNIT, - XML_TOK_DATESCALE_MINOR_INTERVAL_VALUE, - XML_TOK_DATESCALE_MINOR_INTERVAL_UNIT -}; - sal_Int32 lcl_getTimeUnit( const OUString& rValue ) { sal_Int32 nTimeUnit = css::chart::TimeUnit::DAY; diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index 6d58300989fd..56d87c02cad4 100644 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -49,19 +49,6 @@ using namespace ::xmloff::token; #define XML_STYLE_FAMILY_FONT XmlStyleFamily::PAGE_MASTER -namespace { - -enum XMLFontStyleAttrTokens -{ - XML_TOK_FONT_STYLE_ATTR_FAMILY, - XML_TOK_FONT_STYLE_ATTR_FAMILY_GENERIC, - XML_TOK_FONT_STYLE_ATTR_STYLENAME, - XML_TOK_FONT_STYLE_ATTR_PITCH, - XML_TOK_FONT_STYLE_ATTR_CHARSET, -}; - -} - XMLFontStyleContextFontFace::XMLFontStyleContextFontFace( SvXMLImport& rImport, XMLFontStylesContext& rStyles ) : SvXMLStyleContext( rImport, XML_STYLE_FAMILY_FONT ), diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx index eb2c4480656c..756c85377bab 100644 --- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx @@ -150,25 +150,6 @@ XMLFootnoteConfigurationImportContext::~XMLFootnoteConfigurationImportContext() { } -namespace { - -enum XMLFtnConfigToken -{ - XML_TOK_FTNCONFIG_CITATION_STYLENAME, - XML_TOK_FTNCONFIG_ANCHOR_STYLENAME, - XML_TOK_FTNCONFIG_DEFAULT_STYLENAME, - XML_TOK_FTNCONFIG_PAGE_STYLENAME, - XML_TOK_FTNCONFIG_OFFSET, - XML_TOK_FTNCONFIG_NUM_PREFIX, - XML_TOK_FTNCONFIG_NUM_SUFFIX, - XML_TOK_FTNCONFIG_NUM_FORMAT, - XML_TOK_FTNCONFIG_NUM_SYNC, - XML_TOK_FTNCONFIG_START_AT, - XML_TOK_FTNCONFIG_POSITION -}; - -} - SvXMLEnumMapEntry<sal_Int16> const aFootnoteNumberingMap[] = { { XML_PAGE, FootnoteNumbering::PER_PAGE }, diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx index dd660ab75fae..fea2e95c4b2a 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteImportContext.cxx @@ -44,15 +44,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; -namespace { - -enum XMLFootnoteChildToken { - XML_TOK_FTN_NOTE_CITATION, - XML_TOK_FTN_NOTE_BODY -}; - -} - XMLFootnoteImportContext::XMLFootnoteImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp ) diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.hxx b/xmloff/source/text/XMLIndexSourceBaseContext.hxx index b312bff1a712..69568bf55390 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.hxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.hxx @@ -30,46 +30,6 @@ namespace com::sun::star { namespace beans { class XPropertySet; } } -enum IndexSourceParamEnum -{ - XML_TOK_INDEXSOURCE_OUTLINE_LEVEL, - XML_TOK_INDEXSOURCE_USE_INDEX_MARKS, - XML_TOK_INDEXSOURCE_INDEX_SCOPE, - XML_TOK_INDEXSOURCE_RELATIVE_TABS, - XML_TOK_INDEXSOURCE_USE_OTHER_OBJECTS, - XML_TOK_INDEXSOURCE_USE_SHEET, - XML_TOK_INDEXSOURCE_USE_CHART, - XML_TOK_INDEXSOURCE_USE_DRAW, - XML_TOK_INDEXSOURCE_USE_IMAGE, - XML_TOK_INDEXSOURCE_USE_MATH, - XML_TOK_INDEXSOURCE_MAIN_ENTRY_STYLE, - XML_TOK_INDEXSOURCE_IGNORE_CASE, - XML_TOK_INDEXSOURCE_SEPARATORS, - XML_TOK_INDEXSOURCE_COMBINE_ENTRIES, - XML_TOK_INDEXSOURCE_COMBINE_WITH_DASH, - XML_TOK_INDEXSOURCE_KEYS_AS_ENTRIES, - XML_TOK_INDEXSOURCE_COMBINE_WITH_PP, - XML_TOK_INDEXSOURCE_CAPITALIZE, - XML_TOK_INDEXSOURCE_USE_OBJECTS, - XML_TOK_INDEXSOURCE_USE_GRAPHICS, - XML_TOK_INDEXSOURCE_USE_TABLES, - XML_TOK_INDEXSOURCE_USE_FRAMES, - XML_TOK_INDEXSOURCE_COPY_OUTLINE_LEVELS, - XML_TOK_INDEXSOURCE_USE_CAPTION, - XML_TOK_INDEXSOURCE_SEQUENCE_NAME, - XML_TOK_INDEXSOURCE_SEQUENCE_FORMAT, - XML_TOK_INDEXSOURCE_COMMA_SEPARATED, - XML_TOK_INDEXSOURCE_USE_INDEX_SOURCE_STYLES, - XML_TOK_INDEXSOURCE_SORT_ALGORITHM, - XML_TOK_INDEXSOURCE_RFC_LANGUAGE_TAG, - XML_TOK_INDEXSOURCE_LANGUAGE, - XML_TOK_INDEXSOURCE_SCRIPT, - XML_TOK_INDEXSOURCE_COUNTRY, - XML_TOK_INDEXSOURCE_USER_INDEX_NAME, - XML_TOK_INDEXSOURCE_USE_OUTLINE_LEVEL -}; - - /** * Superclass for index source elements */ diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx index 5959f50e4919..701fc76af839 100644 --- a/xmloff/source/text/XMLSectionImportContext.cxx +++ b/xmloff/source/text/XMLSectionImportContext.cxx @@ -50,23 +50,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; using namespace ::xmloff::token; -namespace { - -enum XMLSectionToken -{ - XML_TOK_SECTION_XMLID, - XML_TOK_SECTION_STYLE_NAME, - XML_TOK_SECTION_NAME, - XML_TOK_SECTION_CONDITION, - XML_TOK_SECTION_DISPLAY, - XML_TOK_SECTION_PROTECT, - XML_TOK_SECTION_PROTECTION_KEY, - XML_TOK_SECTION_IS_HIDDEN -}; - -} - - // section import: This one is fairly tricky due to a variety of // limits of the core or the API. The main problem is that if you diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 6db4ae090453..53794de8a9f7 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -2599,20 +2599,6 @@ void XMLReferenceFieldImportContext::PrepareField( // field declarations container -namespace { - -enum DdeFieldDeclAttrs -{ - XML_TOK_DDEFIELD_NAME, - XML_TOK_DDEFIELD_APPLICATION, - XML_TOK_DDEFIELD_TOPIC, - XML_TOK_DDEFIELD_ITEM, - XML_TOK_DDEFIELD_UPDATE -}; - -} - - XMLDdeFieldDeclsImportContext::XMLDdeFieldDeclsImportContext(SvXMLImport& rImport) : SvXMLImportContext(rImport) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits