diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-07-02 16:15:00 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-07-02 18:45:39 +0200 |
commit | 9d6a532e49b2bdc0ee808ff0f4e17d327d79a754 (patch) | |
tree | 62a880c0af798f870174c8fc6753e4ddd79f8c64 /xmloff/source/transform | |
parent | e6862e7828ba6bdd63bffd7eeaecc7de5d7d1c2e (diff) |
Upcoming improved loplugin:staticanonymous -> redundantstatic: xmloff
Change-Id: I47bd2f4b6bbe47b8a6c0aa8102186bf25a3804f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97772
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmloff/source/transform')
-rw-r--r-- | xmloff/source/transform/OOo2Oasis.cxx | 82 | ||||
-rw-r--r-- | xmloff/source/transform/Oasis2OOo.cxx | 96 | ||||
-rw-r--r-- | xmloff/source/transform/StyleOASISTContext.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/StyleOOoTContext.cxx | 8 |
4 files changed, 94 insertions, 94 deletions
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 2badb088e673..6211b9982d7a 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -98,7 +98,7 @@ static constexpr sal_Int32 RENAME_ENTRY( XMLTokenEnum f, XMLTokenEnum s ) return static_cast< sal_Int32 >(f) | (static_cast< sal_Int32 >(s) << 16); } -static XMLTransformerActionInit const aActionTable[] = +XMLTransformerActionInit const aActionTable[] = { // remove office:class from <office:document> and <office:document-content> ENTRY0( OFFICE, DOCUMENT, XML_ETACTION_DOCUMENT ), @@ -575,7 +575,7 @@ static XMLTransformerActionInit const aActionTable[] = }; // XML_ETACTION_STYLE -static XMLTransformerActionInit const aStyleActionTable[] = +XMLTransformerActionInit const aStyleActionTable[] = { ENTRY0( STYLE, FAMILY, XML_ATACTION_STYLE_FAMILY ), ENTRY0( STYLE, NAME, XML_ATACTION_ENCODE_STYLE_NAME ), @@ -597,7 +597,7 @@ static XMLTransformerActionInit const aStyleActionTable[] = }; // OOO_FRAME_ELEM_ACTIONS -static XMLTransformerActionInit const aFrameElemActionTable[] = +XMLTransformerActionInit const aFrameElemActionTable[] = { ENTRY1Q( OFFICE, EVENTS, XML_ETACTION_RENAME_ELEM, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS ), @@ -610,7 +610,7 @@ static XMLTransformerActionInit const aFrameElemActionTable[] = }; // OOO_FRAME_ATTR_ACTIONS -static XMLTransformerActionInit const aFrameAttrActionTable[] = +XMLTransformerActionInit const aFrameAttrActionTable[] = { ENTRY0( DRAW, ZINDEX, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */ ENTRY0( DRAW, ID, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */ @@ -639,7 +639,7 @@ static XMLTransformerActionInit const aFrameAttrActionTable[] = }; // OOO_EVENT_ELEM_ACTIONS -static XMLTransformerActionInit const aEventActionTable[] = +XMLTransformerActionInit const aEventActionTable[] = { ENTRY0( XLINK, HREF, XML_ATACTION_HREF ), ENTRY1( SCRIPT, LANGUAGE, XML_ATACTION_ADD_NAMESPACE_PREFIX, @@ -652,7 +652,7 @@ static XMLTransformerActionInit const aEventActionTable[] = }; // action table for OOO_MASTER_PAGE_ACTIONS -static XMLTransformerActionInit const aMasterPageActionTable[] = +XMLTransformerActionInit const aMasterPageActionTable[] = { ENTRY0( STYLE, NAME, XML_ATACTION_ENCODE_STYLE_NAME ), ENTRY0( STYLE, NEXT_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ), @@ -662,7 +662,7 @@ static XMLTransformerActionInit const aMasterPageActionTable[] = ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; -static XMLTransformerActionInit const aFontDeclActionTable[] = +XMLTransformerActionInit const aFontDeclActionTable[] = { ENTRY1Q( FO, FONT_FAMILY, XML_ATACTION_RENAME, XML_NAMESPACE_SVG, XML_FONT_FAMILY ), @@ -672,7 +672,7 @@ static XMLTransformerActionInit const aFontDeclActionTable[] = }; // action table for OOO_PARA_ACTIONS -static XMLTransformerActionInit const aParaActionTable[] = +XMLTransformerActionInit const aParaActionTable[] = { ENTRY0( TEXT, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ), ENTRY0( TEXT, COND_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ), @@ -683,7 +683,7 @@ static XMLTransformerActionInit const aParaActionTable[] = }; // action table for OOO_STYLE_REF_ACTIONS -static XMLTransformerActionInit const aStyleRefActionTable[] = +XMLTransformerActionInit const aStyleRefActionTable[] = { ENTRY0( TEXT, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ), ENTRY0( TEXT, VISITED_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ), @@ -713,7 +713,7 @@ static XMLTransformerActionInit const aStyleRefActionTable[] = // OOO_SHAPE_ACTIONS // !!ATTENTION!! If you change something here, please also change // aConnectorActionTable if appropriate -static XMLTransformerActionInit const aShapeActionTable[] = +XMLTransformerActionInit const aShapeActionTable[] = { ENTRY0( SVG, X, XML_ATACTION_INCH2IN ), ENTRY0( SVG, Y, XML_ATACTION_INCH2IN ), @@ -758,7 +758,7 @@ static XMLTransformerActionInit const aShapeActionTable[] = ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; -static XMLTransformerActionInit const aConnectorActionTable[] = +XMLTransformerActionInit const aConnectorActionTable[] = { ENTRY0( SVG, X1, XML_ATACTION_TWIPS2IN ), ENTRY0( SVG, Y1, XML_ATACTION_TWIPS2IN ), @@ -783,7 +783,7 @@ static XMLTransformerActionInit const aConnectorActionTable[] = }; // OOO_INDEX_ENTRY_TAB_STOP_ACTIONS -static XMLTransformerActionInit const aIndexEntryTabStopActionTable[] = +XMLTransformerActionInit const aIndexEntryTabStopActionTable[] = { ENTRY0( STYLE, POSITION, XML_ATACTION_INCH2IN ), ENTRY0( TEXT, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ), @@ -791,7 +791,7 @@ static XMLTransformerActionInit const aIndexEntryTabStopActionTable[] = }; // OOO_TAB_STOP_ACTIONS -static XMLTransformerActionInit const aTabStopActionTable[] = +XMLTransformerActionInit const aTabStopActionTable[] = { ENTRY0( STYLE, POSITION, XML_ATACTION_INCH2IN ), ENTRY1Q( STYLE, LEADER_CHAR, XML_ATACTION_RENAME, @@ -800,7 +800,7 @@ static XMLTransformerActionInit const aTabStopActionTable[] = }; // OOO_LINENUMBERING_ACTIONS -static XMLTransformerActionInit const aLineNumberingActionTable[] = +XMLTransformerActionInit const aLineNumberingActionTable[] = { ENTRY0( TEXT, OFFSET, XML_ATACTION_INCH2IN ), ENTRY0( TEXT, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ), @@ -809,7 +809,7 @@ static XMLTransformerActionInit const aLineNumberingActionTable[] = ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; -static XMLTransformerActionInit const aFootnoteSepActionTable[] = +XMLTransformerActionInit const aFootnoteSepActionTable[] = { ENTRY0( STYLE, WIDTH, XML_ATACTION_INCH2IN ), ENTRY0( STYLE, DISTANCE_BEFORE_SEP, XML_ATACTION_INCH2IN ), @@ -818,14 +818,14 @@ static XMLTransformerActionInit const aFootnoteSepActionTable[] = }; // OOO_DROP_CAP_ACTIONS -static XMLTransformerActionInit const aDropCapActionTable[] = +XMLTransformerActionInit const aDropCapActionTable[] = { ENTRY0( STYLE, DISTANCE, XML_ATACTION_INCH2IN ), ENTRY0( STYLE, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; -static XMLTransformerActionInit const aColumnsActionTable[] = +XMLTransformerActionInit const aColumnsActionTable[] = { ENTRY0( STYLE, COLUMN_GAP, XML_ATACTION_INCH2IN ), // ENTRY0( STYLE, SPACE_BEFORE, XML_ATACTION_INCH2IN ), @@ -839,7 +839,7 @@ static XMLTransformerActionInit const aColumnsActionTable[] = }; // OOO_TEXT_VALUE_TYPE_ACTIONS -static XMLTransformerActionInit const aTextValueTypeActionTable[] = +XMLTransformerActionInit const aTextValueTypeActionTable[] = { ENTRY1Q( TEXT, VALUE_TYPE, XML_ATACTION_RENAME, XML_NAMESPACE_OFFICE, XML_VALUE_TYPE ), @@ -862,7 +862,7 @@ static XMLTransformerActionInit const aTextValueTypeActionTable[] = }; // OOO_TABLE_VALUE_TYPE_ACTIONS -static XMLTransformerActionInit const aTableValueTypeActionTable[] = +XMLTransformerActionInit const aTableValueTypeActionTable[] = { ENTRY1Q( TABLE, VALUE_TYPE, XML_ATACTION_RENAME, XML_NAMESPACE_OFFICE, XML_VALUE_TYPE ), @@ -887,7 +887,7 @@ static XMLTransformerActionInit const aTableValueTypeActionTable[] = }; // action table for OOO_ANNOTATION_ACTIONS -static XMLTransformerActionInit const aAnnotationActionTable[] = +XMLTransformerActionInit const aAnnotationActionTable[] = { ENTRY1Q( OFFICE, AUTHOR, XML_ATACTION_MOVE_TO_ELEM, XML_NAMESPACE_DC, XML_CREATOR ), @@ -899,7 +899,7 @@ static XMLTransformerActionInit const aAnnotationActionTable[] = }; // action table for OOO_CHANGE_INFO_ACTIONS -static XMLTransformerActionInit const aChangeInfoActionTable[] = +XMLTransformerActionInit const aChangeInfoActionTable[] = { ENTRY1Q( OFFICE, CHG_AUTHOR, XML_ATACTION_MOVE_TO_ELEM, XML_NAMESPACE_DC, XML_CREATOR ), @@ -909,7 +909,7 @@ static XMLTransformerActionInit const aChangeInfoActionTable[] = }; // OOO_BACKGROUND_IMAGE_ACTIONS -static XMLTransformerActionInit const aBackgroundImageActionTable[] = +XMLTransformerActionInit const aBackgroundImageActionTable[] = { ENTRY1Q( DRAW, TRANSPARENCY, XML_ATACTION_RENAME_NEG_PERCENT, XML_NAMESPACE_DRAW, XML_OPACITY ), @@ -921,7 +921,7 @@ static XMLTransformerActionInit const aBackgroundImageActionTable[] = OpenOffice.org text documents, written by OpenOffice.org, contain wrong value for the transparency of the background graphic (#i50322#) */ -static XMLTransformerActionInit const aWriterBackgroundImageActionTable[] = +XMLTransformerActionInit const aWriterBackgroundImageActionTable[] = { ENTRY1Q( DRAW, TRANSPARENCY, XML_ATACTION_WRITER_BACK_GRAPHIC_TRANSPARENCY, XML_NAMESPACE_DRAW, XML_OPACITY ), ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(true) ), @@ -929,7 +929,7 @@ static XMLTransformerActionInit const aWriterBackgroundImageActionTable[] = }; // OOO_DDE_CONNECTION_DECL -static XMLTransformerActionInit const aDDEConnectionDeclActionTable[] = +XMLTransformerActionInit const aDDEConnectionDeclActionTable[] = { ENTRY1Q( TEXT, NAME, XML_ATACTION_RENAME, XML_NAMESPACE_OFFICE, XML_NAME ), @@ -937,7 +937,7 @@ static XMLTransformerActionInit const aDDEConnectionDeclActionTable[] = }; // OOO_FORM_CONTROL_ACTIONS -static XMLTransformerActionInit const aFormControlActionTable[] = +XMLTransformerActionInit const aFormControlActionTable[] = { ENTRY2QN( FORM, SERVICE_NAME, XML_ATACTION_RENAME_ADD_NAMESPACE_PREFIX, @@ -948,7 +948,7 @@ static XMLTransformerActionInit const aFormControlActionTable[] = }; // OOO_FORM_COLUMN_ACTIONS -static XMLTransformerActionInit const aFormColumnActionTable[] = +XMLTransformerActionInit const aFormColumnActionTable[] = { ENTRY1Q( FORM, COLUMN_STYLE_NAME, XML_ATACTION_RENAME_ENCODE_STYLE_NAME_REF, XML_NAMESPACE_FORM, XML_TEXT_STYLE_NAME ), @@ -960,7 +960,7 @@ static XMLTransformerActionInit const aFormColumnActionTable[] = }; // OOO_FORM_PROP_ACTIONS -static XMLTransformerActionInit const aFormPropActionTable[] = +XMLTransformerActionInit const aFormPropActionTable[] = { ENTRY1Q( FORM, PROPERTY_TYPE, XML_ATACTION_RENAME, XML_NAMESPACE_OFFICE, XML_VALUE_TYPE ), @@ -969,14 +969,14 @@ static XMLTransformerActionInit const aFormPropActionTable[] = }; // OOO_XLINK_ACTIONS -static XMLTransformerActionInit const aXLinkActionTable[] = +XMLTransformerActionInit const aXLinkActionTable[] = { ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(false) ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; // OOO_CONFIG_ITEM_SET_ACTIONS -static XMLTransformerActionInit const aConfigItemSetActionTable[] = +XMLTransformerActionInit const aConfigItemSetActionTable[] = { ENTRY1( CONFIG, NAME, XML_ATACTION_ADD_NAMESPACE_PREFIX, XML_NAMESPACE_OOO ), @@ -984,7 +984,7 @@ static XMLTransformerActionInit const aConfigItemSetActionTable[] = }; // OASIS_FORMULA_ACTIONS -static XMLTransformerActionInit const aFormulaActionTable[] = +XMLTransformerActionInit const aFormulaActionTable[] = { ENTRY1( TEXT, CONDITION, XML_ATACTION_ADD_NAMESPACE_PREFIX, XML_NAMESPACE_OOOW ), @@ -998,14 +998,14 @@ static XMLTransformerActionInit const aFormulaActionTable[] = }; // OOO_ERROR_MACRO_ACTIONS -static XMLTransformerActionInit const aErrorMacroActionTable[] = +XMLTransformerActionInit const aErrorMacroActionTable[] = { ENTRY0( TABLE, NAME, XML_ATACTION_REMOVE ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; // OOO_DDE_CONV_MODE_ACTIONS -static XMLTransformerActionInit const aDDEConvModeActionTable[] = +XMLTransformerActionInit const aDDEConvModeActionTable[] = { ENTRY1Q( TABLE, LET_TEXT, XML_ATACTION_RENAME, XML_NAMESPACE_TABLE, XML_KEEP_TEXT ), @@ -1013,7 +1013,7 @@ static XMLTransformerActionInit const aDDEConvModeActionTable[] = }; // OOO_DATAPILOT_MEMBER_ACTIONS -static XMLTransformerActionInit const aDataPilotMemberActionTable[] = +XMLTransformerActionInit const aDataPilotMemberActionTable[] = { ENTRY1Q( TABLE, DISPLAY_DETAILS, XML_ATACTION_RENAME, XML_NAMESPACE_TABLE, XML_SHOW_DETAILS ), @@ -1021,7 +1021,7 @@ static XMLTransformerActionInit const aDataPilotMemberActionTable[] = }; // OOO_DATAPILOT_LEVEL_ACTIONS -static XMLTransformerActionInit const aDataPilotLevelActionTable[] = +XMLTransformerActionInit const aDataPilotLevelActionTable[] = { ENTRY1Q( TABLE, DISPLAY_EMPTY, XML_ATACTION_RENAME, XML_NAMESPACE_TABLE, XML_SHOW_EMPTY ), @@ -1029,7 +1029,7 @@ static XMLTransformerActionInit const aDataPilotLevelActionTable[] = }; // OOO_SOURCE_SERVICE_ACTIONS -static XMLTransformerActionInit const aSourceServiceActionTable[] = +XMLTransformerActionInit const aSourceServiceActionTable[] = { ENTRY1Q( TABLE, USERNAME, XML_ATACTION_RENAME, XML_NAMESPACE_TABLE, XML_USER_NAME ), @@ -1037,7 +1037,7 @@ static XMLTransformerActionInit const aSourceServiceActionTable[] = }; // OOO_ANIMATION_ACTIONS -static XMLTransformerActionInit const aAnimationsActionTable[] = +XMLTransformerActionInit const aAnimationsActionTable[] = { ENTRY0( DRAW, SHAPE_ID, XML_ATACTION_SHAPEID ), ENTRY0( PRESENTATION, PATH_ID, XML_ATACTION_SHAPEID ), @@ -1045,7 +1045,7 @@ static XMLTransformerActionInit const aAnimationsActionTable[] = }; // OOO_DRAW_AREA_POLYGON_ACTIONS (to be added to OOO_SHAPE_ACTIONS) -static XMLTransformerActionInit const aDrawAreaPolygonActionTable[] = +XMLTransformerActionInit const aDrawAreaPolygonActionTable[] = { ENTRY1Q( SVG, POINTS, XML_ATACTION_RENAME, XML_NAMESPACE_DRAW, XML_POINTS ), @@ -1053,7 +1053,7 @@ static XMLTransformerActionInit const aDrawAreaPolygonActionTable[] = }; // OOO_CHART_ACTIONS -static XMLTransformerActionInit const aChartActionTable[] = +XMLTransformerActionInit const aChartActionTable[] = { ENTRY1( CHART, CLASS, XML_ATACTION_ADD_NAMESPACE_PREFIX, XML_NAMESPACE_CHART ), @@ -1065,7 +1065,7 @@ static XMLTransformerActionInit const aChartActionTable[] = }; // OOO_ALPHABETICAL_INDEX_MARK_ACTIONS -static XMLTransformerActionInit const aAlphabeticalIndexMarkActionTable[] = +XMLTransformerActionInit const aAlphabeticalIndexMarkActionTable[] = { ENTRY1Q( TEXT, MAIN_ETRY, XML_ATACTION_RENAME, XML_NAMESPACE_TEXT, XML_MAIN_ENTRY ), @@ -1073,7 +1073,7 @@ static XMLTransformerActionInit const aAlphabeticalIndexMarkActionTable[] = }; // OOO_SCRIPT_ACTIONS -static XMLTransformerActionInit const aScriptActionTable[] = +XMLTransformerActionInit const aScriptActionTable[] = { ENTRY1( SCRIPT, LANGUAGE, XML_ATACTION_ADD_NAMESPACE_PREFIX, XML_NAMESPACE_OOO ), ENTRY1Q( SCRIPT, NAME, XML_ATACTION_RENAME, XML_NAMESPACE_OOO, XML_NAME ), @@ -1081,7 +1081,7 @@ static XMLTransformerActionInit const aScriptActionTable[] = ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; -static XMLTokenEnum const aTokenMap[] = +XMLTokenEnum const aTokenMap[] = { XML_NONE, XML_SINGLE, XML_DOUBLE, XML_BOLD, XML_BOLD_DOTTED, XML_BOLD_DASH, XML_BOLD_LONG_DASH, XML_BOLD_DOT_DASH, diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index 896b424f87e0..4b5233f3e9c2 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -105,7 +105,7 @@ static constexpr sal_Int32 RENAME_ENTRY( XMLTokenEnum f, XMLTokenEnum s ) return static_cast< sal_Int32 >(f) | (static_cast< sal_Int32 >(s) << 16); } -static XMLTransformerActionInit const aActionTable[] = +XMLTransformerActionInit const aActionTable[] = { // add office:class from <office:document> and <office:document-content> ENTRY0( OFFICE, DOCUMENT, XML_ETACTION_DOCUMENT ), @@ -565,7 +565,7 @@ static XMLTransformerActionInit const aActionTable[] = }; // XML_ETACTION_STYLE -static XMLTransformerActionInit const aStyleActionTable[] = +XMLTransformerActionInit const aStyleActionTable[] = { ENTRY0( STYLE, FAMILY, XML_ATACTION_STYLE_FAMILY ), ENTRY1( STYLE, NAME, XML_ATACTION_DECODE_STYLE_NAME, @@ -599,7 +599,7 @@ static XMLTransformerActionInit const aStyleActionTable[] = }; // OASIS_FRAME_ELEM_ACTIONS -static XMLTransformerActionInit const aFrameActionTable[] = +XMLTransformerActionInit const aFrameActionTable[] = { ENTRY0( DRAW, TEXT_BOX, XML_ETACTION_COPY ), ENTRY0( DRAW, IMAGE, XML_ETACTION_COPY ), @@ -612,7 +612,7 @@ static XMLTransformerActionInit const aFrameActionTable[] = }; // OASIS_EVENT_ELEM_ACTIONS -static XMLTransformerActionInit const aEventActionTable[] = +XMLTransformerActionInit const aEventActionTable[] = { ENTRY0( XLINK, HREF, XML_ATACTION_HREF ), ENTRY1( SCRIPT, LANGUAGE, XML_ATACTION_REMOVE_NAMESPACE_PREFIX, @@ -623,13 +623,13 @@ static XMLTransformerActionInit const aEventActionTable[] = }; // OASIS_EVENT_ELEM_ACTIONS -static XMLTransformerActionInit const aDlgActionTable[] = +XMLTransformerActionInit const aDlgActionTable[] = { ENTRY0( DLG, BORDER, XML_ATACTION_DLG_BORDER ) }; // action table for OASIS_MASTER_PAGE_ACTIONS -static XMLTransformerActionInit const aMasterPageActionTable[] = +XMLTransformerActionInit const aMasterPageActionTable[] = { ENTRY1( STYLE, NAME, XML_ATACTION_DECODE_STYLE_NAME, XML_FAMILY_TYPE_MASTER_PAGE ), @@ -643,7 +643,7 @@ static XMLTransformerActionInit const aMasterPageActionTable[] = }; // action table for OASIS_TEXT_STYLE_REF_ACTIONS -static XMLTransformerActionInit const aTextStyleRefActionTable[] = +XMLTransformerActionInit const aTextStyleRefActionTable[] = { ENTRY1( TEXT, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_TEXT ), @@ -654,7 +654,7 @@ static XMLTransformerActionInit const aTextStyleRefActionTable[] = }; // action table for OASIS_PARA_STYLE_REF_ACTIONS -static XMLTransformerActionInit const aParaStyleRefActionTable[] = +XMLTransformerActionInit const aParaStyleRefActionTable[] = { ENTRY1( TEXT, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_PARAGRAPH ), @@ -662,7 +662,7 @@ static XMLTransformerActionInit const aParaStyleRefActionTable[] = }; // action table for OASIS_LIST_STYLE_REF_ACTIONS -static XMLTransformerActionInit const aListStyleRefActionTable[] = +XMLTransformerActionInit const aListStyleRefActionTable[] = { ENTRY1( TEXT, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_LIST ), @@ -670,7 +670,7 @@ static XMLTransformerActionInit const aListStyleRefActionTable[] = }; // action table for OASIS_MASTER_PAGE_REF_ACTIONS -static XMLTransformerActionInit const aMasterPageRefActionTable[] = +XMLTransformerActionInit const aMasterPageRefActionTable[] = { ENTRY1( DRAW, MASTER_PAGE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_MASTER_PAGE ), @@ -678,7 +678,7 @@ static XMLTransformerActionInit const aMasterPageRefActionTable[] = }; // action table for OASIS_MAP_STYLE_REF_ACTIONS -static XMLTransformerActionInit const aMapStyleRefActionTable[] = +XMLTransformerActionInit const aMapStyleRefActionTable[] = { ENTRY1( STYLE, APPLY_STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_END ), @@ -686,14 +686,14 @@ static XMLTransformerActionInit const aMapStyleRefActionTable[] = }; // action table for OASIS_TABLE_STYLE_REF_ACTIONS (#i40011#, #i40015#) -static XMLTransformerActionInit const aTableStyleRefActionTable[] = +XMLTransformerActionInit const aTableStyleRefActionTable[] = { ENTRY1( TABLE, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_END ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; -static XMLTransformerActionInit const aFontFaceActionTable[] = +XMLTransformerActionInit const aFontFaceActionTable[] = { ENTRY1Q( SVG, FONT_FAMILY, XML_ATACTION_RENAME, XML_NAMESPACE_FO, XML_FONT_FAMILY ), @@ -703,7 +703,7 @@ static XMLTransformerActionInit const aFontFaceActionTable[] = }; // action table for OASIS_PARA_ACTIONS -static XMLTransformerActionInit const aParaActionTable[] = +XMLTransformerActionInit const aParaActionTable[] = { ENTRY1( TEXT, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_PARAGRAPH ), @@ -716,7 +716,7 @@ static XMLTransformerActionInit const aParaActionTable[] = // !!ATTENTION!! If you change something here, please also change // aConnectorActionTable if appropriate -static XMLTransformerActionInit const aShapeActionTable[] = +XMLTransformerActionInit const aShapeActionTable[] = { ENTRY1( DRAW, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_GRAPHIC ), @@ -765,7 +765,7 @@ static XMLTransformerActionInit const aShapeActionTable[] = }; // OASIS_ANIMATION_ACTIONS -static XMLTransformerActionInit const aAnimationActionTable[] = +XMLTransformerActionInit const aAnimationActionTable[] = { ENTRY0( DRAW, SHAPE_ID, XML_ATACTION_DECODE_ID ), ENTRY0( PRESENTATION, DELAY, XML_ATACTION_RNG2ISO_DATETIME ), @@ -775,7 +775,7 @@ static XMLTransformerActionInit const aAnimationActionTable[] = }; // OOO_CONNECTOR_ACTIONS -static XMLTransformerActionInit const aConnectorActionTable[] = +XMLTransformerActionInit const aConnectorActionTable[] = { ENTRY1( DRAW, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, XML_FAMILY_TYPE_GRAPHIC ), @@ -806,7 +806,7 @@ static XMLTransformerActionInit const aConnectorActionTable[] = }; // OASIS_INDEX_ENTRY_TAB_STOP_ACTIONS -static XMLTransformerActionInit const aIndexEntryTabStopActionTable[] = +XMLTransformerActionInit const aIndexEntryTabStopActionTable[] = { ENTRY0( STYLE, POSITION, XML_ATACTION_IN2INCH ), ENTRY1( TEXT, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, @@ -815,7 +815,7 @@ static XMLTransformerActionInit const aIndexEntryTabStopActionTable[] = }; // OASIS_TAB_STOP_ACTIONS -static XMLTransformerActionInit const aTabStopActionTable[] = +XMLTransformerActionInit const aTabStopActionTable[] = { ENTRY0( STYLE, POSITION, XML_ATACTION_IN2INCH ), ENTRY1Q( STYLE, LEADER_TEXT, XML_ATACTION_RENAME, @@ -829,7 +829,7 @@ static XMLTransformerActionInit const aTabStopActionTable[] = }; // OASIS_LINENUMBERING_ACTIONS -static XMLTransformerActionInit const aLineNumberingActionTable[] = +XMLTransformerActionInit const aLineNumberingActionTable[] = { ENTRY0( TEXT, OFFSET, XML_ATACTION_IN2INCH ), ENTRY1( TEXT, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, @@ -839,7 +839,7 @@ static XMLTransformerActionInit const aLineNumberingActionTable[] = ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; -static XMLTransformerActionInit const aFootnoteSepActionTable[] = +XMLTransformerActionInit const aFootnoteSepActionTable[] = { ENTRY0( STYLE, WIDTH, XML_ATACTION_IN2INCH ), ENTRY0( STYLE, DISTANCE_BEFORE_SEP, XML_ATACTION_IN2INCH ), @@ -848,7 +848,7 @@ static XMLTransformerActionInit const aFootnoteSepActionTable[] = }; // OASIS_NOTES_ACTIONS (processed by special context) -static XMLTransformerActionInit const aNotesActionTable[] = +XMLTransformerActionInit const aNotesActionTable[] = { ENTRY0( TEXT, NOTE_CLASS, XML_ATACTION_STYLE_FAMILY ), ENTRY1( TEXT, CITATION_STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, @@ -863,7 +863,7 @@ static XMLTransformerActionInit const aNotesActionTable[] = }; // OASIS_DROP_CAP_ACTIONS -static XMLTransformerActionInit const aDropCapActionTable[] = +XMLTransformerActionInit const aDropCapActionTable[] = { ENTRY0( STYLE, DISTANCE, XML_ATACTION_IN2INCH ), ENTRY1( STYLE, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, @@ -871,7 +871,7 @@ static XMLTransformerActionInit const aDropCapActionTable[] = ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; -static XMLTransformerActionInit const aColumnsActionTable[] = +XMLTransformerActionInit const aColumnsActionTable[] = { ENTRY0( STYLE, COLUMN_GAP, XML_ATACTION_IN2INCH ), ENTRY0( STYLE, SPACE_BEFORE, XML_ATACTION_REMOVE ), @@ -885,7 +885,7 @@ static XMLTransformerActionInit const aColumnsActionTable[] = }; // OASIS_TEXT_VALUE_TYPE_ACTIONS -static XMLTransformerActionInit const aTextValueTypeActionTable[] = +XMLTransformerActionInit const aTextValueTypeActionTable[] = { ENTRY1Q( OFFICE, VALUE_TYPE, XML_ATACTION_RENAME, XML_NAMESPACE_TEXT, XML_VALUE_TYPE ), @@ -906,7 +906,7 @@ static XMLTransformerActionInit const aTextValueTypeActionTable[] = }; // OASIS_TABLE_VALUE_TYPE_ACTIONS -static XMLTransformerActionInit const aTableValueTypeActionTable[] = +XMLTransformerActionInit const aTableValueTypeActionTable[] = { ENTRY1Q( OFFICE, VALUE_TYPE, XML_ATACTION_RENAME, XML_NAMESPACE_TABLE, XML_VALUE_TYPE ), @@ -931,7 +931,7 @@ static XMLTransformerActionInit const aTableValueTypeActionTable[] = }; // action table for OASIS_ANNOTATION_ACTIONS -static XMLTransformerActionInit const aAnnotationActionTable[] = +XMLTransformerActionInit const aAnnotationActionTable[] = { ENTRY1Q( DC, CREATOR, XML_ETACTION_MOVE_TO_ATTR, XML_NAMESPACE_OFFICE, XML_AUTHOR ), @@ -944,7 +944,7 @@ static XMLTransformerActionInit const aAnnotationActionTable[] = }; // action table for OASIS_CHANGE_INFO_ACTIONS -static XMLTransformerActionInit const aChangeInfoActionTable[] = +XMLTransformerActionInit const aChangeInfoActionTable[] = { ENTRY1Q( DC, CREATOR, XML_ETACTION_MOVE_TO_ATTR, XML_NAMESPACE_OFFICE, XML_CHG_AUTHOR ), @@ -954,7 +954,7 @@ static XMLTransformerActionInit const aChangeInfoActionTable[] = }; // OASIS_BACKGROUND_IMAGE_ACTIONS -static XMLTransformerActionInit const aBackgroundImageActionTable[] = +XMLTransformerActionInit const aBackgroundImageActionTable[] = { ENTRY1Q( DRAW, OPACITY, XML_ATACTION_RENAME_NEG_PERCENT, XML_NAMESPACE_DRAW, XML_TRANSPARENCY ), @@ -963,7 +963,7 @@ static XMLTransformerActionInit const aBackgroundImageActionTable[] = }; // OASIS_DDE_CONNECTION_DECL -static XMLTransformerActionInit const aDDEConnectionDeclActionTable[] = +XMLTransformerActionInit const aDDEConnectionDeclActionTable[] = { ENTRY1Q( OFFICE, NAME, XML_ATACTION_RENAME, XML_NAMESPACE_TEXT, XML_NAME ), @@ -971,7 +971,7 @@ static XMLTransformerActionInit const aDDEConnectionDeclActionTable[] = }; // OASIS_FORM_CONTROL_ACTIONS -static XMLTransformerActionInit const aFormControlActionTable[] = +XMLTransformerActionInit const aFormControlActionTable[] = { ENTRY0( FORM, NAME, XML_ATACTION_MOVE_TO_ELEM ), ENTRY2QN( FORM, CONTROL_IMPLEMENTATION, @@ -984,7 +984,7 @@ static XMLTransformerActionInit const aFormControlActionTable[] = }; // OASIS_FORM_COLUMN_ACTIONS -static XMLTransformerActionInit const aFormColumnActionTable[] = +XMLTransformerActionInit const aFormColumnActionTable[] = { ENTRY1Q( FORM, TEXT_STYLE_NAME, XML_ATACTION_RENAME_DECODE_STYLE_NAME_REF, XML_NAMESPACE_FORM, XML_COLUMN_STYLE_NAME ), @@ -996,7 +996,7 @@ static XMLTransformerActionInit const aFormColumnActionTable[] = }; // OASIS_FORM_PROP_ACTIONS -static XMLTransformerActionInit const aFormPropActionTable[] = +XMLTransformerActionInit const aFormPropActionTable[] = { ENTRY1Q( OFFICE, VALUE_TYPE, XML_ATACTION_RENAME, XML_NAMESPACE_FORM, XML_PROPERTY_TYPE ), @@ -1010,7 +1010,7 @@ static XMLTransformerActionInit const aFormPropActionTable[] = }; // OASIS_XLINK_ACTIONS -static XMLTransformerActionInit const aXLinkActionTable[] = +XMLTransformerActionInit const aXLinkActionTable[] = { ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_uInt32(false) ), ENTRY0( TABLE, REFRESH_DELAY, XML_ATACTION_RNG2ISO_DATETIME ), @@ -1018,7 +1018,7 @@ static XMLTransformerActionInit const aXLinkActionTable[] = }; // OASIS_CONFIG_ITEM_SET_ACTIONS -static XMLTransformerActionInit const aConfigItemSetActionTable[] = +XMLTransformerActionInit const aConfigItemSetActionTable[] = { ENTRY1( CONFIG, NAME, XML_ATACTION_REMOVE_NAMESPACE_PREFIX, XML_NAMESPACE_OOO ), @@ -1026,7 +1026,7 @@ static XMLTransformerActionInit const aConfigItemSetActionTable[] = }; // OASIS_FORMULA_ACTIONS -static XMLTransformerActionInit const aFormulaActionTable[] = +XMLTransformerActionInit const aFormulaActionTable[] = { ENTRY0( TEXT, CONDITION, XML_ATACTION_REMOVE_ANY_NAMESPACE_PREFIX ), ENTRY0( TEXT, FORMULA, XML_ATACTION_REMOVE_ANY_NAMESPACE_PREFIX ), @@ -1036,7 +1036,7 @@ static XMLTransformerActionInit const aFormulaActionTable[] = }; // OASIS_CONTENT_VALIDATION_ACTIONS -static XMLTransformerActionInit const aContentValidationActionTable[] = +XMLTransformerActionInit const aContentValidationActionTable[] = { ENTRY0( TABLE, CONDITION, XML_ATACTION_REMOVE_ANY_NAMESPACE_PREFIX ), ENTRY0( TABLE, DISPLAY_LIST, XML_ATACTION_REMOVE ), @@ -1044,7 +1044,7 @@ static XMLTransformerActionInit const aContentValidationActionTable[] = }; // OASIS_DDE_CONV_MODE_ACTIONS -static XMLTransformerActionInit const aDDEConvModeActionTable[] = +XMLTransformerActionInit const aDDEConvModeActionTable[] = { ENTRY1Q( TABLE, KEEP_TEXT, XML_ATACTION_RENAME, XML_NAMESPACE_TABLE, XML_LET_TEXT ), @@ -1052,7 +1052,7 @@ static XMLTransformerActionInit const aDDEConvModeActionTable[] = }; // OASIS_DATAPILOT_MEMBER_ACTIONS -static XMLTransformerActionInit const aDataPilotMemberActionTable[] = +XMLTransformerActionInit const aDataPilotMemberActionTable[] = { ENTRY1Q( TABLE, SHOW_DETAILS, XML_ATACTION_RENAME, XML_NAMESPACE_TABLE, XML_DISPLAY_DETAILS ), @@ -1060,7 +1060,7 @@ static XMLTransformerActionInit const aDataPilotMemberActionTable[] = }; // OASIS_DATAPILOT_LEVEL_ACTIONS -static XMLTransformerActionInit const aDataPilotLevelActionTable[] = +XMLTransformerActionInit const aDataPilotLevelActionTable[] = { ENTRY1Q( TABLE, SHOW_EMPTY, XML_ATACTION_RENAME, XML_NAMESPACE_TABLE, XML_DISPLAY_EMPTY ), @@ -1068,7 +1068,7 @@ static XMLTransformerActionInit const aDataPilotLevelActionTable[] = }; // OASIS_SOURCE_SERVICE_ACTIONS -static XMLTransformerActionInit const aSourceServiceActionTable[] = +XMLTransformerActionInit const aSourceServiceActionTable[] = { ENTRY1Q( TABLE, USER_NAME, XML_ATACTION_RENAME, XML_NAMESPACE_TABLE, XML_USERNAME ), @@ -1076,7 +1076,7 @@ static XMLTransformerActionInit const aSourceServiceActionTable[] = }; // OASIS_CHART_ACTIONS -static XMLTransformerActionInit const aChartActionTable[] = +XMLTransformerActionInit const aChartActionTable[] = { ENTRY0( CHART, CLASS, XML_ATACTION_REMOVE_ANY_NAMESPACE_PREFIX ), ENTRY1( DRAW, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF, @@ -1087,7 +1087,7 @@ static XMLTransformerActionInit const aChartActionTable[] = }; // OASIS_FORM_ACTIONS -static XMLTransformerActionInit const aFormActionTable[] = +XMLTransformerActionInit const aFormActionTable[] = { ENTRY2QN( FORM, CONTROL_IMPLEMENTATION, XML_ATACTION_RENAME_REMOVE_NAMESPACE_PREFIX, @@ -1098,7 +1098,7 @@ static XMLTransformerActionInit const aFormActionTable[] = }; // OASIS_ALPHABETICAL_INDEX_MARK_ACTIONS -static XMLTransformerActionInit const aAlphabeticalIndexMarkActionTable[] = +XMLTransformerActionInit const aAlphabeticalIndexMarkActionTable[] = { ENTRY1Q( TEXT, MAIN_ENTRY, XML_ATACTION_RENAME, XML_NAMESPACE_TEXT, XML_MAIN_ETRY ), @@ -1106,7 +1106,7 @@ static XMLTransformerActionInit const aAlphabeticalIndexMarkActionTable[] = }; // OASIS_DRAW_AREA_POLYGON_ACTIONS (to be added to OASIS_SHAPE_ACTIONS) -static XMLTransformerActionInit const aDrawAreaPolygonActionTable[] = +XMLTransformerActionInit const aDrawAreaPolygonActionTable[] = { ENTRY1Q( DRAW, POINTS, XML_ATACTION_RENAME, XML_NAMESPACE_SVG, XML_POINTS ), @@ -1114,7 +1114,7 @@ static XMLTransformerActionInit const aDrawAreaPolygonActionTable[] = }; // OASIS_SCRIPT_ACTIONS -static XMLTransformerActionInit const aScriptActionTable[] = +XMLTransformerActionInit const aScriptActionTable[] = { ENTRY1( SCRIPT, LANGUAGE, XML_ATACTION_REMOVE_NAMESPACE_PREFIX, XML_NAMESPACE_OOO ), ENTRY1Q( OOO, NAME, XML_ATACTION_RENAME, XML_NAMESPACE_SCRIPT, XML_NAME ), @@ -1123,7 +1123,7 @@ static XMLTransformerActionInit const aScriptActionTable[] = }; // OASIS_DATETIME_ACTIONS -static XMLTransformerActionInit const aDateTimeActionTable[] = +XMLTransformerActionInit const aDateTimeActionTable[] = { ENTRY0( TEXT, DATE_VALUE, XML_ATACTION_RNG2ISO_DATETIME ), ENTRY0( TEXT, TIME_VALUE, XML_ATACTION_RNG2ISO_DATETIME ), @@ -1142,7 +1142,7 @@ static XMLTransformerActionInit const aDateTimeActionTable[] = ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; -static XMLTokenEnum const aTokenMap[] = +XMLTokenEnum const aTokenMap[] = { XML_NONE, XML_SOLID, XML_DOTTED, XML_DASH, XML_LONG_DASH, XML_DOT_DASH, XML_DOT_DOT_DASH, XML_WAVE, XML_SMALL_WAVE, XML_TOKEN_END diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index d376f226ebd7..a8b7b91eb997 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -40,7 +40,7 @@ using namespace ::xmloff::token; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -static const sal_uInt16 aAttrActionMaps[XML_PROP_TYPE_END] = +const sal_uInt16 aAttrActionMaps[XML_PROP_TYPE_END] = { PROP_OASIS_GRAPHIC_ATTR_ACTIONS, PROP_OASIS_DRAWING_PAGE_ATTR_ACTIONS, // DRAWING_PAGE diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx index 56a6504cc146..656d9050d156 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -61,7 +61,7 @@ const sal_uInt16 MAX_PROP_TYPES = 4; { XML_PROP_TYPE_##a, XML_PROP_TYPE_##END, \ XML_PROP_TYPE_END, XML_PROP_TYPE_END } -static const std::array<XMLPropType,MAX_PROP_TYPES> aPropTypes[XML_FAMILY_TYPE_END] = +const std::array<XMLPropType,MAX_PROP_TYPES> aPropTypes[XML_FAMILY_TYPE_END] = { ENTRY3( GRAPHIC, PARAGRAPH, TEXT ), // XML_FAMILY_TYPE_GRAPHIC, ENTRY3( GRAPHIC, PARAGRAPH, TEXT ), // XML_FAMILY_TYPE_PRESENTATION, @@ -87,7 +87,7 @@ static const std::array<XMLPropType,MAX_PROP_TYPES> aPropTypes[XML_FAMILY_TYPE_E ENTRY1( END ), // XML_FAMILY_TYPE_MARKER, }; -static const XMLTokenEnum aPropTokens[XML_PROP_TYPE_END] = +const XMLTokenEnum aPropTokens[XML_PROP_TYPE_END] = { XML_GRAPHIC_PROPERTIES, XML_DRAWING_PAGE_PROPERTIES, @@ -105,7 +105,7 @@ static const XMLTokenEnum aPropTokens[XML_PROP_TYPE_END] = XML_CHART_PROPERTIES }; -static const sal_uInt16 aAttrActionMaps[XML_PROP_TYPE_END] = +const sal_uInt16 aAttrActionMaps[XML_PROP_TYPE_END] = { PROP_OOO_GRAPHIC_ATTR_ACTIONS, PROP_OOO_DRAWING_PAGE_ATTR_ACTIONS, // DRAWING_PAGE @@ -123,7 +123,7 @@ static const sal_uInt16 aAttrActionMaps[XML_PROP_TYPE_END] = PROP_OOO_CHART_ATTR_ACTIONS }; -static const sal_uInt16 aElemActionMaps[XML_PROP_TYPE_END] = +const sal_uInt16 aElemActionMaps[XML_PROP_TYPE_END] = { PROP_OOO_GRAPHIC_ELEM_ACTIONS, MAX_OOO_PROP_ACTIONS, |