include/xmloff/shapeimport.hxx | 1 - include/xmloff/txtimp.hxx | 1 - include/xmloff/xmlexp.hxx | 5 ++--- xmloff/inc/SchXMLImport.hxx | 2 -- xmloff/inc/txtfldi.hxx | 2 -- xmloff/source/draw/sdxmlimp_impl.hxx | 1 - xmloff/source/style/TransGradientStyle.cxx | 3 +-- xmloff/source/style/XMLBackgroundImageContext.cxx | 3 +-- xmloff/source/text/XMLSectionExport.hxx | 8 -------- xmloff/source/transform/AttrTransformerAction.hxx | 1 - 10 files changed, 4 insertions(+), 23 deletions(-)
New commits: commit 78f392f30a741ed088c66ff9923f47041277a223 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Fri Feb 3 11:48:14 2017 +0200 loplugin:unusedenumconstants in xmloff Change-Id: Ie9e6d4aa9dba97d45bf7b8afa2347d34e1651a60 Reviewed-on: https://gerrit.libreoffice.org/33871 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index f70053f..bded369 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -82,7 +82,6 @@ enum SdXMLFrameShapeElemTokenMap XML_TOK_FRAME_OBJECT, XML_TOK_FRAME_OBJECT_OLE, XML_TOK_FRAME_PLUGIN, - XML_TOK_FRAME_FRAME, XML_TOK_FRAME_FLOATING_FRAME, XML_TOK_FRAME_APPLET, XML_TOK_FRAME_TABLE diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index 2d8c1a4..e01f5d9 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -269,7 +269,6 @@ 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_ID, XML_TOK_TEXT_LIST_BLOCK_CONTINUE_LIST }; diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index eece920..2a6040b 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -97,15 +97,14 @@ enum class SvXMLExportFlags { SETTINGS = 0x0040, FONTDECLS = 0x0080, EMBEDDED = 0x0100, - NODOCTYPE = 0x0200, PRETTY = 0x0400, SAVEBACKWARDCOMPATIBLE = 0x0800, OASIS = 0x8000, - ALL = 0x0fff + ALL = 0x0dff }; namespace o3tl { - template<> struct typed_flags<SvXMLExportFlags> : is_typed_flags<SvXMLExportFlags, 0x8fff> {}; + template<> struct typed_flags<SvXMLExportFlags> : is_typed_flags<SvXMLExportFlags, 0x8dff> {}; } class XMLOFF_DLLPUBLIC SvXMLExport : public cppu::WeakImplHelper< diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx index 32037a7..233ecde 100644 --- a/xmloff/inc/SchXMLImport.hxx +++ b/xmloff/inc/SchXMLImport.hxx @@ -96,7 +96,6 @@ enum SchXMLChartAttrMap XML_TOK_CHART_WIDTH, XML_TOK_CHART_HEIGHT, XML_TOK_CHART_STYLE_NAME, - XML_TOK_CHART_ADDIN_NAME, XML_TOK_CHART_COL_MAPPING, XML_TOK_CHART_ROW_MAPPING }; @@ -110,7 +109,6 @@ enum SchXMLPlotAreaAttrTokenMap XML_TOK_PA_STYLE_NAME, XML_TOK_PA_TRANSFORM, XML_TOK_PA_CHART_ADDRESS, - XML_TOK_PA_TABLE_NUMBER_LIST, XML_TOK_PA_DS_HAS_LABELS, XML_TOK_PA_VRP, XML_TOK_PA_VPN, diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index a93d85a..5d2e5c2 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -95,8 +95,6 @@ enum XMLTextFieldAttrTokens XML_TOK_TEXTFIELD_HREF, XML_TOK_TEXTFIELD_TARGET_FRAME, - XML_TOK_TEXTFIELD_OFFICE_CREATE_DATE, - XML_TOK_TEXTFIELD_OFFICE_AUTHOR, XML_TOK_TEXTFIELD_ANNOTATION, XML_TOK_TEXTFIELD_LANGUAGE, diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx index 844d1a80..88802df 100644 --- a/xmloff/source/draw/sdxmlimp_impl.hxx +++ b/xmloff/source/draw/sdxmlimp_impl.hxx @@ -54,7 +54,6 @@ enum SdXMLBodyElemTokenMap enum SdXMLStylesElemTokenMap { - XML_TOK_STYLES_MASTER_PAGE, XML_TOK_STYLES_STYLE, XML_TOK_STYLES_PAGE_MASTER, XML_TOK_STYLES_PRESENTATION_PAGE_LAYOUT diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx index 5a9d93d..ebd2b08 100644 --- a/xmloff/source/style/TransGradientStyle.cxx +++ b/xmloff/source/style/TransGradientStyle.cxx @@ -49,8 +49,7 @@ enum SvXMLTokenMapAttrs XML_TOK_GRADIENT_START, XML_TOK_GRADIENT_END, XML_TOK_GRADIENT_ANGLE, - XML_TOK_GRADIENT_BORDER, - XML_TOK_TABSTOP_END=XML_TOK_UNKNOWN + XML_TOK_GRADIENT_BORDER }; SvXMLEnumMapEntry const pXML_GradientStyle_Enum[] = diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index 1337227..c281fb7 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -50,8 +50,7 @@ enum SvXMLTokenMapAttrs XML_TOK_BGIMG_POSITION, XML_TOK_BGIMG_REPEAT, XML_TOK_BGIMG_FILTER, - XML_TOK_BGIMG_OPACITY, - XML_TOK_NGIMG_END=XML_TOK_UNKNOWN + XML_TOK_BGIMG_OPACITY }; static const SvXMLTokenMapEntry* lcl_getBGImgAttributesAttrTokenMap() { diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx index c5d52df..7b60c03 100644 --- a/xmloff/source/text/XMLSectionExport.hxx +++ b/xmloff/source/text/XMLSectionExport.hxx @@ -48,10 +48,6 @@ namespace com { namespace sun { namespace star { enum SectionTypeEnum { - TEXT_SECTION_TYPE_SECTION, - - // indices: keep index valued together and do not change order, - // because they are used to index into array TEXT_SECTION_TYPE_TOC, TEXT_SECTION_TYPE_TABLE, TEXT_SECTION_TYPE_ILLUSTRATION, @@ -59,10 +55,6 @@ enum SectionTypeEnum TEXT_SECTION_TYPE_USER, TEXT_SECTION_TYPE_ALPHABETICAL, TEXT_SECTION_TYPE_BIBLIOGRAPHY, - - // index header sections: - TEXT_SECTION_TYPE_HEADER, - TEXT_SECTION_TYPE_UNKNOWN }; diff --git a/xmloff/source/transform/AttrTransformerAction.hxx b/xmloff/source/transform/AttrTransformerAction.hxx index 0aef831..8fbb254 100644 --- a/xmloff/source/transform/AttrTransformerAction.hxx +++ b/xmloff/source/transform/AttrTransformerAction.hxx @@ -122,7 +122,6 @@ enum XMLAttrTransformerAction XML_ATACTION_OPACITY_FIX, // converts transparency to opacity and back XML_ATACTION_SHAPEID, // convert shape id XML_ATACTION_USER_DEFINED=0x40000000,// user defined actions start here - XML_ATACTION_END=XML_TACTION_END }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_ATTRTRANSFORMERACTION_HXX _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits