New loplugin:externvar: xmloff

Change-Id: I3fe731a535fe67b4cf260f9c6a36e32732695a7c

7 files changed, 16 insertions, 20 deletions

diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx
index 44165455add0..e3467d758145 100644
--- a/xmloff/source/style/PageMasterPropHdlFactory.cxx
+++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "PageMasterPropHdlFactory.hxx"
+#include "enummaps.hxx"
 #include <xmloff/xmltypes.hxx>
 #include <xmloff/xmltoken.hxx>
 #include "xmlbahdl.hxx"
@@ -43,11 +44,6 @@ using namespace ::com::sun::star;
 //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 aXML_TextGridMode_ConstantMap[] =
 {
     { XML_NONE,         text::TextGridMode::NONE },
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index e6c1b66b7452..8303ee99f1d7 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -271,9 +271,9 @@ void XMLFontStyleContextFontFaceUri::SetFormat( const OUString& rFormat )
 
 // the CSS2 standard ( http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#referencing )
 // defines these format strings.
-const char* OPENTYPE_FORMAT = "opentype";
-const char* TRUETYPE_FORMAT = "truetype";
-const char* EOT_FORMAT      = "embedded-opentype";
+const char OPENTYPE_FORMAT[] = "opentype";
+const char TRUETYPE_FORMAT[] = "truetype";
+const char EOT_FORMAT[]      = "embedded-opentype";
 
 void XMLFontStyleContextFontFaceUri::EndElement()
 {
@@ -285,12 +285,12 @@ void XMLFontStyleContextFontFaceUri::EndElement()
     bool eot;
     // Assume by default that the font is not compressed.
     if( format.getLength() == 0
-        || format.equalsAscii( OPENTYPE_FORMAT )
-        || format.equalsAscii( TRUETYPE_FORMAT ))
+        || format == OPENTYPE_FORMAT
+        || format == TRUETYPE_FORMAT )
     {
         eot = false;
     }
-    else if( format.equalsAscii( EOT_FORMAT ))
+    else if( format == EOT_FORMAT )
     {
         eot = true;
     }
diff --git a/xmloff/source/style/backhdl.cxx b/xmloff/source/style/backhdl.cxx
index b6dde63c9cdf..6fce270b8d12 100644
--- a/xmloff/source/style/backhdl.cxx
+++ b/xmloff/source/style/backhdl.cxx
@@ -28,14 +28,14 @@
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
-SvXMLEnumMapEntry pXML_BrushHorizontalPos[] =
+SvXMLEnumMapEntry const pXML_BrushHorizontalPos[] =
 {
     { XML_LEFT,             style::GraphicLocation_LEFT_MIDDLE   },
     { XML_RIGHT,            style::GraphicLocation_RIGHT_MIDDLE },
     { XML_TOKEN_INVALID,    0       }
 };
 
-SvXMLEnumMapEntry pXML_BrushVerticalPos[] =
+SvXMLEnumMapEntry const pXML_BrushVerticalPos[] =
 {
     { XML_TOP,              style::GraphicLocation_MIDDLE_TOP   },
     { XML_BOTTOM,           style::GraphicLocation_MIDDLE_BOTTOM    },
diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx
index 0e12efcdafa3..55ae26c0203f 100644
--- a/xmloff/source/style/bordrhdl.cxx
+++ b/xmloff/source/style/bordrhdl.cxx
@@ -37,7 +37,7 @@ using namespace ::xmloff::token;
 #define SVX_XML_BORDER_WIDTH_MIDDLE 1
 #define SVX_XML_BORDER_WIDTH_THICK 2
 
-SvXMLEnumMapEntry pXML_BorderStyles[] =
+SvXMLEnumMapEntry const pXML_BorderStyles[] =
 {
     { XML_NONE,          table::BorderLineStyle::NONE   },
     { XML_HIDDEN,        table::BorderLineStyle::NONE   },
@@ -56,7 +56,7 @@ SvXMLEnumMapEntry pXML_BorderStyles[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry pXML_NamedBorderWidths[] =
+SvXMLEnumMapEntry const pXML_NamedBorderWidths[] =
 {
     { XML_THIN,             SVX_XML_BORDER_WIDTH_THIN   },
     { XML_MIDDLE,           SVX_XML_BORDER_WIDTH_MIDDLE },
diff --git a/xmloff/source/style/breakhdl.cxx b/xmloff/source/style/breakhdl.cxx
index 09152ddd7e2a..a64bc2527a4f 100644
--- a/xmloff/source/style/breakhdl.cxx
+++ b/xmloff/source/style/breakhdl.cxx
@@ -27,7 +27,7 @@
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
-SvXMLEnumMapEntry pXML_BreakTypes[] =
+SvXMLEnumMapEntry const pXML_BreakTypes[] =
 {
     { XML_AUTO,         0 },
     { XML_COLUMN,       1 },
diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx
index c2443007d613..29eba7c6cbc1 100644
--- a/xmloff/source/style/cdouthdl.cxx
+++ b/xmloff/source/style/cdouthdl.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::awt;
 using namespace ::xmloff::token;
 
-SvXMLEnumMapEntry pXML_CrossedoutType_Enum[] =
+SvXMLEnumMapEntry const pXML_CrossedoutType_Enum[] =
 {
     { XML_NONE,                 awt::FontStrikeout::NONE },
     { XML_SINGLE,   awt::FontStrikeout::SINGLE },
@@ -41,7 +41,7 @@ SvXMLEnumMapEntry pXML_CrossedoutType_Enum[] =
     { XML_TOKEN_INVALID,                0 }
 };
 
-SvXMLEnumMapEntry pXML_CrossedoutStyle_Enum[] =
+SvXMLEnumMapEntry const pXML_CrossedoutStyle_Enum[] =
 {
     { XML_NONE,                         awt::FontStrikeout::NONE },
     { XML_SOLID,                        awt::FontStrikeout::SINGLE },
@@ -58,7 +58,7 @@ SvXMLEnumMapEntry pXML_CrossedoutStyle_Enum[] =
     { XML_TOKEN_INVALID,                0 }
 };
 
-SvXMLEnumMapEntry pXML_CrossedoutWidth_Enum[] =
+SvXMLEnumMapEntry const pXML_CrossedoutWidth_Enum[] =
 {
     { XML_AUTO,                 awt::FontStrikeout::NONE },
     { XML_AUTO,                 awt::FontStrikeout::SINGLE },
diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx
index 9501afc85688..c566dfa13592 100644
--- a/xmloff/source/style/xmltabe.cxx
+++ b/xmloff/source/style/xmltabe.cxx
@@ -32,7 +32,7 @@
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
-SvXMLEnumMapEntry pXML_tabstop_style[] =
+SvXMLEnumMapEntry const pXML_tabstop_style[] =
 {
     { XML_LEFT,     style::TabAlign_LEFT    },
     { XML_CENTER,   style::TabAlign_CENTER  },