diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-09 15:39:25 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-09 15:39:25 +0100 |
commit | 76f894f2483d9416b9a4aeb739481abfd0c25c02 (patch) | |
tree | 9ce76c2f14a82ef9ae9f7ff54035f6b4f41985c6 /xmloff/source/text | |
parent | 9dbb143c25782b112dc0e4de29e09d740ad6bcf7 (diff) |
New loplugin:externvar: xmloff
Change-Id: I3fe731a535fe67b4cf260f9c6a36e32732695a7c
Diffstat (limited to 'xmloff/source/text')
-rw-r--r-- | xmloff/source/text/XMLIndexTemplateContext.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/txtprhdl.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/text/txtprmap.cxx | 24 |
3 files changed, 14 insertions, 18 deletions
diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index a2c042809a53..d1c2859d6253 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -197,7 +197,7 @@ enum TemplateTokenType }; -SvXMLEnumMapEntry aTemplateTokenTypeMap[] = +SvXMLEnumMapEntry const aTemplateTokenTypeMap[] = { { XML_INDEX_ENTRY_TEXT, XML_TOK_INDEX_TYPE_ENTRY_TEXT }, { XML_INDEX_ENTRY_TAB_STOP, XML_TOK_INDEX_TYPE_TAB_STOP }, diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index 3de39a76bd4e..e79609004484 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -42,6 +42,7 @@ #include <xmloff/xmluconv.hxx> #include <xmloff/xmltoken.hxx> #include "XMLAnchorTypePropHdl.hxx" +#include "enummaps.hxx" #include <xmloff/XMLConstantsPropertyHandler.hxx> #include "XMLClipPropertyHandler.hxx" #include "XMLTextColumnsPropertyHandler.hxx" @@ -67,11 +68,6 @@ using namespace ::xmloff::token; //UUUU using namespace ::com::sun::star::drawing; -//UUUU -extern SvXMLEnumMapEntry aXML_FillStyle_EnumMap[]; -extern SvXMLEnumMapEntry aXML_RefPoint_EnumMap[]; -extern SvXMLEnumMapEntry aXML_BitmapMode_EnumMap[]; - static SvXMLEnumMapEntry const pXML_HoriPos_Enum[] = { { XML_FROM_LEFT, HoriOrientation::NONE }, diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx index c34e644fdba9..eaaff4690d98 100644 --- a/xmloff/source/text/txtprmap.cxx +++ b/xmloff/source/text/txtprmap.cxx @@ -86,7 +86,7 @@ using namespace ::xmloff::token; #define MAP_(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010, false } #define GMAP(name,prefix,token,type,context) MAP_(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_GRAPHIC),context) -XMLPropertyMapEntry aXMLParaPropMap[] = +XMLPropertyMapEntry const aXMLParaPropMap[] = { // RES_UNKNOWNATR_CONTAINER MP_E( "ParaUserDefinedAttributes", TEXT, XMLNS, XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 0 ), @@ -459,7 +459,7 @@ XMLPropertyMapEntry aXMLParaPropMap[] = }; -XMLPropertyMapEntry aXMLAdditionalTextDefaultsMap[] = +XMLPropertyMapEntry const aXMLAdditionalTextDefaultsMap[] = { // RES_FOLLOW_TEXT_FLOW - DVO #i18732# MG_ED( "IsFollowingTextFlow", STYLE, FLOW_WITH_TEXT, XML_TYPE_BOOL, 0 ), @@ -470,7 +470,7 @@ XMLPropertyMapEntry aXMLAdditionalTextDefaultsMap[] = M_END() }; -XMLPropertyMapEntry aXMLTextPropMap[] = +XMLPropertyMapEntry const aXMLTextPropMap[] = { // RES_CHRATR_CASEMAP MT_E( "CharCaseMap", FO, FONT_VARIANT, XML_TYPE_TEXT_CASEMAP_VAR, 0 ), @@ -673,7 +673,7 @@ XMLPropertyMapEntry aXMLTextPropMap[] = M_END() }; -XMLPropertyMapEntry aXMLFramePropMap[] = +XMLPropertyMapEntry const aXMLFramePropMap[] = { // RES_FILL_ORDER // TODO: not required??? @@ -879,7 +879,7 @@ XMLPropertyMapEntry aXMLFramePropMap[] = M_END() }; -XMLPropertyMapEntry aXMLShapePropMap[] = +XMLPropertyMapEntry const aXMLShapePropMap[] = { // RES_LR_SPACE MG_E( "LeftMargin", FO, MARGIN_LEFT, XML_TYPE_MEASURE, 0), @@ -924,7 +924,7 @@ XMLPropertyMapEntry aXMLShapePropMap[] = M_END() }; -XMLPropertyMapEntry aXMLSectionPropMap[] = +XMLPropertyMapEntry const aXMLSectionPropMap[] = { // RES_COL MS_E( "TextColumns", STYLE, COLUMNS, MID_FLAG_ELEMENT_ITEM|XML_TYPE_TEXT_COLUMNS, CTF_TEXTCOLUMNS ), @@ -970,7 +970,7 @@ XMLPropertyMapEntry aXMLSectionPropMap[] = M_END() }; -XMLPropertyMapEntry aXMLRubyPropMap[] = +XMLPropertyMapEntry const aXMLRubyPropMap[] = { MR_E( "RubyAdjust", STYLE, RUBY_ALIGN, XML_TYPE_TEXT_RUBY_ADJUST, 0 ), MR_E( "RubyIsAbove", STYLE, RUBY_POSITION, XML_TYPE_TEXT_RUBY_POSITION, 0 ), @@ -978,7 +978,7 @@ XMLPropertyMapEntry aXMLRubyPropMap[] = }; -XMLPropertyMapEntry aXMLTableDefaultsMap[] = +XMLPropertyMapEntry const aXMLTableDefaultsMap[] = { // RES_COLLAPSING_BORDERS: only occurs in tables, but we need to // read/write the default for this item @@ -987,7 +987,7 @@ XMLPropertyMapEntry aXMLTableDefaultsMap[] = M_END() }; -XMLPropertyMapEntry aXMLTableRowDefaultsMap[] = +XMLPropertyMapEntry const aXMLTableRowDefaultsMap[] = { // RES_ROW_SPLIT: only occurs in table rows, but we need to // read/write the default for this item @@ -996,7 +996,7 @@ XMLPropertyMapEntry aXMLTableRowDefaultsMap[] = M_END() }; -XMLPropertyMapEntry aXMLCellPropMap[] = +XMLPropertyMapEntry const aXMLCellPropMap[] = { MC_E( "BackColor", FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), MC_E( "LeftBorder", FO, BORDER_LEFT, XML_TYPE_BORDER, 0 ), @@ -1064,9 +1064,9 @@ XMLPropertyMapEntry aXMLCellPropMap[] = M_END() }; -static XMLPropertyMapEntry *lcl_txtprmap_getMap( TextPropMap nType ) +static XMLPropertyMapEntry const *lcl_txtprmap_getMap( TextPropMap nType ) { - XMLPropertyMapEntry *pMap = nullptr; + XMLPropertyMapEntry const *pMap = nullptr; switch( nType ) { case TextPropMap::TEXT: |