summaryrefslogtreecommitdiff
path: root/include/xmloff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-02-03 08:46:48 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-02-03 08:59:39 +0000
commitf4826959c1a5b0e6d2849d4240668b2087582848 (patch)
tree32589cbf4cbdcd20ff09417f4906f10fc7a4525f /include/xmloff
parent83721f4365d234b62f9e3517345c8d3fda19f2c6 (diff)
new loplugin:unusedenumconstants
These are the simple removals, where it is obviously safe, the more complex ones will come in separate commits Change-Id: I7211945a6a5576354b60d9c709940ce9b674f308 Reviewed-on: https://gerrit.libreoffice.org/33828 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/xmloff')
-rw-r--r--include/xmloff/shapeimport.hxx50
-rw-r--r--include/xmloff/txtimp.hxx31
-rw-r--r--include/xmloff/xmlstyle.hxx3
3 files changed, 14 insertions, 70 deletions
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index bad298cc5037..f70053f3731c 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -72,9 +72,7 @@ enum SdXMLGroupShapeElemTokenMap
XML_TOK_GROUP_ANNOTATION,
- XML_TOK_GROUP_A,
-
- XML_TOK_GROUP_LAST
+ XML_TOK_GROUP_A
};
enum SdXMLFrameShapeElemTokenMap
@@ -87,9 +85,7 @@ enum SdXMLFrameShapeElemTokenMap
XML_TOK_FRAME_FRAME,
XML_TOK_FRAME_FLOATING_FRAME,
XML_TOK_FRAME_APPLET,
- XML_TOK_FRAME_TABLE,
-
- XML_TOK_FRAME_LAST
+ XML_TOK_FRAME_TABLE
};
enum SdXML3DSceneShapeElemTokenMap
@@ -98,20 +94,7 @@ enum SdXML3DSceneShapeElemTokenMap
XML_TOK_3DSCENE_3DCUBE,
XML_TOK_3DSCENE_3DSPHERE,
XML_TOK_3DSCENE_3DLATHE,
- XML_TOK_3DSCENE_3DEXTRUDE,
-
- XML_TOK_3DSCENE_LAST
-};
-
-enum SdXMLShapeAttrTokenMap
-{
- XML_TOK_SHAPE_NAME,
- XML_TOK_SHAPE_DRAWSTYLE_NAME_GRAPHICS,
- XML_TOK_SHAPE_PRESENTATION_CLASS,
- XML_TOK_SHAPE_DRAWSTYLE_NAME_PRESENTATION,
- XML_TOK_SHAPE_TRANSFORM,
- XML_TOK_SHAPE_IS_PLACEHOLDER,
- XML_TOK_SHAPE_IS_USER_TRANSFORMED
+ XML_TOK_3DSCENE_3DEXTRUDE
};
enum SdXML3DObjectAttrTokenMap
@@ -138,33 +121,6 @@ enum SdXML3DSphereObjectAttrTokenMap
XML_TOK_3DSPHEREOBJ_SIZE
};
-enum SdXMLPolygonShapeAttrTokenMap
-{
- XML_TOK_POLYGONSHAPE_VIEWBOX,
- XML_TOK_POLYGONSHAPE_POINTS
-};
-
-enum SdXMLPathShapeAttrTokenMap
-{
- XML_TOK_PATHSHAPE_VIEWBOX,
- XML_TOK_PATHSHAPE_D
-};
-
-enum SdXML3DSceneShapeAttrTokenMap
-{
- XML_TOK_3DSCENESHAPE_TRANSFORM,
- XML_TOK_3DSCENESHAPE_VRP,
- XML_TOK_3DSCENESHAPE_VPN,
- XML_TOK_3DSCENESHAPE_VUP,
- XML_TOK_3DSCENESHAPE_PROJECTION,
- XML_TOK_3DSCENESHAPE_DISTANCE,
- XML_TOK_3DSCENESHAPE_FOCAL_LENGTH,
- XML_TOK_3DSCENESHAPE_SHADOW_SLANT,
- XML_TOK_3DSCENESHAPE_SHADE_MODE,
- XML_TOK_3DSCENESHAPE_AMBIENT_COLOR,
- XML_TOK_3DSCENESHAPE_LIGHTING_MODE
-};
-
enum SdXML3DLightAttrTokenMap
{
XML_TOK_3DLIGHT_DIFFUSE_COLOR,
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index cab9f53653e4..2d8c1a445749 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -95,8 +95,7 @@ enum SwXMLTextElemTokens
XML_TOK_TEXT_FORMS,
XML_TOK_TEXT_CALCULATION_SETTINGS,
XML_TOK_TEXT_AUTOMARK,
- XML_TOK_TEXT_NUMBERED_PARAGRAPH,
- XML_TOK_TEXT_ELEM_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_NUMBERED_PARAGRAPH
};
enum XMLTextPElemTokens
@@ -235,9 +234,7 @@ enum XMLTextPElemTokens
XML_TOK_TEXT_FIELDMARK,
XML_TOK_TEXT_FIELDMARK_START,
- XML_TOK_TEXT_FIELDMARK_END,
-
- XML_TOK_TEXT_P_ELEM_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_FIELDMARK_END
};
enum XMLTextPAttrTokens
@@ -254,8 +251,7 @@ enum XMLTextPAttrTokens
XML_TOK_TEXT_P_CLASS_NAMES,
XML_TOK_TEXT_P_IS_LIST_HEADER,
XML_TOK_TEXT_P_RESTART_NUMBERING,
- XML_TOK_TEXT_P_START_VALUE,
- XML_TOK_TEXT_P_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_P_START_VALUE
};
enum XMLTextNumberedParagraphAttrTokens
@@ -265,8 +261,7 @@ enum XMLTextNumberedParagraphAttrTokens
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,
- XML_TOK_TEXT_NUMBERED_PARAGRAPH_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_NUMBERED_PARAGRAPH_START_VALUE
};
enum XMLTextListBlockAttrTokens
@@ -275,15 +270,13 @@ enum XMLTextListBlockAttrTokens
XML_TOK_TEXT_LIST_BLOCK_STYLE_NAME,
XML_TOK_TEXT_LIST_BLOCK_CONTINUE_NUMBERING,
XML_TOK_TEXT_LIST_BLOCK_ID,
- XML_TOK_TEXT_LIST_BLOCK_CONTINUE_LIST,
- XML_TOK_TEXT_LIST_BLOCK_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_LIST_BLOCK_CONTINUE_LIST
};
enum XMLTextListBlockElemTokens
{
XML_TOK_TEXT_LIST_HEADER,
- XML_TOK_TEXT_LIST_ITEM,
- XML_TOK_TEXT_LIST_BLOCK_ELEM_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_LIST_ITEM
};
enum XMLTextFrameAttrTokens
@@ -313,8 +306,7 @@ enum XMLTextFrameAttrTokens
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,
- XML_TOK_TEXT_FRAME_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_FRAME_MIN_WIDTH
};
enum XMLTextHyperlinkAttrTokens
@@ -325,8 +317,7 @@ enum XMLTextHyperlinkAttrTokens
XML_TOK_TEXT_HYPERLINK_SHOW,
XML_TOK_TEXT_HYPERLINK_STYLE_NAME,
XML_TOK_TEXT_HYPERLINK_VIS_STYLE_NAME,
- XML_TOK_TEXT_HYPERLINK_SERVER_MAP,
- XML_TOK_TEXT_HYPERLINK_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_HYPERLINK_SERVER_MAP
};
enum XMLTextPageMasterElemTokens
@@ -336,8 +327,7 @@ enum XMLTextPageMasterElemTokens
XML_TOK_TEXT_MP_HEADER_LEFT,
XML_TOK_TEXT_MP_FOOTER_LEFT,
XML_TOK_TEXT_MP_HEADER_FIRST,
- XML_TOK_TEXT_MP_FOOTER_FIRST,
- XML_TOK_TEXT_MP_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_MP_FOOTER_FIRST
};
enum XMLTextContourAttrTokens
@@ -347,8 +337,7 @@ enum XMLTextContourAttrTokens
XML_TOK_TEXT_CONTOUR_VIEWBOX,
XML_TOK_TEXT_CONTOUR_POINTS,
XML_TOK_TEXT_CONTOUR_D,
- XML_TOK_TEXT_CONTOUR_AUTO,
- XML_TOK_TEXT_CONTOUR_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_CONTOUR_AUTO
};
enum XMLTextType
{
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 8841ec3b5cae..2dedfd4414d8 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -54,8 +54,7 @@ enum XMLStyleStylesElemTokens
XML_TOK_TEXT_BIBLIOGRAPHY_CONFIG,
XML_TOK_TEXT_LINENUMBERING_CONFIG,
XML_TOK_STYLE_DEFAULT_STYLE,
- XML_TOK_STYLE_DEFAULT_PAGE_LAYOUT, //text grid enhancement
- XML_TOK_STYLE_STYLES_ELEM_END=XML_TOK_UNKNOWN
+ XML_TOK_STYLE_DEFAULT_PAGE_LAYOUT //text grid enhancement
};
class XMLOFF_DLLPUBLIC SvXMLStyleContext : public SvXMLImportContext