diff options
60 files changed, 48 insertions, 288 deletions
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index 77fb024857da..c6e0d51e9d16 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -136,7 +136,6 @@ public: enum BasicWindowStatus { - BASWIN_OK = 0x00, BASWIN_RUNNINGBASIC = 0x01, BASWIN_TOBEKILLED = 0x02, BASWIN_SUSPENDED = 0x04, diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx index b992b1d409b0..6a091d78895a 100644 --- a/cppcanvas/source/inc/canvasgraphichelper.hxx +++ b/cppcanvas/source/inc/canvasgraphichelper.hxx @@ -50,7 +50,7 @@ namespace cppcanvas virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) override; virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ) override; virtual void setClip() override; - virtual void setCompositeOp( CompositeOp aOp ) override; + virtual void setCompositeOp( sal_Int8 aOp ) override; protected: // for our clients diff --git a/cppcanvas/source/tools/canvasgraphichelper.cxx b/cppcanvas/source/tools/canvasgraphichelper.cxx index 795d4a2056a4..56b0f7543790 100644 --- a/cppcanvas/source/tools/canvasgraphichelper.cxx +++ b/cppcanvas/source/tools/canvasgraphichelper.cxx @@ -93,9 +93,9 @@ namespace cppcanvas return maRenderState; } - void CanvasGraphicHelper::setCompositeOp( CompositeOp aOp ) + void CanvasGraphicHelper::setCompositeOp( sal_Int8 aOp ) { - maRenderState.CompositeOperation = (sal_Int8)aOp; + maRenderState.CompositeOperation = aOp; } } diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 073a561b021a..3af9dd9a9e95 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -93,7 +93,6 @@ enum class PageType Color, Shadow, Transparence, - Unknown = 0xFFF }; class SvxAreaTabDialog : public SfxTabDialog diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 5508d9815b88..d6f72af23946 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -50,8 +50,6 @@ namespace // list of default groups enum Group { - Group_Unknown = -1, - Group_General, Group_Writer, Group_Html, diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 2f630444a9c7..97edb56375a9 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -92,8 +92,7 @@ enum LineSpaceList LLINESPACE_PROP = 4, LLINESPACE_MIN = 5, LLINESPACE_DURCH= 6, - LLINESPACE_FIX = 7, - LLINESPACE_END + LLINESPACE_FIX = 7 }; void SetLineSpace_Impl( SvxLineSpacingItem&, int, long lValue = 0 ); diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 2c85d711de91..eb5e6eb53aba 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -96,15 +96,6 @@ protected: getPageController( TabPage* _pCurrentPage ) const override; virtual bool onFinish() override; -protected: - - enum ApplyResult - { - AR_LEAVE_MODIFIED, // something was modified and has successfully been committed - AR_LEAVE_UNCHANGED, // no changes were made - AR_KEEP // don't leave the page (e.g. because an error occurred) - }; - private: DECL_LINK(OnTypeSelected, OGeneralPage&, void); }; diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 31b08dfa0bd5..103b26299cf2 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -131,15 +131,8 @@ protected: virtual ::svt::IWizardPageController* getPageController( TabPage* _pCurrentPage ) const override; virtual bool onFinish() override; -protected: void resetPages(const css::uno::Reference< css::beans::XPropertySet >& _rxDatasource); - enum ApplyResult - { - AR_LEAVE_MODIFIED, // something was modified and has successfully been committed - AR_KEEP // don't leave the page (e.g. because an error occurred) - }; - private: /** declares a path with or without authentication, as indicated by the database type diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index b47252f0cfaa..a5dbfb3016a1 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -123,7 +123,6 @@ class FilterCache : public BaseLock */ enum EReadOption { - E_READ_NOTHING = 0, E_READ_STANDARD = 1, E_READ_UPDATE = 2, E_READ_ALL = 3 diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.hxx b/filter/source/graphicfilter/idxf/dxf2mtf.hxx index e88fcc3c9f27..c6274d23e9d0 100644 --- a/filter/source/graphicfilter/idxf/dxf2mtf.hxx +++ b/filter/source/graphicfilter/idxf/dxf2mtf.hxx @@ -27,8 +27,7 @@ enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT }; enum BrushStyle { BRUSH_NULL, BRUSH_SOLID, BRUSH_HORZ, BRUSH_VERT, BRUSH_CROSS, BRUSH_DIAGCROSS, BRUSH_UPDIAG, BRUSH_DOWNDIAG, - BRUSH_25, BRUSH_50, BRUSH_75, - BRUSH_BITMAP }; + BRUSH_25, BRUSH_50, BRUSH_75 }; class DXF2GDIMetaFile { diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 3fc16ef9e97c..98aaf6f30c20 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -69,8 +69,7 @@ namespace PictReaderInternal { enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT }; enum BrushStyle { BRUSH_NULL, BRUSH_SOLID, BRUSH_HORZ, BRUSH_VERT, BRUSH_CROSS, BRUSH_DIAGCROSS, BRUSH_UPDIAG, BRUSH_DOWNDIAG, - BRUSH_25, BRUSH_50, BRUSH_75, - BRUSH_BITMAP }; + BRUSH_25, BRUSH_50, BRUSH_75 }; // Data enum PenStyle penStyle; enum BrushStyle brushStyle; diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 32bda101a149..87e4c28ddd0c 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -81,21 +81,6 @@ #include <ctype.h> #include <unordered_map> -// compatibility: DatabaseCursorType is dead, but for compatibility reasons we still have to write it ... -namespace com { -namespace sun { -namespace star { -namespace data { - -enum DatabaseCursorType -{ - DatabaseCursorType_FORWARD = 0, - DatabaseCursorType_KEYSET = 2, - DatabaseCursorType_MAKE_FIXED_SIZE = SAL_MAX_ENUM -}; - -} } } } - using namespace ::dbtools; using namespace ::comphelper; using namespace ::com::sun::star::uno; @@ -110,7 +95,6 @@ using namespace ::com::sun::star::form; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::data; using namespace ::com::sun::star::util; @@ -3802,7 +3786,7 @@ void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutS _rxOutStream->writeShort((sal_Int16)eTranslated); // former DataSelectionType // very old versions expect a CursorType here - _rxOutStream->writeShort(DatabaseCursorType_KEYSET); + _rxOutStream->writeShort(2); // DatabaseCursorType_KEYSET _rxOutStream->writeBoolean(m_eNavigation != NavigationBarMode_NONE); diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 7ddf501f3007..c24455695c13 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -78,8 +78,6 @@ namespace framework public LayoutManager_PBase { public: - enum { DOCKINGAREAS_COUNT = 4 }; - LayoutManager( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~LayoutManager() override; diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index d416f2f40e32..8fc1636e6dc0 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -60,8 +60,7 @@ class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper< css::xml::sax: enum Image_XML_Namespace { IMG_NS_IMAGE, - IMG_NS_XLINK, - TBL_XML_NAMESPACES_COUNT + IMG_NS_XLINK }; OReadImagesDocumentHandler( ImageListsDescriptor& aItems ); diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 9fad56eda216..321d3d352d85 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -57,8 +57,7 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : enum StatusBar_XML_Namespace { SB_NS_STATUSBAR, - SB_NS_XLINK, - SB_XML_NAMESPACES_COUNT + SB_NS_XLINK }; OReadStatusBarDocumentHandler( const css::uno::Reference< css::container::XIndexContainer >& aStatusBarItems ); diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index 5e7488b3e5c2..4b6a4680a79e 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -57,8 +57,7 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : enum ToolBox_XML_Namespace { TB_NS_TOOLBAR, - TB_NS_XLINK, - TB_XML_NAMESPACES_COUNT + TB_NS_XLINK }; OReadToolBoxDocumentHandler( const css::uno::Reference< css::container::XIndexContainer >& rItemContainer ); diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index 746b0b68d323..ef3b725c80f6 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -152,13 +152,6 @@ namespace framework sal_Bool, OUStringHash > ImageNameMap; - enum Layer - { - LAYER_DEFAULT, - LAYER_USERDEFINED, - LAYER_COUNT - }; - enum NotifyOp { NotifyOp_Remove, diff --git a/include/cppcanvas/canvasgraphic.hxx b/include/cppcanvas/canvasgraphic.hxx index 8792b6c4982e..8f1797ab9045 100644 --- a/include/cppcanvas/canvasgraphic.hxx +++ b/include/cppcanvas/canvasgraphic.hxx @@ -47,68 +47,6 @@ namespace cppcanvas { public: - /** These enums determine how the primitive color is combined - with the background. When performing this calculations, it - is assumed that all color values are premultiplied with - the corresponding alpha values (if no alpha is specified, - 1.0 is assumed). Then, the following general compositing - operation is performed: - - C = Ca * Fa + Cb * Fb - - where C is the result color, Ca and Cb are the input - colors, premultiplied with alpha, and Fa and Fb are - described for the different composite modes (wherein Aa - and Ab denote source and destination alpha, respectively). - */ - enum CompositeOp - { - /// Clear destination. Fa = Fb = 0. - CLEAR, - - /// Copy source as-is to destination. Fa = 1, Fb = 0. - SOURCE, - - /// Leave destination as-is. Fa = 0, Fb = 1. - DESTINATION, - - /// Copy source over destination. Fa = 1, Fb = 1-Aa. - OVER, - - /// Copy source under destination. Fa = 1-Ab, Fb = 1. - UNDER, - - /// Copy source to destination, but limited to where the destination is. Fa = Ab, Fb = 0. - INSIDE, - - /// Leave destination as is, but only where source was. Fa = 0, Fb = Aa. - INSIDE_REVERSE, - - /// Copy source to destination, but limited to where destination is not. Fa = 1-Ab, Fb = 0. - OUTSIDE, - - /// Leave destination as is, but only where source has not been. Fa = 0, Fb = 1-Aa. - OUTSIDE_REVERSE, - - /// Copy source over destination, but only where destination is. Keep destination. Fa = Ab, Fb = 1-Aa. - ATOP, - - /// Copy destination over source, but only where source is. Keep source. Fa = 1-Ab, Fb = Aa. - ATOP_REVERSE, - - /// Take only parts where either source or destination, but not both are. Fa = 1-Ab, Fb = 1-Aa. - XOR, - - /** simply add contributions of both source and destination. The - resulting color values are limited to the permissible color - range, and clipped to the maximal value, if exceeded. Fa = 1, Fb = 1. - */ - ADD, - - /// Fa = min(1,(1-Ab)/Aa), Fb = 1 - SATURATE - }; - virtual ~CanvasGraphic() {} /** Set object transformation matrix @@ -123,8 +61,9 @@ namespace cppcanvas virtual void setClip() = 0; /** Set object composite mode + * @see css::rendering::CompositeOperation */ - virtual void setCompositeOp( CompositeOp aOp ) = 0; + virtual void setCompositeOp( sal_Int8 aOp ) = 0; /** Render to parent canvas diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx index 2144d643009b..2cc2c12e0cf7 100644 --- a/include/editeng/AccessibleImageBullet.hxx +++ b/include/editeng/AccessibleImageBullet.hxx @@ -62,8 +62,6 @@ namespace accessibility virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() override; virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; virtual sal_Int16 SAL_CALL getAccessibleRole() override; - /// Maximal length of text returned by getAccessibleDescription() - enum { MaxDescriptionLen = 40 }; virtual OUString SAL_CALL getAccessibleDescription() override; virtual OUString SAL_CALL getAccessibleName() override; virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() override; diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index fd1a01da6f91..040acd7b3f86 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -232,8 +232,7 @@ enum class SvxNumRuleType { NUMBERING, OUTLINE_NUMBERING, - PRESENTATION_NUMBERING, - END + PRESENTATION_NUMBERING }; class EDITENG_DLLPUBLIC SvxNumRule final diff --git a/include/svtools/restartdialog.hxx b/include/svtools/restartdialog.hxx index 6b3791ebd282..74a90bde9c67 100644 --- a/include/svtools/restartdialog.hxx +++ b/include/svtools/restartdialog.hxx @@ -54,9 +54,6 @@ enum RestartReason { // "For the extension to work properly, // %PRODUCTNAME must be restarted." RESTART_REASON_OPENGL, - // "For the OpenGL changes to take effect, - // %PRODUCTNAME must be restarted." - RESTART_REASON_SAFE_MODE }; // Must be called with the solar mutex locked: diff --git a/include/vcl/graphictools.hxx b/include/vcl/graphictools.hxx index b3da2733469a..42d81ff9484f 100644 --- a/include/vcl/graphictools.hxx +++ b/include/vcl/graphictools.hxx @@ -71,11 +71,6 @@ public: /// Perform no join, leads to visible gaps between thick line segments joinNone }; - enum - { - /// Width of stroke start/end arrow to exactly fit the joining stroke - normalizedArrowWidth=65536 - }; typedef ::std::vector< double > DashArray; SvtGraphicStroke(); 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 diff --git a/mysqlc/source/mysqlc_propertyids.hxx b/mysqlc/source/mysqlc_propertyids.hxx index 57caf990d9eb..6d99d835ef7f 100644 --- a/mysqlc/source/mysqlc_propertyids.hxx +++ b/mysqlc/source/mysqlc_propertyids.hxx @@ -31,8 +31,7 @@ namespace mysqlc { enum { - PROPERTY_ID_FIRST = 0, - PROPERTY_ID_QUERYTIMEOUT, + PROPERTY_ID_QUERYTIMEOUT = 1, PROPERTY_ID_MAXFIELDSIZE, PROPERTY_ID_MAXROWS, PROPERTY_ID_CURSORNAME, diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index fce8191bba1d..0a0c8f73ef0a 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -69,8 +69,7 @@ enum ScXMLDocTokens XML_TOK_DOC_META, XML_TOK_DOC_SCRIPTS, XML_TOK_DOC_BODY, - XML_TOK_DOC_SETTINGS, - XML_TOK_OFFICE_END=XML_TOK_UNKNOWN + XML_TOK_DOC_SETTINGS }; enum ScXMLBodyTokens diff --git a/sd/inc/pres.hxx b/sd/inc/pres.hxx index ab816d5a95f8..793440c7adb5 100644 --- a/sd/inc/pres.hxx +++ b/sd/inc/pres.hxx @@ -96,7 +96,6 @@ enum AutoLayout AUTOLAYOUT_TITLE_VERTICAL_OUTLINE = 29, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART = 30, AUTOLAYOUT_HANDOUT9 = 31, - AUTOLAYOUT_4CLIPART = 33, AUTOLAYOUT_6CLIPART = 34, AUTOLAYOUT_END }; diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 4eabf1227fb3..8749a00e5ff2 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -46,17 +46,6 @@ using namespace basegfx::tools; using namespace drawinglayer::attribute; using namespace drawinglayer::primitive2d; -enum -{ - ITEM_OFFSET = 4, - ITEM_OFFSET_DOUBLE = 6, - NAME_LINE_OFF_X = 2, - NAME_LINE_OFF_Y = 2, - NAME_LINE_HEIGHT = 2, - NAME_OFFSET = 2, - SCROLL_OFFSET = 4 -}; - ThumbnailView::ThumbnailView (vcl::Window *pParent, WinBits nWinStyle) : Control( pParent, nWinStyle ) , mpItemAttrs(new ThumbnailItemAttributes) diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index d215fcfdaa0e..4d13d8b1d05f 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -50,6 +50,7 @@ #include <basegfx/polygon/b2dpolypolygoncutter.hxx> #include <com/sun/star/presentation/XSlideShow.hpp> +#include <com/sun/star/rendering/CompositeOperation.hpp> #include <memory> #include <vector> @@ -180,7 +181,7 @@ void clearRect( ::cppcanvas::CanvasSharedPtr const& pCanvas, if( pPolyPoly ) { - pPolyPoly->setCompositeOp( cppcanvas::CanvasGraphic::SOURCE ); + pPolyPoly->setCompositeOp( css::rendering::CompositeOperation::SOURCE ); pPolyPoly->setRGBAFillColor( 0xFFFFFF00U ); pPolyPoly->draw(); } diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx index 0ddcb35c7987..a03c34534e25 100644 --- a/sot/source/base/exchange.cxx +++ b/sot/source/base/exchange.cxx @@ -198,7 +198,7 @@ namespace /*137 SotClipboardFormatId::STARCHART_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII, "Chart 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*138 SotClipboardFormatId::STARMATH_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII, "Math 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*139 SotClipboardFormatId::STARBASE_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII, "StarBase 8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*140 SotClipboardFormatId::GDIMETAFILE*/ { "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"", "High Contrast GDIMetaFile", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*140 SotClipboardFormatId::HC_GDIMETAFILE*/ { "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"", "High Contrast GDIMetaFile", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*141 SotClipboardFormatId::PNG*/ { "image/png", "PNG Bitmap", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*142 SotClipboardFormatId::STARWRITERGLOB_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII, "Writer/Global 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*143 SotClipboardFormatId::MATHML*/ { "application/mathml+xml", "MathML", &::cppu::UnoType<const Sequence< sal_Int8 >>::get() }, diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 8d391288719d..50b76bc817a3 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -83,14 +83,7 @@ enum EDocStates /// default state, if a document was new created or loaded E_UNKNOWN = 0, - /// modified against the original file - E_MODIFIED = 1, - /// an active document can be postponed to be saved later. - E_POSTPONED = 2, - /// was already handled during one AutoSave/Recovery session. - E_HANDLED = 4, /** an action was started (saving/loading) ... Can be interesting later if the process may be was interrupted by an exception. */ - E_TRY_SAVE = 8, E_TRY_LOAD_BACKUP = 16, E_TRY_LOAD_ORIGINAL = 32, diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx index 575bdb2540d5..39f45c0b2331 100644 --- a/sw/inc/chpfld.hxx +++ b/sw/inc/chpfld.hxx @@ -34,7 +34,6 @@ enum SwChapterFormat CF_NUM_TITLE, ///< number and title CF_NUMBER_NOPREPST, ///< only chapter number without post-/prefix CF_NUM_NOPREPST_TITLE, ///< chapter number without post-/prefix and title - CF_END }; class SW_DLLPUBLIC SwChapterFieldType : public SwFieldType diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 65130c21972c..a8855bb570ed 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -39,7 +39,6 @@ enum SwAuthorFormat AF_BEGIN, AF_NAME = AF_BEGIN, AF_SHORTCUT, - AF_END, AF_FIXED = 0x8000 }; @@ -54,7 +53,6 @@ enum SwDocStatSubType DS_TBL, DS_GRF, DS_OLE, - DS_END }; typedef sal_uInt16 SwDocInfoSubType; diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx index bb82c5331801..ff9a801f8e06 100644 --- a/sw/inc/reffld.hxx +++ b/sw/inc/reffld.hxx @@ -55,7 +55,6 @@ enum REFERENCEMARK REF_NUMBER, ///< "Number" REF_NUMBER_NO_CONTEXT, ///< "Number (no context)" REF_NUMBER_FULL_CONTEXT, ///< "Number (full context)" - REF_END }; /// Get reference. diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 2c88e9fe99c9..2de88491609a 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -280,7 +280,6 @@ enum PrepareHint // height of zero in order to avoid too much noise. At formatting // it checks whether it fits and if necessary changes its page again. PREP_ERGOSUM, // Needed because of movement in FootnoteFrames. Check QuoVadis/ErgoSum. - PREP_END // END. }; enum FrameControlType diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index 284e3160d26b..26625731ad22 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -130,13 +130,12 @@ enum class DelContentType : sal_uInt16 { Ftn = 0x01, Fly = 0x02, - Toc = 0x04, Bkm = 0x08, - AllMask = 0x0F, + AllMask = 0x0b, CheckNoCntnt = 0x80, }; namespace o3tl { - template<> struct typed_flags<DelContentType> : is_typed_flags<DelContentType, 0x8f> {}; + template<> struct typed_flags<DelContentType> : is_typed_flags<DelContentType, 0x8b> {}; } /// will DelContentIndex destroy a frame anchored at character at rAnchorPos? diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index 67db942e0379..f25d90b80bbb 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -187,8 +187,6 @@ enum class SwServiceType { StyleTable = 114, StyleCell = 115, - LAST = StyleCell, - Invalid = USHRT_MAX }; diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx index d766e2584322..59a1a10c7325 100644 --- a/sw/source/core/inc/SwXMLTextBlocks.hxx +++ b/sw/source/core/inc/SwXMLTextBlocks.hxx @@ -31,11 +31,10 @@ class SvxMacroTableDtor; enum class SwXmlFlags { NONE = 0x0000, - ConvBlock = 0x0001, NoRootCommit = 0x0002, }; namespace o3tl { - template<> struct typed_flags<SwXmlFlags> : is_typed_flags<SwXmlFlags, 0x0003> {}; + template<> struct typed_flags<SwXmlFlags> : is_typed_flags<SwXmlFlags, 0x0002> {}; } class SwXMLTextBlocks : public SwImpBlocks diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index ad238ce18847..53c7deb17b56 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -71,7 +71,6 @@ enum HISTORY_HINT { HSTRY_CHGFLYANCHOR, HSTRY_CHGFLYCHAIN, HSTRY_CHGCHARFMT, - HSTRY_END }; class SwHistoryHint diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx index 33d7be3a49f8..ae149a18990e 100644 --- a/sw/source/filter/html/svxcss1.hxx +++ b/sw/source/filter/html/svxcss1.hxx @@ -39,7 +39,6 @@ enum SvxCSS1Position SVX_CSS1_POS_STATIC, // normal SVX_CSS1_POS_ABSOLUTE, // absolut SVX_CSS1_POS_RELATIVE, // relativ - SVX_CSS1_POS_END }; enum SvxCSS1LengthType @@ -48,7 +47,6 @@ enum SvxCSS1LengthType SVX_CSS1_LTYPE_AUTO, // automatisch SVX_CSS1_LTYPE_TWIP, // twip SVX_CSS1_LTYPE_PERCENTAGE, // %-Angabe - SVX_CSS1_LTYPE_END }; // Feature: PrintExt @@ -59,7 +57,6 @@ enum SvxCSS1SizeType SVX_CSS1_STYPE_TWIP, // twip SVX_CSS1_STYPE_LANDSCAPE, // Landscape SVX_CSS1_STYPE_PORTRAIT, // Landscape - SVX_CSS1_STYPE_END }; enum SvxCSS1PageBreak @@ -70,7 +67,6 @@ enum SvxCSS1PageBreak SVX_CSS1_PBREAK_AVOID, // nie SVX_CSS1_PBREAK_LEFT, // naechste Seite ist eine linke SVX_CSS1_PBREAK_RIGHT, // naechste Seite ist eine rechte - SVX_CSS1_PBREAK_END }; diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx index 1a64f534c355..26d7fd1ad8cd 100644 --- a/sw/source/filter/xml/xmlbrsh.cxx +++ b/sw/source/filter/xml/xmlbrsh.cxx @@ -49,7 +49,6 @@ enum SvXMLTokenMapAttrs XML_TOK_BGIMG_POSITION, XML_TOK_BGIMG_REPEAT, XML_TOK_BGIMG_FILTER, - XML_TOK_NGIMG_END=XML_TOK_UNKNOWN }; static SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] = diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 949cda588989..e8c1de23783c 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -97,7 +97,6 @@ enum SwXMLDocTokens XML_TOK_DOC_SCRIPT, XML_TOK_DOC_SETTINGS, XML_TOK_DOC_XFORMS, - XML_TOK_OFFICE_END=XML_TOK_UNKNOWN }; static SvXMLTokenMapEntry aDocTokenMap[] = diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index a163632373f9..6e0f347f715f 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -83,7 +83,6 @@ enum SwXMLTableElemTokens XML_TOK_TABLE_ROWS, XML_TOK_TABLE_ROW, XML_TOK_OFFICE_DDE_SOURCE, - XML_TOK_TABLE_ELEM_END=XML_TOK_UNKNOWN }; enum SwXMLTableCellAttrTokens @@ -101,7 +100,6 @@ enum SwXMLTableCellAttrTokens XML_TOK_TABLE_PROTECTED, XML_TOK_TABLE_STRING_VALUE, XML_TOK_TABLE_VALUE_TYPE, - XML_TOK_TABLE_CELL_ATTR_END=XML_TOK_UNKNOWN }; static SvXMLTokenMapEntry aTableElemTokenMap[] = diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx index 2cc079f7048d..bd84f3b551e5 100644 --- a/sw/source/uibase/inc/swdtflvr.hxx +++ b/sw/source/uibase/inc/swdtflvr.hxx @@ -47,13 +47,12 @@ enum class TransferBufferType : sal_uInt16 DocumentWord = 0x0002, Graphic = 0x0004, Table = 0x0008, - DdeLink = 0x0010, Ole = 0x0020, InetField = 0x0040, Drawing = 0x0081, // drawing is internal too! }; namespace o3tl { - template<> struct typed_flags<TransferBufferType> : is_typed_flags<TransferBufferType, 0x00ff> {}; + template<> struct typed_flags<TransferBufferType> : is_typed_flags<TransferBufferType, 0x00ef> {}; } class SW_DLLPUBLIC SwTransferable : public TransferableHelper diff --git a/vcl/inc/CommonSalLayout.hxx b/vcl/inc/CommonSalLayout.hxx index b0c9381defea..052104850414 100644 --- a/vcl/inc/CommonSalLayout.hxx +++ b/vcl/inc/CommonSalLayout.hxx @@ -92,7 +92,6 @@ public: enum class VerticalOrientation { Upright = 0, - Rotated = 1, TransformedUpright = 2, TransformedRotated = 3 }; diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index 2e3074721097..d6e161d9e6a8 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -45,7 +45,6 @@ enum class BkMode NONE = 0, Transparent = 1, OPAQUE = 2, - LAST = 2 }; /* xform stuff */ diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index a1cb6d2efc57..bb90cb599d01 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -73,14 +73,13 @@ enum class GraphicsStateUpdateFlags { TextLineColor = 0x0010, OverlineColor = 0x0020, ClipRegion = 0x0040, - AntiAlias = 0x0080, LayoutMode = 0x0100, TransparentPercent = 0x0200, DigitLanguage = 0x0400, All = 0x07ff }; namespace o3tl { - template<> struct typed_flags<GraphicsStateUpdateFlags> : is_typed_flags<GraphicsStateUpdateFlags, 0x07ff> {}; + template<> struct typed_flags<GraphicsStateUpdateFlags> : is_typed_flags<GraphicsStateUpdateFlags, 0x077f> {}; } namespace vcl diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 61eb03c7f765..a93d85a4ae2e 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -104,8 +104,6 @@ enum XMLTextFieldAttrTokens XML_TOK_TEXTFIELD_TABLE_TYPE, XML_TOK_TEXTFIELD_NOTE_CLASS, - - XML_TOK_TEXTFIELD_UNKNOWN }; /// abstract class for text field import diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx index f4c0b1b9308d..c3ee0e29c763 100644 --- a/xmloff/source/chart/XMLSymbolImageContext.cxx +++ b/xmloff/source/chart/XMLSymbolImageContext.cxx @@ -35,7 +35,6 @@ enum SvXMLTokenMapAttrs XML_TOK_SYMBOL_IMAGE_TYPE, XML_TOK_SYMBOL_IMAGE_ACTUATE, XML_TOK_SYMBOL_IMAGE_SHOW, - XML_TOK_SYMBOL_IMAGE_END = XML_TOK_UNKNOWN }; static const SvXMLTokenMapEntry aSymbolImageAttrTokenMap[] = diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx index f102b96d06f5..844d1a800fec 100644 --- a/xmloff/source/draw/sdxmlimp_impl.hxx +++ b/xmloff/source/draw/sdxmlimp_impl.hxx @@ -41,7 +41,6 @@ enum SdXMLDocElemTokenMap XML_TOK_DOC_BODY, XML_TOK_DOC_SCRIPT, XML_TOK_DOC_SETTINGS, - XML_TOK_OFFICE_END = XML_TOK_UNKNOWN }; enum SdXMLBodyElemTokenMap diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index d1aafde9c377..24b0e0e09d7a 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -49,7 +49,6 @@ enum SvXMLTokenMapAttrs XML_TOK_DASH_DOTS2, XML_TOK_DASH_DOTS2LEN, XML_TOK_DASH_DISTANCE, - XML_TOK_DASH_END=XML_TOK_UNKNOWN }; static SvXMLTokenMapEntry aDashStyleAttrTokenMap[] = diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index 8303ee99f1d7..f63d70769668 100644 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -57,8 +57,6 @@ enum XMLFontStyleAttrTokens XML_TOK_FONT_STYLE_ATTR_STYLENAME, XML_TOK_FONT_STYLE_ATTR_PITCH, XML_TOK_FONT_STYLE_ATTR_CHARSET, - - XML_TOK_FONT_STYLE_ATTR_END=XML_TOK_UNKNOWN }; static const SvXMLTokenMapEntry* lcl_getFontStyleAttrTokenMap() diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index cb130d8e00b1..ba9aef6e6583 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -112,9 +112,7 @@ enum SvxXMLTextListLevelStyleAttrTokens XML_TOK_TEXT_LEVEL_ATTR_NUM_SUFFIX, XML_TOK_TEXT_LEVEL_ATTR_NUM_LETTER_SYNC, XML_TOK_TEXT_LEVEL_ATTR_START_VALUE, - XML_TOK_TEXT_LEVEL_ATTR_DISPLAY_LEVELS, - - XML_TOK_TEXT_LEVEL_ATTR_END=XML_TOK_UNKNOWN + XML_TOK_TEXT_LEVEL_ATTR_DISPLAY_LEVELS }; static const SvXMLTokenMapEntry* lcl_getLevelAttrTokenMap() @@ -601,9 +599,9 @@ enum SvxXMLStyleAttributesAttrTokens XML_TOK_STYLE_ATTRIBUTES_ATTR_COLOR, XML_TOK_STYLE_ATTRIBUTES_ATTR_WINDOW_FONT_COLOR, XML_TOK_STYLE_ATTRIBUTES_ATTR_FONT_SIZE, - XML_TOK_STYLE_ATTRIBUTES_ATTR_POSITION_AND_SPACE_MODE, - XML_TOK_STYLE_ATTRIBUTES_ATTR_END=XML_TOK_UNKNOWN + XML_TOK_STYLE_ATTRIBUTES_ATTR_POSITION_AND_SPACE_MODE }; + static const SvXMLTokenMapEntry* lcl_getStyleAttributesAttrTokenMap() { static const SvXMLTokenMapEntry aStyleAttributesAttrTokenMap[] = @@ -917,9 +915,7 @@ enum SvxXMLStyleAttributesLabelAlignmentAttrTokens XML_TOK_STYLE_ATTRIBUTES_ATTR_LABEL_FOLLOWED_BY, XML_TOK_STYLE_ATTRIBUTES_ATTR_LISTTAB_STOP_POSITION, XML_TOK_STYLE_ATTRIBUTES_ATTR_FIRST_LINE_INDENT, - XML_TOK_STYLE_ATTRIBUTES_ATTR_INDENT_AT, - - XML_TOK_STYLE_ATTRIBUTES_LABEL_ALIGNMENT_ATTR_END=XML_TOK_UNKNOWN + XML_TOK_STYLE_ATTRIBUTES_ATTR_INDENT_AT }; static const SvXMLTokenMapEntry* lcl_getStyleAlignmentAttributesAttrTokenMap() { diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index bb0b1b41fa56..0e4c1ca665b5 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -40,8 +40,7 @@ enum SvXMLTokenMapAttrs XML_TOK_TABSTOP_TYPE, XML_TOK_TABSTOP_CHAR, XML_TOK_TABSTOP_LEADER_STYLE, - XML_TOK_TABSTOP_LEADER_TEXT, - XML_TOK_TABSTOP_END=XML_TOK_UNKNOWN + XML_TOK_TABSTOP_LEADER_TEXT }; static SvXMLTokenMapEntry aTabsAttributesAttrTokenMap[] = diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index d55a9a3467e3..6efd165787df 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -44,8 +44,7 @@ enum SvXMLTokenMapAttrs { XML_TOK_COLUMN_WIDTH, XML_TOK_COLUMN_MARGIN_LEFT, - XML_TOK_COLUMN_MARGIN_RIGHT, - XML_TOK_COLUMN_END=XML_TOK_UNKNOWN + XML_TOK_COLUMN_MARGIN_RIGHT }; enum SvXMLSepTokenMapAttrs @@ -54,8 +53,7 @@ enum SvXMLSepTokenMapAttrs XML_TOK_COLUMN_SEP_HEIGHT, XML_TOK_COLUMN_SEP_COLOR, XML_TOK_COLUMN_SEP_ALIGN, - XML_TOK_COLUMN_SEP_STYLE, - XML_TOK_COLUMN_SEP_END=XML_TOK_UNKNOWN + XML_TOK_COLUMN_SEP_STYLE }; static const SvXMLTokenMapEntry aColAttrTokenMap[] = diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx index ef6e2c86a0dd..9101918e4519 100644 --- a/xmloff/source/text/txtdropi.cxx +++ b/xmloff/source/text/txtdropi.cxx @@ -43,8 +43,7 @@ enum SvXMLTokenMapDropAttrs XML_TOK_DROP_LINES, XML_TOK_DROP_LENGTH, XML_TOK_DROP_DISTANCE, - XML_TOK_DROP_STYLE, - XML_TOK_DROP_END=XML_TOK_UNKNOWN + XML_TOK_DROP_STYLE }; static const SvXMLTokenMapEntry aDropAttrTokenMap[] = diff --git a/xmloff/source/transform/ElemTransformerAction.hxx b/xmloff/source/transform/ElemTransformerAction.hxx index 68deafde51cf..243017721de3 100644 --- a/xmloff/source/transform/ElemTransformerAction.hxx +++ b/xmloff/source/transform/ElemTransformerAction.hxx @@ -87,8 +87,7 @@ enum XMLElemTransformerAction XML_ETACTION_MOVE_TO_ATTR_RNG2ISO_DATETIME, // turn elem into an attr and convert . to , in datetimes // - param1: namespace + // token of local name - XML_ETACTION_USER_DEFINED=0x40000000,// user defined actions start here - XML_ETACTION_END=XML_TACTION_END + XML_ETACTION_USER_DEFINED=0x40000000// user defined actions start here }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_ELEMTRANSFORMERACTION_HXX diff --git a/xmloff/source/transform/PropertyActionsOASIS.hxx b/xmloff/source/transform/PropertyActionsOASIS.hxx index dcf51cb02772..5d4864cd6d82 100644 --- a/xmloff/source/transform/PropertyActionsOASIS.hxx +++ b/xmloff/source/transform/PropertyActionsOASIS.hxx @@ -46,8 +46,7 @@ enum XMLPropOASISTransformerAction XML_OPTACTION_CONTROL_TEXT_ALIGN, XML_OPTACTION_DRAW_WRITING_MODE, XML_ATACTION_CAPTION_ESCAPE_OASIS, - XML_ATACTION_DECODE_PROTECT, - XML_OPTACTION_END=XML_ATACTION_END + XML_ATACTION_DECODE_PROTECT }; extern XMLTransformerActionInit aGraphicPropertyOASISAttrActionTable[]; diff --git a/xmloff/source/transform/PropertyActionsOOo.hxx b/xmloff/source/transform/PropertyActionsOOo.hxx index 01c928936910..5a08eba72002 100644 --- a/xmloff/source/transform/PropertyActionsOOo.hxx +++ b/xmloff/source/transform/PropertyActionsOOo.hxx @@ -44,8 +44,7 @@ enum XMLPropOOOTransformerAction XML_ATACTION_SIZE_PROTECT, XML_ATACTION_PROTECT, // No image transparency info in label document (#i50322#) - XML_ATACTION_WRITER_BACK_GRAPHIC_TRANSPARENCY, - XML_PTACTION_END=XML_TACTION_END + XML_ATACTION_WRITER_BACK_GRAPHIC_TRANSPARENCY }; extern XMLTransformerActionInit aGraphicPropertyOOoAttrActionTable[]; |