include/vcl/errcode.hxx | 5 sc/source/filter/xml/xmlimprt.hxx | 270 -------------------------------------- vcl/source/helper/errcode.cxx | 15 -- 3 files changed, 290 deletions(-)
New commits: commit 5ecc8e79d84c985fc5835b941924541c135eeeec Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Wed Nov 29 12:20:39 2017 +0200 loplugin:unusedenumconstants Change-Id: Iebcd8688ec807aa61989b4622ea0d3eca5c4c671 Reviewed-on: https://gerrit.libreoffice.org/45478 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/include/vcl/errcode.hxx b/include/vcl/errcode.hxx index 31582a79d962..4116a792c43e 100644 --- a/include/vcl/errcode.hxx +++ b/include/vcl/errcode.hxx @@ -148,18 +148,13 @@ VCL_DLLPUBLIC std::ostream& operator<<(std::ostream& os, const ErrCode& err); enum class ErrCodeArea { Io = 0 , - Sv = 1 , Sfx = 2 , Inet = 3 , Vcl = 4 , Svx = 8 , So = 9 , Sbx = 10, - Db = 11, - Java = 12, Uui = 13, - Lib2 = 14, - Chaos = 15, Sc = 32, Sd = 40, Sw = 56, diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 89a9cbb0c99a..6cf664bdcf8d 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -242,276 +242,6 @@ enum ScXMLAnnotationAttrTokens XML_TOK_TABLE_ANNOTATION_ATTR_Y }; -enum ScXMLDetectiveElemTokens -{ - XML_TOK_DETECTIVE_ELEM_HIGHLIGHTED, - XML_TOK_DETECTIVE_ELEM_OPERATION -}; - -enum ScXMLDetectiveHighlightedAttrTokens -{ - XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CELL_RANGE, - XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_DIRECTION, - XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CONTAINS_ERROR, - XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_MARKED_INVALID -}; - -enum ScXMLDetectiveOperationAttrTokens -{ - XML_TOK_DETECTIVE_OPERATION_ATTR_NAME, - XML_TOK_DETECTIVE_OPERATION_ATTR_INDEX -}; - -enum ScXMLCellRangeSourceAttrTokens -{ - XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_NAME, - XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_HREF, - XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_FILTER_NAME, - XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_FILTER_OPTIONS, - XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_LAST_COLUMN, - XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_LAST_ROW, - XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_REFRESH_DELAY -}; - -enum ScXMLDatabaseRangeSourceSQLAttrTokens -{ - XML_TOK_SOURCE_SQL_ATTR_DATABASE_NAME, - XML_TOK_SOURCE_SQL_ATTR_HREF, - XML_TOK_SOURCE_SQL_ATTR_CONNECTION_RESOURCE, - XML_TOK_SOURCE_SQL_ATTR_SQL_STATEMENT, - XML_TOK_SOURCE_SQL_ATTR_PARSE_SQL_STATEMENT -}; - -enum ScXMLDatabaseRangeSourceTableAttrTokens -{ - XML_TOK_SOURCE_TABLE_ATTR_DATABASE_NAME, - XML_TOK_SOURCE_TABLE_ATTR_HREF, - XML_TOK_SOURCE_TABLE_ATTR_CONNECTION_RESOURCE, - XML_TOK_SOURCE_TABLE_ATTR_TABLE_NAME -}; - -enum ScXMLDatabaseRangeSourceQueryAttrTokens -{ - XML_TOK_SOURCE_QUERY_ATTR_DATABASE_NAME, - XML_TOK_SOURCE_QUERY_ATTR_HREF, - XML_TOK_SOURCE_QUERY_ATTR_CONNECTION_RESOURCE, - XML_TOK_SOURCE_QUERY_ATTR_QUERY_NAME -}; - -enum ScXMLFilterTokens -{ - XML_TOK_FILTER_AND, - XML_TOK_FILTER_OR, - XML_TOK_FILTER_CONDITION -}; - -enum ScXMLFilterAttrTokens -{ - XML_TOK_FILTER_ATTR_TARGET_RANGE_ADDRESS, - XML_TOK_FILTER_ATTR_CONDITION_SOURCE_RANGE_ADDRESS, - XML_TOK_FILTER_ATTR_CONDITION_SOURCE, - XML_TOK_FILTER_ATTR_DISPLAY_DUPLICATES -}; - -enum ScXMLFilterConditionElemTokens -{ - XML_TOK_CONDITION_FILTER_SET_ITEM -}; - -enum ScXMLFilterConditionAttrTokens -{ - XML_TOK_CONDITION_ATTR_FIELD_NUMBER, - XML_TOK_CONDITION_ATTR_CASE_SENSITIVE, - XML_TOK_CONDITION_ATTR_DATA_TYPE, - XML_TOK_CONDITION_ATTR_VALUE, - XML_TOK_CONDITION_ATTR_OPERATOR -}; - -enum ScXMLFilterSetItemAttrTokens -{ - XML_TOK_FILTER_SET_ITEM_ATTR_VALUE -}; - -enum ScXMLSortTokens -{ - XML_TOK_SORT_SORT_BY -}; - -enum ScXMLSortSortByAttrTokens -{ - XML_TOK_SORT_BY_ATTR_FIELD_NUMBER, - XML_TOK_SORT_BY_ATTR_DATA_TYPE, - XML_TOK_SORT_BY_ATTR_ORDER -}; - -enum ScXMLDataPilotTablesElemTokens -{ - XML_TOK_DATA_PILOT_TABLE -}; - -enum ScXMLDataPilotTableAttrTokens -{ - XML_TOK_DATA_PILOT_TABLE_ATTR_NAME, - XML_TOK_DATA_PILOT_TABLE_ATTR_APPLICATION_DATA, - XML_TOK_DATA_PILOT_TABLE_ATTR_GRAND_TOTAL, - XML_TOK_DATA_PILOT_TABLE_ATTR_IGNORE_EMPTY_ROWS, - XML_TOK_DATA_PILOT_TABLE_ATTR_IDENTIFY_CATEGORIES, - XML_TOK_DATA_PILOT_TABLE_ATTR_TARGET_RANGE_ADDRESS, - XML_TOK_DATA_PILOT_TABLE_ATTR_BUTTONS, - XML_TOK_DATA_PILOT_TABLE_ATTR_SHOW_FILTER_BUTTON, - XML_TOK_DATA_PILOT_TABLE_ATTR_DRILL_DOWN, - XML_TOK_DATA_PILOT_TABLE_ATTR_HEADER_GRID_LAYOUT -}; - -enum ScXMLDataPilotTableElemTokens -{ - XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SQL, - XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_TABLE, - XML_TOK_DATA_PILOT_TABLE_ELEM_GRAND_TOTAL, - XML_TOK_DATA_PILOT_TABLE_ELEM_GRAND_TOTAL_EXT, - XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_QUERY, - XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SERVICE, - XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_CELL_RANGE, - XML_TOK_DATA_PILOT_TABLE_ELEM_DATA_PILOT_FIELD -}; - -enum ScXMLDataPilotTableSourceServiceAttrTokens -{ - XML_TOK_SOURCE_SERVICE_ATTR_NAME, - XML_TOK_SOURCE_SERVICE_ATTR_SOURCE_NAME, - XML_TOK_SOURCE_SERVICE_ATTR_OBJECT_NAME, - XML_TOK_SOURCE_SERVICE_ATTR_USER_NAME, - XML_TOK_SOURCE_SERVICE_ATTR_PASSWORD -}; - -enum ScXMLDataPilotGrandTotalAttrTokens -{ - XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY, - XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_ORIENTATION, - XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY_NAME, - XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY_NAME_EXT -}; - -enum ScXMLDataPilotTableSourceCellRangeElemTokens -{ - XML_TOK_SOURCE_CELL_RANGE_ELEM_FILTER -}; - -enum ScXMLDataPilotTableSourceCellRangeAttrTokens -{ - XML_TOK_SOURCE_CELL_RANGE_ATTR_CELL_RANGE_ADDRESS, - XML_TOK_SOURCE_CELL_RANGE_ATTR_NAME -}; - -enum ScXMLDataPilotFieldAttrTokens -{ - XML_TOK_DATA_PILOT_FIELD_ATTR_SOURCE_FIELD_NAME, - XML_TOK_DATA_PILOT_FIELD_ATTR_DISPLAY_NAME, - XML_TOK_DATA_PILOT_FIELD_ATTR_DISPLAY_NAME_EXT, - XML_TOK_DATA_PILOT_FIELD_ATTR_IS_DATA_LAYOUT_FIELD, - XML_TOK_DATA_PILOT_FIELD_ATTR_FUNCTION, - XML_TOK_DATA_PILOT_FIELD_ATTR_ORIENTATION, - XML_TOK_DATA_PILOT_FIELD_ATTR_SELECTED_PAGE, - XML_TOK_DATA_PILOT_FIELD_ATTR_IGNORE_SELECTED_PAGE, - XML_TOK_DATA_PILOT_FIELD_ATTR_USED_HIERARCHY -}; - -enum ScXMLDataPilotFieldElemTokens -{ - XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LEVEL, - XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_REFERENCE, - XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_GROUPS -}; - -enum ScXMLDataPilotLevelAttrTokens -{ - XML_TOK_DATA_PILOT_LEVEL_ATTR_SHOW_EMPTY, - XML_TOK_DATA_PILOT_LEVEL_ATTR_REPEAT_ITEM_LABELS -}; - -enum ScXMLDataPilotLevelElemTokens -{ - XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_SUBTOTALS, - XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_MEMBERS, - XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_DISPLAY_INFO, - XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_SORT_INFO, - XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LAYOUT_INFO -}; - -enum ScXMLDataPilotSubTotalsElemTokens -{ - XML_TOK_DATA_PILOT_SUBTOTALS_ELEM_DATA_PILOT_SUBTOTAL -}; - -enum ScXMLDataPilotSubTotalAttrTokens -{ - XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_FUNCTION, - XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_DISPLAY_NAME, - XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_DISPLAY_NAME_EXT -}; - -enum ScXMLDataPilotMembersElemTokens -{ - XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER -}; - -enum ScXMLDataPilotMemberAttrTokens -{ - XML_TOK_DATA_PILOT_MEMBER_ATTR_NAME, - XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY_NAME, - XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY_NAME_EXT, - XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY, - XML_TOK_DATA_PILOT_MEMBER_ATTR_SHOW_DETAILS -}; - -/** - * Tokens for elements that come under <text:p> - */ -enum ScXMLCellTextParaElemTokens -{ - XML_TOK_CELL_TEXT_S, - XML_TOK_CELL_TEXT_SPAN, - XML_TOK_CELL_TEXT_SHEET_NAME, - XML_TOK_CELL_TEXT_DATE, - XML_TOK_CELL_TEXT_TITLE, - XML_TOK_CELL_TEXT_URL -}; - -/** - * Tokens for elements that come under <text:span> - */ -enum ScXMLCellTextSpanElemTokens -{ - XML_TOK_CELL_TEXT_SPAN_ELEM_SHEET_NAME, - XML_TOK_CELL_TEXT_SPAN_ELEM_DATE, - XML_TOK_CELL_TEXT_SPAN_ELEM_TITLE, - XML_TOK_CELL_TEXT_SPAN_ELEM_URL, - XML_TOK_CELL_TEXT_SPAN_ELEM_S -}; - -/** - * Tokens for attributes for <text:span> - */ -enum ScXMLCellTextSpanAttrTokens -{ - XML_TOK_CELL_TEXT_SPAN_ATTR_STYLE_NAME -}; - -enum ScXMLCellTextURLAttrTokens -{ - XML_TOK_CELL_TEXT_URL_ATTR_UREF, - XML_TOK_CELL_TEXT_URL_ATTR_TYPE, - XML_TOK_CELL_TEXT_URL_TARGET_FRAME -}; - -/** - * Tokens for attributes for <text:s> - */ -enum ScXMLCellTextSAttrTokens -{ - XML_TOK_CELL_TEXT_S_ATTR_C -}; - class SvXMLTokenMap; class XMLShapeImportHelper; class ScXMLChangeTrackingImportHelper; diff --git a/vcl/source/helper/errcode.cxx b/vcl/source/helper/errcode.cxx index 0e1d9430e1c7..9b3af20ed17b 100644 --- a/vcl/source/helper/errcode.cxx +++ b/vcl/source/helper/errcode.cxx @@ -32,9 +32,6 @@ VCL_DLLPUBLIC std::ostream& operator<<(std::ostream& os, const ErrCode& err) case ErrCodeArea::Io: os << "Io"; break; - case ErrCodeArea::Sv: - os << "Sv"; - break; case ErrCodeArea::Sfx: os << "Sfx"; break; @@ -53,21 +50,9 @@ VCL_DLLPUBLIC std::ostream& operator<<(std::ostream& os, const ErrCode& err) case ErrCodeArea::Sbx: os << "Sbx"; break; - case ErrCodeArea::Db: - os << "Db"; - break; - case ErrCodeArea::Java: - os << "Java"; - break; case ErrCodeArea::Uui: os << "Uui"; break; - case ErrCodeArea::Lib2: - os << "Lib2"; - break; - case ErrCodeArea::Chaos: - os << "Chaos"; - break; case ErrCodeArea::Sc: os << "Sc"; break; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits