diff options
| -rw-r--r-- | filter/source/graphicfilter/idxf/dxf2mtf.hxx | 2 | ||||
| -rw-r--r-- | include/sfx2/childwin.hxx | 15 | ||||
| -rw-r--r-- | include/vcl/vclenum.hxx | 7 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlEnums.hxx | 100 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlimprt.hxx | 26 | ||||
| -rw-r--r-- | starmath/source/mathmlimport.hxx | 84 | ||||
| -rw-r--r-- | svtools/source/control/valueset.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/draw/animationimport.cxx | 57 | ||||
| -rw-r--r-- | xmloff/source/draw/sdxmlimp_impl.hxx | 45 |
9 files changed, 8 insertions, 331 deletions
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.hxx b/filter/source/graphicfilter/idxf/dxf2mtf.hxx index 31ef84498056..de10b865f7f3 100644 --- a/filter/source/graphicfilter/idxf/dxf2mtf.hxx +++ b/filter/source/graphicfilter/idxf/dxf2mtf.hxx @@ -26,8 +26,6 @@ #include <vcl/vclptr.hxx> #include <vcl/virdev.hxx> -enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT }; - class DXF2GDIMetaFile { private: diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index f7d639e927c6..3a945b47b1de 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -41,19 +41,18 @@ class SfxModelessDialogController; enum class SfxChildWindowFlags { - NONE = 0x00, - ZOOMIN = 0x01, // Fully retracted Float - FORCEDOCK = 0x04, // Float forbidden - TASK = 0x10, // ChildWindow inside the Task - CANTGETFOCUS = 0x20, // ChildWindow can not get focus - ALWAYSAVAILABLE = 0x40, // ChildWindow is never disabled - NEVERHIDE = 0x80, // ChildWindow is always visible + NONE = 0x000, + FORCEDOCK = 0x004, // Float forbidden + TASK = 0x010, // ChildWindow inside the Task + CANTGETFOCUS = 0x020, // ChildWindow can not get focus + ALWAYSAVAILABLE = 0x040, // ChildWindow is never disabled + NEVERHIDE = 0x080, // ChildWindow is always visible NEVERCLONE = 0x100, // ChildWindow is not recreated in new view }; namespace o3tl { - template<> struct typed_flags<SfxChildWindowFlags> : is_typed_flags<SfxChildWindowFlags, 0x1f5> {}; + template<> struct typed_flags<SfxChildWindowFlags> : is_typed_flags<SfxChildWindowFlags, 0x1f4> {}; } diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx index 4175c5f37c41..b5423b46e5de 100644 --- a/include/vcl/vclenum.hxx +++ b/include/vcl/vclenum.hxx @@ -276,13 +276,6 @@ enum class VclPolicyType NEVER }; -enum class VclTextAlignment -{ - LEFT, - CENTER, - RIGHT -}; - enum class WizardButtonFlags : sal_Int16 { NONE = 0x0000, diff --git a/reportdesign/source/filter/xml/xmlEnums.hxx b/reportdesign/source/filter/xml/xmlEnums.hxx index 2a98c7103c22..d0dde2d9e0e7 100644 --- a/reportdesign/source/filter/xml/xmlEnums.hxx +++ b/reportdesign/source/filter/xml/xmlEnums.hxx @@ -23,21 +23,6 @@ namespace rptxml { - enum XMLDocTokens - { - XML_TOK_DOC_SETTINGS, - XML_TOK_DOC_STYLES, - XML_TOK_DOC_CONTENT, - XML_TOK_DOC_META - }; - enum XMLDocContentTokens - { - XML_TOK_CONTENT_AUTOSTYLES, - XML_TOK_CONTENT_STYLES, - XML_TOK_CONTENT_FONTDECLS, - XML_TOK_CONTENT_MASTERSTYLES, - XML_TOK_CONTENT_BODY, - }; enum XMLReportToken { XML_TOK_REPORT_HEADER, @@ -61,33 +46,6 @@ namespace rptxml XML_TOK_SUB_FRAME , XML_TOK_SUB_BODY , }; - enum XMLGroup - { - XML_TOK_START_NEW_COLUMN , - XML_TOK_RESET_PAGE_NUMBER , - XML_TOK_PRINT_HEADER_ON_EACH_PAGE , - XML_TOK_SORT_EXPRESSION , - XML_TOK_GROUP_EXPRESSION , - XML_TOK_GROUP_HEADER , - XML_TOK_GROUP_GROUP , - XML_TOK_GROUP_DETAIL , - XML_TOK_GROUP_FOOTER , - XML_TOK_SORT_ASCENDING , - XML_TOK_GROUP_FUNCTION , - XML_TOK_GROUP_KEEP_TOGETHER - }; - enum XMLSection - { - XML_TOK_SECTION_NAME, - XML_TOK_TABLE, - XML_TOK_VISIBLE , - XML_TOK_FORCE_NEW_PAGE , - XML_TOK_FORCE_NEW_COLUMN , - XML_TOK_KEEP_TOGETHER , - XML_TOK_REPEAT_SECTION, - XML_TOK_PAGE_PRINT_OPTION, - XML_TOK_SECT_STYLE_NAME - }; enum XMLCell { @@ -105,70 +63,12 @@ namespace rptxml XML_TOK_FRAME }; - enum XMLComponent - { - XML_TOK_NAME - ,XML_TOK_TABLE_COLUMNS - ,XML_TOK_TABLE_ROWS - ,XML_TOK_COLUMN_STYLE_NAME - ,XML_TOK_COLUMN - ,XML_TOK_ROW - ,XML_TOK_CELL - ,XML_TOK_COV_CELL - ,XML_TOK_NUMBER_COLUMNS_SPANNED - ,XML_TOK_NUMBER_ROWS_SPANNED - ,XML_TOK_TEXT_STYLE_NAME - ,XML_TOK_TRANSFORM - ,XML_TOK_CONDITIONAL_PRINT_EXPRESSION - }; - enum XMLReportElement - { - XML_TOK_PRINT_WHEN_GROUP_CHANGE - ,XML_TOK_REP_CONDITIONAL_PRINT_EXPRESSION - ,XML_TOK_PRINT_REPEATED_VALUES - ,XML_TOK_COMPONENT - ,XML_TOK_FORMATCONDITION - }; - enum XMLControlProperty - { - XML_TOK_PROPERTY_NAME - ,XML_TOK_VALUE_TYPE - ,XML_TOK_LIST_PROPERTY - ,XML_TOK_VALUE - ,XML_TOK_CURRENCY - ,XML_TOK_DATE_VALUE - ,XML_TOK_TIME_VALUE - ,XML_TOK_STRING_VALUE - ,XML_TOK_BOOLEAN_VALUE - ,XML_TOK_PROPERTIES - ,XML_TOK_SIZE - ,XML_TOK_IMAGE_DATA - ,XML_TOK_SCALE - ,XML_TOK_LABEL - ,XML_TOK_DATA_FORMULA - ,XML_TOK_PRESERVE_IRI - ,XML_TOK_SELECT_PAGE - }; - enum XMLFunction - { - XML_TOK_FUNCTION_NAME - ,XML_TOK_FUNCTION_FORMULA - ,XML_TOK_PRE_EVALUATED - ,XML_TOK_INITIAL_FORMULA - ,XML_TOK_DEEP_TRAVERSING - }; enum XMLSubDocument { XML_TOK_MASTER_DETAIL_FIELD ,XML_TOK_MASTER ,XML_TOK_SUB_DETAIL }; - enum XMLFormatConidition - { - XML_TOK_FORMAT_STYLE_NAME - ,XML_TOK_ENABLED - ,XML_TOK_FORMULA - }; } // namespace rptxml diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index bf010b26a81e..39354fb67137 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -51,36 +51,10 @@ class ScDocumentImport; class ScMyImpDetectiveOpArray; namespace sc { - struct ImportPostProcessData; struct PivotTableSources; - } -enum ScXMLDocTokens -{ - XML_TOK_DOC_FONTDECLS, - XML_TOK_DOC_STYLES, - XML_TOK_DOC_AUTOSTYLES, - XML_TOK_DOC_MASTERSTYLES, - XML_TOK_DOC_META, - XML_TOK_DOC_SCRIPTS, - XML_TOK_DOC_BODY, - XML_TOK_DOC_SETTINGS -}; - -enum ScXMLContentValidationElemTokens -{ - XML_TOK_CONTENT_VALIDATION_ELEM_HELP_MESSAGE, - XML_TOK_CONTENT_VALIDATION_ELEM_ERROR_MESSAGE, - XML_TOK_CONTENT_VALIDATION_ELEM_ERROR_MACRO, - XML_TOK_CONTENT_VALIDATION_ELEM_EVENT_LISTENERS -}; - -enum ScXMLContentValidationMessageElemTokens -{ - XML_TOK_P -}; enum ScXMLTableTokens { diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx index d6f160c1f2b6..84ef80a14b09 100644 --- a/starmath/source/mathmlimport.hxx +++ b/starmath/source/mathmlimport.hxx @@ -107,97 +107,13 @@ public: }; -enum SmXMLMathElemTokenMap -{ - XML_TOK_MATH -}; - -enum SmXMLPresLayoutElemTokenMap -{ - XML_TOK_SEMANTICS, - XML_TOK_MSTYLE, - XML_TOK_MERROR, - XML_TOK_MPHANTOM, - XML_TOK_MROW, - XML_TOK_MENCLOSE, - XML_TOK_MFRAC, - XML_TOK_MSQRT, - XML_TOK_MROOT, - XML_TOK_MSUB, - XML_TOK_MSUP, - XML_TOK_MSUBSUP, - XML_TOK_MMULTISCRIPTS, - XML_TOK_MUNDER, - XML_TOK_MOVER, - XML_TOK_MUNDEROVER, - XML_TOK_MTABLE, - XML_TOK_MACTION, - XML_TOK_MFENCED, - XML_TOK_MPADDED -}; - -enum SmXMLPresLayoutAttrTokenMap -{ - XML_TOK_FONTWEIGHT, - XML_TOK_FONTSTYLE, - XML_TOK_FONTSIZE, - XML_TOK_FONTFAMILY, - XML_TOK_COLOR, - XML_TOK_MATHCOLOR, - XML_TOK_MATHVARIANT -}; - - -enum SmXMLFencedAttrTokenMap -{ - XML_TOK_OPEN, - XML_TOK_CLOSE -}; - - -enum SmXMLPresTableElemTokenMap -{ - XML_TOK_MTR, - XML_TOK_MTD -}; - -enum SmXMLPresElemTokenMap -{ - XML_TOK_ANNOTATION, - XML_TOK_MI, - XML_TOK_MN, - XML_TOK_MO, - XML_TOK_MTEXT, - XML_TOK_MSPACE, - XML_TOK_MS, - XML_TOK_MALIGNGROUP -}; - enum SmXMLPresScriptEmptyElemTokenMap { XML_TOK_MPRESCRIPTS, XML_TOK_NONE }; -enum SmXMLOperatorAttrTokenMap -{ - XML_TOK_STRETCHY -}; -enum SmXMLAnnotationAttrTokenMap -{ - XML_TOK_ENCODING -}; - -enum SmXMLActionAttrTokenMap -{ - XML_TOK_SELECTION -}; - -enum SmXMLMspaceAttrTokenMap -{ - XML_TOK_WIDTH -}; #endif diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index ffaa03cf14e5..9f505ffea1da 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -59,8 +59,7 @@ enum NAME_LINE_OFF_Y = 2, NAME_LINE_HEIGHT = 2, NAME_OFFSET = 2, - SCRBAR_OFFSET = 1, - SCROLL_OFFSET = 4 + SCRBAR_OFFSET = 1 }; } diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index e2a6c012e9a3..5ef266dce6af 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -123,63 +123,6 @@ AnimationsImportHelperImpl::AnimationsImportHelperImpl( SvXMLImport& rImport ) { } -namespace { - -enum AnimationNodeAttributes -{ - ANA_Begin, - ANA_Dur, - ANA_End, - ANA_Fill, - ANA_FillDefault, - ANA_Restart, - ANA_RestartDefault, - ANA_Accelerate, - ANA_Decelerate, - ANA_AutoReverse, - ANA_RepeatCount, - ANA_RepeatDur, - ANA_EndSync, - ANA_Node_Type, - ANA_Preset_ID, - ANA_Preset_Sub_Type, - ANA_Preset_Class, - ANA_After_Effect, - ANA_Target, - ANA_XLink, - ANA_MasterElement, - ANA_SubItem, - ANA_AttributeName, - ANA_Values, - ANA_From, - ANA_By, - ANA_To, - ANA_KeyTimes, - ANA_CalcMode, - ANA_Accumulate, - ANA_AdditiveMode, - ANA_KeySplines, - ANA_Path, - ANA_ColorSpace, - ANA_ColorDirection, - ANA_TransformType, - ANA_TransitionType, - ANA_TransitionSubType, - ANA_Mode, - ANA_Direction, - ANA_FadeColor, - ANA_IterateType, - ANA_IterateInterval, - ANA_Formula, - ANA_ANIMID, - ANA_XMLID, - ANA_Group_Id, - ANA_Command, - ANA_Volume -}; - -} - static bool isDouble( const OUString& rValue ) { sal_Int32 nLength = rValue.getLength(); diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx index 7a43de8ca576..29ffde9a2de4 100644 --- a/xmloff/source/draw/sdxmlimp_impl.hxx +++ b/xmloff/source/draw/sdxmlimp_impl.hxx @@ -30,18 +30,6 @@ #include <vector> #include <xmloff/xmlimp.hxx> -enum SdXMLDocElemTokenMap -{ - XML_TOK_DOC_FONTDECLS, - XML_TOK_DOC_STYLES, - XML_TOK_DOC_AUTOSTYLES, - XML_TOK_DOC_MASTERSTYLES, - XML_TOK_DOC_META, - XML_TOK_DOC_BODY, - XML_TOK_DOC_SCRIPT, - XML_TOK_DOC_SETTINGS, -}; - enum SdXMLBodyElemTokenMap { XML_TOK_BODY_PAGE, @@ -64,18 +52,6 @@ enum SdXMLMasterPageElemTokenMap XML_TOK_MASTERPAGE_NOTES }; -enum SdXMLMasterPageAttrTokenMap -{ - XML_TOK_MASTERPAGE_NAME, - XML_TOK_MASTERPAGE_DISPLAY_NAME, - XML_TOK_MASTERPAGE_PAGE_MASTER_NAME, - XML_TOK_MASTERPAGE_STYLE_NAME, - XML_TOK_MASTERPAGE_PAGE_LAYOUT_NAME, - XML_TOK_MASTERPAGE_USE_HEADER_NAME, - XML_TOK_MASTERPAGE_USE_FOOTER_NAME, - XML_TOK_MASTERPAGE_USE_DATE_TIME_NAME -}; - enum SdXMLPageMasterAttrTokenMap { XML_TOK_PAGEMASTER_NAME @@ -92,27 +68,6 @@ enum SdXMLPageMasterStyleAttrTokenMap XML_TOK_PAGEMASTERSTYLE_PAGE_ORIENTATION }; -enum SdXMLDrawPageAttrTokenMap -{ - XML_TOK_DRAWPAGE_NAME, - XML_TOK_DRAWPAGE_STYLE_NAME, - XML_TOK_DRAWPAGE_MASTER_PAGE_NAME, - XML_TOK_DRAWPAGE_PAGE_LAYOUT_NAME, - XML_TOK_DRAWPAGE_DRAWID, - XML_TOK_DRAWPAGE_XMLID, - XML_TOK_DRAWPAGE_HREF, - XML_TOK_DRAWPAGE_USE_HEADER_NAME, - XML_TOK_DRAWPAGE_USE_FOOTER_NAME, - XML_TOK_DRAWPAGE_USE_DATE_TIME_NAME -}; - -enum SdXMLDrawPageElemTokenMap -{ - XML_TOK_DRAWPAGE_NOTES, - XML_TOK_DRAWPAGE_PAR, - XML_TOK_DRAWPAGE_SEQ, - XML_TOK_DRAWPAGE_LAYER_SET -}; enum SdXMLPresentationPlaceholderAttrTokenMap { |