Upcoming improved loplugin:staticanonymous -> redundantstatic: oox

Change-Id: I1c6a2852e4794529ec7d55ceae485196a8170e24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97617
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

14 files changed, 57 insertions, 57 deletions

diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 5c5d5e5076e5..17a12acde6e7 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -180,7 +180,7 @@ struct XmlFilterBaseImpl
     explicit            XmlFilterBaseImpl();
 };
 
-static const OUStringLiteral gaBinSuffix( ".bin" );
+const OUStringLiteral gaBinSuffix( ".bin" );
 
 XmlFilterBaseImpl::XmlFilterBaseImpl() :
     mrNamespaceMap(StaticNamespaceMap::get())
diff --git a/oox/source/crypto/AgileEngine.cxx b/oox/source/crypto/AgileEngine.cxx
index f4eb9d21ea6f..df3bf4bb19d8 100644
--- a/oox/source/crypto/AgileEngine.cxx
+++ b/oox/source/crypto/AgileEngine.cxx
@@ -187,11 +187,11 @@ public:
 
 constexpr const sal_uInt32 constSegmentLength = 4096;
 
-static const std::vector<sal_uInt8> constBlock1 { 0xfe, 0xa7, 0xd2, 0x76, 0x3b, 0x4b, 0x9e, 0x79 };
-static const std::vector<sal_uInt8> constBlock2 { 0xd7, 0xaa, 0x0f, 0x6d, 0x30, 0x61, 0x34, 0x4e };
-static const std::vector<sal_uInt8> constBlock3 { 0x14, 0x6e, 0x0b, 0xe7, 0xab, 0xac, 0xd0, 0xd6 };
-static const std::vector<sal_uInt8> constBlockHmac1 { 0x5f, 0xb2, 0xad, 0x01, 0x0c, 0xb9, 0xe1, 0xf6 };
-static const std::vector<sal_uInt8> constBlockHmac2 { 0xa0, 0x67, 0x7f, 0x02, 0xb2, 0x2c, 0x84, 0x33 };
+const std::vector<sal_uInt8> constBlock1 { 0xfe, 0xa7, 0xd2, 0x76, 0x3b, 0x4b, 0x9e, 0x79 };
+const std::vector<sal_uInt8> constBlock2 { 0xd7, 0xaa, 0x0f, 0x6d, 0x30, 0x61, 0x34, 0x4e };
+const std::vector<sal_uInt8> constBlock3 { 0x14, 0x6e, 0x0b, 0xe7, 0xab, 0xac, 0xd0, 0xd6 };
+const std::vector<sal_uInt8> constBlockHmac1 { 0x5f, 0xb2, 0xad, 0x01, 0x0c, 0xb9, 0xe1, 0xf6 };
+const std::vector<sal_uInt8> constBlockHmac2 { 0xa0, 0x67, 0x7f, 0x02, 0xb2, 0x2c, 0x84, 0x33 };
 
 bool hashCalc(std::vector<sal_uInt8>& output,
               std::vector<sal_uInt8>& input,
diff --git a/oox/source/crypto/Standard2007Engine.cxx b/oox/source/crypto/Standard2007Engine.cxx
index 2aaf6f4ec3f3..2799ec5286f9 100644
--- a/oox/source/crypto/Standard2007Engine.cxx
+++ b/oox/source/crypto/Standard2007Engine.cxx
@@ -32,7 +32,7 @@ void lclRandomGenerateValues(sal_uInt8* aArray, sal_uInt32 aSize)
     rtl_random_destroyPool(aRandomPool);
 }
 
-static const OUString lclCspName = "Microsoft Enhanced RSA and AES Cryptographic Provider";
+const OUString lclCspName = "Microsoft Enhanced RSA and AES Cryptographic Provider";
 constexpr const sal_uInt32 AES128Size = 16;
 
 } // end anonymous namespace
diff --git a/oox/source/drawingml/chart/chartconverter.cxx b/oox/source/drawingml/chart/chartconverter.cxx
index e75b1c09c866..a864aac47e47 100644
--- a/oox/source/drawingml/chart/chartconverter.cxx
+++ b/oox/source/drawingml/chart/chartconverter.cxx
@@ -40,9 +40,9 @@ using namespace ::com::sun::star::uno;
 
 using ::oox::core::XmlFilterBase;
 
-static const sal_Unicode API_TOKEN_ARRAY_OPEN      = '{';
-static const sal_Unicode API_TOKEN_ARRAY_CLOSE     = '}';
-static const sal_Unicode API_TOKEN_ARRAY_COLSEP    = ';';
+const sal_Unicode API_TOKEN_ARRAY_OPEN      = '{';
+const sal_Unicode API_TOKEN_ARRAY_CLOSE     = '}';
+const sal_Unicode API_TOKEN_ARRAY_COLSEP    = ';';
 
 // Code similar to oox/source/xls/formulabase.cxx
 static OUString lclGenerateApiString( const OUString& rString )
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index 7bfee70b15de..c4f48b73e450 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -67,7 +67,7 @@ struct AutoFormatPatternEntry
 #define AUTOFORMAT_PATTERN_END() \
     AUTOFORMAT_PATTERN_COLOR( XML_TOKEN_INVALID )
 
-static const AutoFormatPatternEntry spAutoFormatPattern1[] =
+const AutoFormatPatternEntry spAutoFormatPattern1[] =
 {
     AUTOFORMAT_PATTERN_COLORMOD( XML_dk1, XML_tint, 88500 ),
     AUTOFORMAT_PATTERN_COLORMOD( XML_dk1, XML_tint, 55000 ),
@@ -78,7 +78,7 @@ static const AutoFormatPatternEntry spAutoFormatPattern1[] =
     AUTOFORMAT_PATTERN_END()
 };
 
-static const AutoFormatPatternEntry spAutoFormatPattern2[] =
+const AutoFormatPatternEntry spAutoFormatPattern2[] =
 {
     AUTOFORMAT_PATTERN_COLOR( XML_accent1 ),
     AUTOFORMAT_PATTERN_COLOR( XML_accent2 ),
@@ -89,7 +89,7 @@ static const AutoFormatPatternEntry spAutoFormatPattern2[] =
     AUTOFORMAT_PATTERN_END()
 };
 
-static const AutoFormatPatternEntry spAutoFormatPattern3[] =
+const AutoFormatPatternEntry spAutoFormatPattern3[] =
 {
     AUTOFORMAT_PATTERN_COLORMOD( XML_accent1, XML_shade, 50000 ),
     AUTOFORMAT_PATTERN_COLORMOD( XML_accent2, XML_shade, 50000 ),
@@ -100,7 +100,7 @@ static const AutoFormatPatternEntry spAutoFormatPattern3[] =
     AUTOFORMAT_PATTERN_END()
 };
 
-static const AutoFormatPatternEntry spAutoFormatPattern4[] =
+const AutoFormatPatternEntry spAutoFormatPattern4[] =
 {
     AUTOFORMAT_PATTERN_COLORMOD( XML_dk1, XML_tint,  5000 ),
     AUTOFORMAT_PATTERN_COLORMOD( XML_dk1, XML_tint, 55000 ),
@@ -162,13 +162,13 @@ struct AutoFormatEntry
 #define AUTOFORMAT_END() \
     AUTOFORMAT_INVISIBLE( -1, -1 )
 
-static const AutoFormatEntry spNoFormats[] =
+const AutoFormatEntry spNoFormats[] =
 {
     AUTOFORMAT_INVISIBLE( 1, 48 ),
     AUTOFORMAT_END()
 };
 
-static const AutoFormatEntry spChartSpaceFill[] =
+const AutoFormatEntry spChartSpaceFill[] =
 {
     AUTOFORMAT_COLOR( 1, 32, THEMED_STYLE_SUBTLE, XML_bg1 ),
     AUTOFORMAT_COLOR( 33, 40, THEMED_STYLE_SUBTLE, XML_lt1 ),
@@ -176,7 +176,7 @@ static const AutoFormatEntry spChartSpaceFill[] =
     AUTOFORMAT_END()
 };
 
-static const AutoFormatEntry spDataTableLines[] =
+const AutoFormatEntry spDataTableLines[] =
 {
     AUTOFORMAT_COLORMOD(  1, 32, THEMED_STYLE_SUBTLE, XML_tx1, XML_tint, 75000 ),
     AUTOFORMAT_COLORMOD( 33, 40, THEMED_STYLE_SUBTLE, XML_dk1, XML_tint, 75000 ),
@@ -184,7 +184,7 @@ static const AutoFormatEntry spDataTableLines[] =
     AUTOFORMAT_END()
 };
 
-static const AutoFormatEntry spPlotArea2dFills[] =
+const AutoFormatEntry spPlotArea2dFills[] =
 {
     AUTOFORMAT_COLOR(       1, 32, THEMED_STYLE_SUBTLE, XML_bg1 ),
     AUTOFORMAT_COLORMOD(   33, 34, THEMED_STYLE_SUBTLE, XML_dk1, XML_tint, 20000 ),
@@ -193,7 +193,7 @@ static const AutoFormatEntry spPlotArea2dFills[] =
     AUTOFORMAT_END()
 };
 
-static const AutoFormatEntry spWallFloorLines[] =
+const AutoFormatEntry spWallFloorLines[] =
 {
     AUTOFORMAT_COLORMOD(  1, 32, THEMED_STYLE_SUBTLE, XML_tx1, XML_tint, 75000 ),
     AUTOFORMAT_COLORMOD( 33, 40, THEMED_STYLE_SUBTLE, XML_dk1, XML_tint, 75000 ),
@@ -201,7 +201,7 @@ static const AutoFormatEntry spWallFloorLines[] =
     AUTOFORMAT_END()
 };
 
-static const AutoFormatEntry spWallFloorFills[] =
+const AutoFormatEntry spWallFloorFills[] =
 {
     AUTOFORMAT_INVISIBLE(   1, 32 ),
     AUTOFORMAT_COLORMOD(   33, 34, THEMED_STYLE_SUBTLE, XML_dk1, XML_tint, 20000 ),
@@ -210,28 +210,28 @@ static const AutoFormatEntry spWallFloorFills[] =
     AUTOFORMAT_END()
 };
 
-static const AutoFormatEntry spAxisLines[] =
+const AutoFormatEntry spAxisLines[] =
 {
     AUTOFORMAT_COLORMOD(  1, 32, THEMED_STYLE_SUBTLE, XML_tx1, XML_tint, 75000 ),   // tint not documented!?
     AUTOFORMAT_COLORMOD( 33, 48, THEMED_STYLE_SUBTLE, XML_dk1, XML_tint, 75000 ),   // tint not documented!?
     AUTOFORMAT_END()
 };
 
-static const AutoFormatEntry spMajorGridLines[] =
+const AutoFormatEntry spMajorGridLines[] =
 {
     AUTOFORMAT_COLORMOD(  1, 32, THEMED_STYLE_SUBTLE, XML_tx1, XML_tint, 75000 ),   // tint not documented!?
     AUTOFORMAT_COLORMOD( 33, 48, THEMED_STYLE_SUBTLE, XML_dk1, XML_tint, 75000 ),   // tint not documented!?
     AUTOFORMAT_END()
 };
 
-static const AutoFormatEntry spMinorGridLines[] =
+const AutoFormatEntry spMinorGridLines[] =
 {
     AUTOFORMAT_COLORMOD(  1, 40, THEMED_STYLE_SUBTLE, XML_tx1, XML_tint, 50000 ),
     AUTOFORMAT_COLORMOD( 41, 48, THEMED_STYLE_SUBTLE, XML_tx1, XML_tint, 90000 ),
     AUTOFORMAT_END()
 };
 
-static const AutoFormatEntry spOtherLines[] =
+const AutoFormatEntry spOtherLines[] =
 {
     AUTOFORMAT_COLOR(     1, 32, THEMED_STYLE_SUBTLE, XML_tx1 ),
     AUTOFORMAT_COLOR(    33, 34, THEMED_STYLE_SUBTLE, XML_dk1 ),
@@ -240,7 +240,7 @@ static const AutoFormatEntry spOtherLines[] =
     AUTOFORMAT_END()
 };
 
-static const AutoFormatEntry spLinearSeriesLines[] =
+const AutoFormatEntry spLinearSeriesLines[] =
 {
     AUTOFORMAT_PATTERN(       1,  1, THEMED_STYLE_SUBTLE, 300, spAutoFormatPattern1 ),
     AUTOFORMAT_PATTERN(       2,  2, THEMED_STYLE_SUBTLE, 300, spAutoFormatPattern2 ),
@@ -263,7 +263,7 @@ static const AutoFormatEntry spLinearSeriesLines[] =
     AUTOFORMAT_END()
 };
 
-static const AutoFormatEntry spFilledSeriesLines[] =
+const AutoFormatEntry spFilledSeriesLines[] =
 {
     AUTOFORMAT_INVISIBLE(   1,  8 ),
     AUTOFORMAT_COLOR(       9, 16, THEMED_STYLE_SUBTLE, XML_lt1 ),
@@ -275,7 +275,7 @@ static const AutoFormatEntry spFilledSeriesLines[] =
     AUTOFORMAT_END()
 };
 
-static const AutoFormatEntry spFilledSeries2dFills[] =
+const AutoFormatEntry spFilledSeries2dFills[] =
 {
     AUTOFORMAT_PATTERN(       1,  1, THEMED_STYLE_SUBTLE,  100, spAutoFormatPattern1 ),
     AUTOFORMAT_PATTERN(       2,  2, THEMED_STYLE_SUBTLE,  100, spAutoFormatPattern2 ),
@@ -298,7 +298,7 @@ static const AutoFormatEntry spFilledSeries2dFills[] =
     AUTOFORMAT_END()
 };
 
-static const AutoFormatEntry spFilledSeries3dFills[] =
+const AutoFormatEntry spFilledSeries3dFills[] =
 {
     AUTOFORMAT_PATTERN(       1,  1, THEMED_STYLE_SUBTLE,  100, spAutoFormatPattern1 ),
     AUTOFORMAT_PATTERN(       2,  2, THEMED_STYLE_SUBTLE,  100, spAutoFormatPattern2 ),
@@ -321,7 +321,7 @@ static const AutoFormatEntry spFilledSeries3dFills[] =
     AUTOFORMAT_END()
 };
 
-static const AutoFormatEntry spUpDownBarLines[] =
+const AutoFormatEntry spUpDownBarLines[] =
 {
     AUTOFORMAT_COLOR(       1, 16, THEMED_STYLE_SUBTLE, XML_tx1 ),
     AUTOFORMAT_INVISIBLE(  17, 32 ),
@@ -331,7 +331,7 @@ static const AutoFormatEntry spUpDownBarLines[] =
     AUTOFORMAT_END()
 };
 
-static const AutoFormatEntry spUpBarFills[] =
+const AutoFormatEntry spUpBarFills[] =
 {
     AUTOFORMAT_COLORMOD(    1,  1, THEMED_STYLE_SUBTLE,  XML_dk1, XML_tint, 25000 ),
     AUTOFORMAT_COLORMOD(    2,  2, THEMED_STYLE_SUBTLE,  XML_dk1, XML_tint,  5000 ),
@@ -352,7 +352,7 @@ static const AutoFormatEntry spUpBarFills[] =
     AUTOFORMAT_END()
 };
 
-static const AutoFormatEntry spDownBarFills[] =
+const AutoFormatEntry spDownBarFills[] =
 {
     AUTOFORMAT_COLORMOD(    1,  1, THEMED_STYLE_SUBTLE,  XML_dk1, XML_tint,  85000 ),
     AUTOFORMAT_COLORMOD(    2,  2, THEMED_STYLE_SUBTLE,  XML_dk1, XML_tint,  95000 ),
@@ -409,21 +409,21 @@ struct AutoTextEntry
 #define AUTOTEXT_END() \
     AUTOTEXT_COLOR( -1, -1, XML_none, XML_TOKEN_INVALID, 1000, 100, false )
 
-static const AutoTextEntry spChartTitleTexts[] =
+const AutoTextEntry spChartTitleTexts[] =
 {
     AUTOTEXT_COLOR(  1, 40, XML_minor, XML_tx1, 1800, 120, true ),
     AUTOTEXT_COLOR( 41, 48, XML_minor, XML_lt1, 1800, 120, true ),
     AUTOTEXT_END()
 };
 
-static const AutoTextEntry spAxisTitleTexts[] =
+const AutoTextEntry spAxisTitleTexts[] =
 {
     AUTOTEXT_COLOR(  1, 40, XML_minor, XML_tx1, 1000, 100, true ),
     AUTOTEXT_COLOR( 41, 48, XML_minor, XML_lt1, 1000, 100, true ),
     AUTOTEXT_END()
 };
 
-static const AutoTextEntry spOtherTexts[] =
+const AutoTextEntry spOtherTexts[] =
 {
     AUTOTEXT_COLOR(  1, 40, XML_minor, XML_tx1, 1000, 100, false ),
     AUTOTEXT_COLOR( 41, 48, XML_minor, XML_lt1, 1000, 100, false ),
@@ -443,7 +443,7 @@ const AutoTextEntry* lclGetAutoTextEntry( const AutoTextEntry* pEntries, sal_Int
 
 // These PropIds arrays will be indexed into using a ShapeProperty enum
 
-static const ShapePropertyIds spnCommonPropIds =
+const ShapePropertyIds spnCommonPropIds =
 {
     PROP_LineStyle, PROP_LineWidth, PROP_LineColor, PROP_LineTransparence, PROP_LineDashName,
     PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID,
@@ -453,7 +453,7 @@ static const ShapePropertyIds spnCommonPropIds =
     PROP_FillHatchName, PROP_FillBackground
 };
 
-static const ShapePropertyIds spnLinearPropIds =
+const ShapePropertyIds spnLinearPropIds =
 {
     PROP_LineStyle, PROP_LineWidth, PROP_Color, PROP_Transparency, PROP_LineDashName,
     PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID,
@@ -463,7 +463,7 @@ static const ShapePropertyIds spnLinearPropIds =
     PROP_INVALID, PROP_INVALID
 };
 
-static const ShapePropertyIds spnFilledPropIds =
+const ShapePropertyIds spnFilledPropIds =
 {
     PROP_BorderStyle,
     PROP_BorderWidth,
@@ -495,11 +495,11 @@ static const ShapePropertyIds spnFilledPropIds =
 };
 
 /** Property info for common chart objects, to be used in ShapePropertyMap. */
-static const ShapePropertyInfo saCommonPropInfo( spnCommonPropIds, false, true, true, true, true );
+const ShapePropertyInfo saCommonPropInfo( spnCommonPropIds, false, true, true, true, true );
 /** Property info for linear data series, to be used in ShapePropertyMap. */
-static const ShapePropertyInfo saLinearPropInfo( spnLinearPropIds, false, true, true, true, true );
+const ShapePropertyInfo saLinearPropInfo( spnLinearPropIds, false, true, true, true, true );
 /** Property info for filled data series, to be used in ShapePropertyMap. */
-static const ShapePropertyInfo saFilledPropInfo( spnFilledPropIds, false, true, true, true, true );
+const ShapePropertyInfo saFilledPropInfo( spnFilledPropIds, false, true, true, true, true );
 
 /** Contains information about formatting of a specific chart object type. */
 struct ObjectTypeFormatEntry
@@ -526,7 +526,7 @@ struct ObjectTypeFormatEntry
 #define TYPEFORMAT_LINE( obj_type, prop_type, auto_texts, auto_lines ) \
     { obj_type, prop_type, auto_lines, nullptr,  auto_texts, false }
 
-static const ObjectTypeFormatEntry spObjTypeFormatEntries[] =
+const ObjectTypeFormatEntry spObjTypeFormatEntries[] =
 {
     //                object type                property info      auto text          auto line            auto fill
     TYPEFORMAT_FRAME( OBJECTTYPE_CHARTSPACE,     saCommonPropInfo, nullptr,                 spNoFormats,         spChartSpaceFill ),
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx
index 621d768caa26..47e2f351608a 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -67,7 +67,7 @@ const char SERVICE_CHART2_SURFACE[]   = "com.sun.star.chart2.ColumnChartType";
 
 namespace csscd = ::com::sun::star::chart::DataLabelPlacement;
 
-static const TypeGroupInfo spTypeInfos[] =
+const TypeGroupInfo spTypeInfos[] =
 {
     // type-id          type-category         service                   varied-point-color   default label pos     polar  area2d 1stvis xcateg swap   stack  picopt
     { TYPEID_BAR,       TYPECATEGORY_BAR,     SERVICE_CHART2_COLUMN,    VARPOINTMODE_SINGLE, csscd::OUTSIDE,       false, true,  false, true,  false, true,  true  },
@@ -85,7 +85,7 @@ static const TypeGroupInfo spTypeInfos[] =
     { TYPEID_SURFACE,   TYPECATEGORY_SURFACE, SERVICE_CHART2_SURFACE,   VARPOINTMODE_NONE,   csscd::RIGHT,         false, true,  false, true,  false, false, false }
 };
 
-static const TypeGroupInfo saUnknownTypeInfo =
+const TypeGroupInfo saUnknownTypeInfo =
     { TYPEID_UNKNOWN,   TYPECATEGORY_BAR,     SERVICE_CHART2_COLUMN,  VARPOINTMODE_SINGLE, csscd::OUTSIDE,       false, true,  false, true,  false, true, true  };
 
 const TypeGroupInfo& lclGetTypeInfoFromTypeId( TypeId eTypeId )
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index 5f21bd12c39d..f54cd4a2ca68 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -70,7 +70,7 @@ struct FormulaCommandNameTable
 
 }
 
-static const FormulaCommandNameTable pFormulaCommandNameTable[] =
+const FormulaCommandNameTable pFormulaCommandNameTable[] =
 {
     { "*/",     FC_MULDIV },
     { "+-",     FC_PLUSMINUS },
diff --git a/oox/source/drawingml/presetgeometrynames.cxx b/oox/source/drawingml/presetgeometrynames.cxx
index d9f71c3c59e1..d74cd352b282 100644
--- a/oox/source/drawingml/presetgeometrynames.cxx
+++ b/oox/source/drawingml/presetgeometrynames.cxx
@@ -25,7 +25,7 @@ struct PresetGeometryName
     const char* pFontworkType;
 };
 
-static const PresetGeometryName pPresetGeometryNameArray[]
+const PresetGeometryName pPresetGeometryNameArray[]
     = { { "textNoShape", "" },
         { "textPlain", "fontwork-plain-text" },
         { "textStop", "fontwork-stop" },
diff --git a/oox/source/drawingml/shapepropertymap.cxx b/oox/source/drawingml/shapepropertymap.cxx
index 6542f877f4f0..59413ba1dc98 100644
--- a/oox/source/drawingml/shapepropertymap.cxx
+++ b/oox/source/drawingml/shapepropertymap.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno;
 
 namespace {
 
-static const ShapePropertyIds spnDefaultShapeIds =
+const ShapePropertyIds spnDefaultShapeIds =
 {
     PROP_LineStyle, PROP_LineWidth, PROP_LineColor, PROP_LineTransparence, PROP_LineDash, PROP_LineCap, PROP_LineJoint,
     PROP_LineStartName, PROP_LineStartWidth, PROP_LineStartCenter, PROP_LineEndName, PROP_LineEndWidth, PROP_LineEndCenter,
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index dc0fe18cd437..c0e2f65db2c0 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -53,8 +53,8 @@ using namespace sax_fastparser;
 using namespace oox::vml;
 using namespace com::sun::star;
 
-static const sal_Int32 Tag_Container = 44444;
-static const sal_Int32 Tag_Commit = 44445;
+const sal_Int32 Tag_Container = 44444;
+const sal_Int32 Tag_Commit = 44445;
 
 VMLExport::VMLExport( ::sax_fastparser::FSHelperPtr const & pSerializer, VMLTextExport* pTextExport )
     : EscherEx( std::make_shared<EscherExGlobal>(), nullptr, /*bOOXML=*/true )
diff --git a/oox/source/helper/modelobjecthelper.cxx b/oox/source/helper/modelobjecthelper.cxx
index 5380b4cc6a23..d2c761d28d3b 100644
--- a/oox/source/helper/modelobjecthelper.cxx
+++ b/oox/source/helper/modelobjecthelper.cxx
@@ -88,11 +88,11 @@ void ObjectContainer::createContainer() const
     OSL_ENSURE( mxContainer.is(), "ObjectContainer::createContainer - container not found" );
 }
 
-static const OUStringLiteral gaDashNameBase(      "msLineDash " );      ///< Base name for all named line dashes.
-static const OUStringLiteral gaGradientNameBase(  "msFillGradient " );  ///< Base name for all named fill gradients.
-static const OUStringLiteral gaTransGradNameBase( "msTransGradient " ); ///< Base name for all named fill gradients.
-static const OUStringLiteral gaBitmapUrlNameBase( "msFillBitmap " );    ///< Base name for all named fill bitmap URLs.
-static const OUStringLiteral gaHatchNameBase(     "msFillHatch " );     ///< Base name for all named fill hatches.
+const OUStringLiteral gaDashNameBase(      "msLineDash " );      ///< Base name for all named line dashes.
+const OUStringLiteral gaGradientNameBase(  "msFillGradient " );  ///< Base name for all named fill gradients.
+const OUStringLiteral gaTransGradNameBase( "msTransGradient " ); ///< Base name for all named fill gradients.
+const OUStringLiteral gaBitmapUrlNameBase( "msFillBitmap " );    ///< Base name for all named fill bitmap URLs.
+const OUStringLiteral gaHatchNameBase(     "msFillHatch " );     ///< Base name for all named fill hatches.
 
 ModelObjectHelper::ModelObjectHelper( const Reference< XMultiServiceFactory >& rxModelFactory ) :
     maMarkerContainer(    rxModelFactory, "com.sun.star.drawing.MarkerTable" ),
diff --git a/oox/source/ole/oleobjecthelper.cxx b/oox/source/ole/oleobjecthelper.cxx
index a77a784af629..b6c4edb4314e 100644
--- a/oox/source/ole/oleobjecthelper.cxx
+++ b/oox/source/ole/oleobjecthelper.cxx
@@ -51,7 +51,7 @@ OleObjectInfo::OleObjectInfo() :
 {
 }
 
-static const char g_aEmbeddedObjScheme[] = "vnd.sun.star.EmbeddedObject:";
+const char g_aEmbeddedObjScheme[] = "vnd.sun.star.EmbeddedObject:";
 
 OleObjectHelper::OleObjectHelper(
         const Reference< XMultiServiceFactory >& rxModelFactory,
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index ceacc9e0084f..42904adfa7be 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -100,7 +100,7 @@ private:
     sal_Int32           mnIndex;
 };
 
-static const OUStringLiteral gaDummyBaseName( "DummyGroupSep" );
+const OUStringLiteral gaDummyBaseName( "DummyGroupSep" );
 
 VbaControlNamesSet::VbaControlNamesSet() :
     mnIndex( 0 )
diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx
index 9a9515685944..5bc5b92db95b 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -263,8 +263,8 @@ bool lclProcessCharacters( OStringBuffer& rBuffer, const OString& rChars )
 
 } // namespace
 
-static const OString gaOpeningCData( "<![CDATA[" );
-static const OString gaClosingCData( "]]>" );
+const OString gaOpeningCData( "<![CDATA[" );
+const OString gaClosingCData( "]]>" );
 
 InputStream::InputStream( const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm ) :
     // use single-byte ISO-8859-1 encoding which maps all byte characters to the first 256 Unicode characters