Upcoming improved loplugin:staticanonymous -> redundantstatic: sc

Change-Id: Ie2d2d26bac69f4b228eadef712b06b665b3974eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97650 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
author: Stephan Bergmann <sbergman@redhat.com> 2020-07-01 19:56:24 +0200
committer: Stephan Bergmann <sbergman@redhat.com> 2020-07-01 21:23:34 +0200
commit: 45170005287b7f1c9610684b3d5913a356b0f4e1 (patch)
tree: edb06323c3e22b6e49247679222b392be9ce0561 /sc/source
parent: 8e50b9ca808e668d1f55d6b2dc517e6221fe1df7 (diff)
60 files changed, 323 insertions, 323 deletions
diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index 693da4ae62f2..3fe99a328cf1 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -1326,7 +1326,7 @@ struct ScIconSetBitmapMap {
     const OUStringLiteral* pBitmaps;
 };
 
-static const ScIconSetBitmapMap aBitmapMap[] = {
+const ScIconSetBitmapMap aBitmapMap[] = {
     { IconSet_3Arrows, a3Arrows },
     { IconSet_3ArrowsGray, a3ArrowsGray },
     { IconSet_3Flags, a3Flags },
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 325b6988e184..b4a8e47fdc54 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -89,7 +89,7 @@ SvxFontItem* getDefaultFontItem(LanguageType eLang, DefaultFontType nFontType, s
 
 }
 
-static SfxItemInfo const  aItemInfos[] =
+SfxItemInfo const  aItemInfos[] =
 {
     { SID_ATTR_CHAR_FONT,           true },    // ATTR_FONT
     { SID_ATTR_CHAR_FONTHEIGHT,     true },    // ATTR_FONT_HEIGHT
diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx
index a4a22ff61e91..3930a6e00554 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -758,7 +758,7 @@ OUString ScDPDimensionSaveData::CreateGroupDimName(
 
 namespace
 {
-    static const char* aDatePartIds[] =
+    const char* aDatePartIds[] =
     {
         STR_DPFIELD_GROUP_BY_SECONDS,
         STR_DPFIELD_GROUP_BY_MINUTES,
diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx
index 2ffeff608143..7d2152226b68 100644
--- a/sc/source/core/data/sheetevents.cxx
+++ b/sc/source/core/data/sheetevents.cxx
@@ -53,7 +53,7 @@ sal_Int32 ScSheetEvents::GetVbaSheetEventId(ScSheetEventId nEvent)
     return nVbaEventIds[static_cast<int>(nEvent)];
 }
 
-static const int COUNT = static_cast<int>(ScSheetEventId::COUNT);
+const int COUNT = static_cast<int>(ScSheetEventId::COUNT);
 
 sal_Int32 ScSheetEvents::GetVbaDocumentEventId(ScSheetEventId nEvent)
 {
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index f505e23c97d5..459de3fae64b 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -41,7 +41,7 @@
 #define REDUCE_THRESHOLD 201  // set to 4 for correctness testing. priority 1
 #define UNROLLING_FACTOR 16  // set to 4 for correctness testing (if no reduce)
 
-static const char* const publicFunc =
+const char* const publicFunc =
  "\n"
  "#define IllegalArgument 502\n"
  "#define IllegalFPOperation 503 // #NUM!\n"
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 2d60770426c7..073c17fe10d0 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -71,7 +71,7 @@
  * be synchronized with Writer's SwTableAutoFmtTbl sw/source/core/doc/tblafmt.cxx
  */
 
-static const char sAutoTblFmtName[] = "autotbl.fmt";
+const char sAutoTblFmtName[] = "autotbl.fmt";
 
 // till SO5PF
 const sal_uInt16 AUTOFORMAT_ID_X        = 9501;
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index d134a9e45cec..dd202bd525bc 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -33,7 +33,7 @@
 
 #define SC_CONS_NOTFOUND    -1
 
-static const OpCode eOpCodeTable[] = {      //  order as for enum ScSubTotalFunc
+const OpCode eOpCodeTable[] = {      //  order as for enum ScSubTotalFunc
         ocBad,                              //  none
         ocAverage,
         ocCount,
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 9312a2a1eea1..50683114a242 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -77,7 +77,7 @@
 #include <memory>
 #include <limits>
 
-static const sal_uInt64 n2power48 = SAL_CONST_UINT64( 281474976710656); // 2^48
+const sal_uInt64 n2power48 = SAL_CONST_UINT64( 281474976710656); // 2^48
 
 ScCalcConfig *ScInterpreter::mpGlobalConfig = nullptr;
 
@@ -8961,7 +8961,7 @@ struct UBlockScript {
 
 }
 
-static const UBlockScript scriptList[] = {
+const UBlockScript scriptList[] = {
     {UBLOCK_HANGUL_JAMO, UBLOCK_HANGUL_JAMO},
     {UBLOCK_CJK_RADICALS_SUPPLEMENT, UBLOCK_HANGUL_SYLLABLES},
     {UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS,UBLOCK_CJK_RADICALS_SUPPLEMENT },
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 052079812b7b..addce9cefd95 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -240,7 +240,7 @@ struct XclExpCompConfig
 };
 
 /** The table containing configuration data for all formula types. */
-static const XclExpCompConfig spConfigTable[] =
+const XclExpCompConfig spConfigTable[] =
 {
     // formula type         token class type     lclLM  inCell 3dOnly allowArray
     { EXC_FMLATYPE_CELL,    EXC_CLASSTYPE_CELL,  true,  true,  false, true  },
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index f21500dcf648..f9bd6c09b511 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -69,7 +69,7 @@ const sal_uInt16 EXC_PCITEM_DATA_INTEGER    = 0x0004;   /// Integer, double with
 const sal_uInt16 EXC_PCITEM_DATA_DATE       = 0x0008;   /// Date, time, date/time.
 
 /** Maps a bitfield consisting of EXC_PCITEM_DATA_* flags above to SXFIELD data type bitfield. */
-static const sal_uInt16 spnPCItemFlags[] =
+const sal_uInt16 spnPCItemFlags[] =
 {                               // STR DBL INT DAT
     EXC_SXFIELD_DATA_NONE,
     EXC_SXFIELD_DATA_STR,       //  x
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index e3410358896e..fa7ea9c35a10 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -3295,7 +3295,7 @@ XclImpDffConverter::XclImpDffConvData::XclImpDffConvData(
 {
 }
 
-static const OUStringLiteral gaStdFormName( "Standard" ); /// Standard name of control forms.
+const OUStringLiteral gaStdFormName( "Standard" ); /// Standard name of control forms.
 
 XclImpDffConverter::XclImpDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm ) :
     XclImpSimpleDffConverter( rRoot, rDffStrm ),
diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index da30a49b6711..18e16c2694b8 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -415,7 +415,7 @@ OUString XclChartHelper::GetErrorBarValuesRole( sal_uInt8 nBarType )
 
 namespace {
 
-static const XclChFormatInfo spFmtInfos[] =
+const XclChFormatInfo spFmtInfos[] =
 {
     // object type                  property mode                auto line color         auto line weight         auto pattern color      missing frame type         create delete isframe
     { EXC_CHOBJTYPE_BACKGROUND,     EXC_CHPROPMODE_COMMON,       EXC_COLOR_CHWINDOWTEXT, EXC_CHLINEFORMAT_HAIR,   EXC_COLOR_CHWINDOWBACK, EXC_CHFRAMETYPE_INVISIBLE, true,  true,  true  },
@@ -469,7 +469,7 @@ const char SERVICE_CHART2_SURFACE[]   = "com.sun.star.chart2.ColumnChartType";
 
 namespace csscd = css::chart::DataLabelPlacement;
 
-static const XclChTypeInfo spTypeInfos[] =
+const XclChTypeInfo spTypeInfos[] =
 {
     // chart type             chart type category      record id           service                   varied point color     def label pos         comb2d 3d     polar  area2d area3d 1stvis xcateg swap   stack  revers betw
     { EXC_CHTYPEID_BAR,       EXC_CHTYPECATEG_BAR,     EXC_ID_CHBAR,       SERVICE_CHART2_COLUMN,    EXC_CHVARPOINT_SINGLE, csscd::OUTSIDE,       true,  true,  false, true,  true,  false, true,  false, true,  false, true  },
diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx
index 8bbc1e397491..44549430f53a 100644
--- a/sc/source/filter/excel/xlescher.cxx
+++ b/sc/source/filter/excel/xlescher.cxx
@@ -296,7 +296,7 @@ Reference< XControlModel > XclControlHelper::GetControlModel( Reference< XShape
 
 namespace {
 
-static const struct
+const struct
 {
     const char*     mpcListenerType;
     const char*     mpcEventMethod;
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 30db442f67de..121784cd849b 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -73,7 +73,7 @@ const sal_uInt8 MX    = 30;                 /// Maximum parameter count.
 #define EXC_FUNCNAME_ADDIN( ascii )   "com.sun.star.sheet.addin." ascii
 
 /** Functions new in BIFF2. */
-static const XclFunctionInfo saFuncTable_2[] =
+const XclFunctionInfo saFuncTable_2[] =
 {
     { ocCount,              0,      0,  MX, V, { RX }, 0, nullptr },
     { ocIf,                 1,      2,  3,  R, { VO, RO }, 0, nullptr },
@@ -223,7 +223,7 @@ static const XclFunctionInfo saFuncTable_2[] =
 };
 
 /** Functions new in BIFF3. */
-static const XclFunctionInfo saFuncTable_3[] =
+const XclFunctionInfo saFuncTable_3[] =
 {
     { ocLinest,             49,     1,  4,  A, { RA, RA, VV }, 0, nullptr },          // BIFF2: 1-2, BIFF3: 1-4
     { ocTrend,              50,     1,  4,  A, { RA, RA, RA, VV }, 0, nullptr },      // BIFF2: 1-3, BIFF3: 1-4
@@ -251,7 +251,7 @@ static const XclFunctionInfo saFuncTable_3[] =
 };
 
 /** Functions new in BIFF4. */
-static const XclFunctionInfo saFuncTable_4[] =
+const XclFunctionInfo saFuncTable_4[] =
 {
     { ocFixed,              14,     1,  3,  V, { VR }, 0, nullptr },                  // BIFF2-3: 1-2, BIFF4: 1-3
     { ocAsc,                214,    1,  1,  V, { VR }, 0, nullptr },
@@ -340,7 +340,7 @@ static const XclFunctionInfo saFuncTable_4[] =
 };
 
 /** Functions new in BIFF5/BIFF7. Unsupported functions: DATESTRING, NUMBERSTRING. */
-static const XclFunctionInfo saFuncTable_5[] =
+const XclFunctionInfo saFuncTable_5[] =
 {
     { ocGetDayOfWeek,       70,     1,  2,  V, { VR }, 0, nullptr },                  // BIFF2-4: 1, BIFF5: 1-2
     { ocHLookup,            101,    3,  4,  V, { VV, RO, RO, VV }, 0, nullptr },      // BIFF2-4: 3, BIFF5: 3-4
@@ -364,7 +364,7 @@ static const XclFunctionInfo saFuncTable_5[] =
 };
 
 /** Functions new in BIFF8. Unsupported functions: PHONETIC. */
-static const XclFunctionInfo saFuncTable_8[] =
+const XclFunctionInfo saFuncTable_8[] =
 {
     { ocGetPivotData,       358,    2,  MX, V, { RR, RR, VR }, 0, nullptr },
     { ocHyperLink,          359,    1,  2,  V, { VV, VO }, 0, nullptr },
@@ -386,7 +386,7 @@ static const XclFunctionInfo saFuncTable_8[] =
     { opcode,  255, (minparam)+1, (maxparam)+1, V, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY|(flags), EXC_FUNCNAME( asciiname ) }
 
 /** Functions new in OOXML. */
-static const XclFunctionInfo saFuncTable_Oox[] =
+const XclFunctionInfo saFuncTable_Oox[] =
 {
     { ocCountIfs,           NOID,   2,  MX, V, { RO, VR }, EXC_FUNCFLAG_IMPORTONLY|EXC_FUNCFLAG_PARAMPAIRS, EXC_FUNCNAME( "COUNTIFS" ) },
     { ocCountIfs,           255,    3,  MX, V, { RO_E, RO, VR }, EXC_FUNCFLAG_EXPORTONLY|EXC_FUNCFLAG_PARAMPAIRS, EXC_FUNCNAME( "COUNTIFS" ) },
@@ -435,7 +435,7 @@ static const XclFunctionInfo saFuncTable_Oox[] =
 
     @See sc/source/filter/oox/formulabase.cxx saFuncTable2010 for V,VR,RO,...
  */
-static const XclFunctionInfo saFuncTable_2010[] =
+const XclFunctionInfo saFuncTable_2010[] =
 {
     EXC_FUNCENTRY_V_VA( ocCovarianceP,      2,  2,  0,  "COVARIANCE.P" ),
     EXC_FUNCENTRY_V_VA( ocCovarianceS,      2,  2,  0,  "COVARIANCE.S" ),
@@ -514,7 +514,7 @@ static const XclFunctionInfo saFuncTable_2010[] =
 
     @See sc/source/filter/oox/formulabase.cxx saFuncTable2013 for V,VR,RO,...
  */
-static const XclFunctionInfo saFuncTable_2013[] =
+const XclFunctionInfo saFuncTable_2013[] =
 {
     EXC_FUNCENTRY_V_VR_IMPORT(  ocArcCot,        1,  1,  0,  "ACOT" ),
     EXC_FUNCENTRY_V_VR_IMPORT(  ocArcCotHyp,     1,  1,  0,  "ACOTH" ),
@@ -578,7 +578,7 @@ static const XclFunctionInfo saFuncTable_2013[] =
 
     @See sc/source/filter/oox/formulabase.cxx saFuncTable2016 for V,VR,RO,...
  */
-static const XclFunctionInfo saFuncTable_2016[] =
+const XclFunctionInfo saFuncTable_2016[] =
 {
     EXC_FUNCENTRY_V_VR(  ocForecast_ETS_ADD,    3,  6,  0,  "FORECAST.ETS" ),
     EXC_FUNCENTRY_V_VR(  ocForecast_ETS_PIA,    3,  7,  0,  "FORECAST.ETS.CONFINT" ),
@@ -598,7 +598,7 @@ static const XclFunctionInfo saFuncTable_2016[] =
     { opcode,  255, (minparam)+1, (maxparam)+1, V, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY|(flags), EXC_FUNCNAME_ODF( asciiname ) }
 
 /** Functions defined by OpenFormula, but not supported by Calc (ocNoName) or by Excel (defined op-code). */
-static const XclFunctionInfo saFuncTable_Odf[] =
+const XclFunctionInfo saFuncTable_Odf[] =
 {
     EXC_FUNCENTRY_ODF( ocChiSqDist,     2,  3,  0,  "CHISQDIST" ),
     EXC_FUNCENTRY_ODF( ocChiSqInv,      2,  2,  0,  "CHISQINV" )
@@ -615,7 +615,7 @@ static const XclFunctionInfo saFuncTable_Odf[] =
     { opcode, NOID, minparam,     maxparam,     V, { VR },       EXC_FUNCFLAG_IMPORTONLY|(flags), asciiname }
 
 /** Functions defined by Calc, but not in OpenFormula nor supported by Excel. */
-static const XclFunctionInfo saFuncTable_OOoLO[] =
+const XclFunctionInfo saFuncTable_OOoLO[] =
 {
     EXC_FUNCENTRY_OOO( ocErrorType,     1,  1,  0,  "ORG.OPENOFFICE.ERRORTYPE" ),
     EXC_FUNCENTRY_OOO_IBR( ocErrorType, 1,  1,  0,  "ERRORTYPE" ),      // was written wrongly, read it
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index 448fafaaad1e..d780b1c18723 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -328,8 +328,8 @@ sal_uInt16 XclRoot::GetBaseYear() const
     return (GetNullDate().GetYear() == 1904) ? 1904 : 1900;
 }
 
-static const DateTime theOurCompatNullDate( Date( 30, 12, 1899 ));
-static const DateTime theExcelCutOverDate( Date( 1, 3, 1900 ));
+const DateTime theOurCompatNullDate( Date( 30, 12, 1899 ));
+const DateTime theExcelCutOverDate( Date( 1, 3, 1900 ));
 
 double XclRoot::GetDoubleFromDateTime( const DateTime& rDateTime ) const
 {
diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx
index 93de32251f07..0cc23ed90bfb 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
@@ -45,13 +45,13 @@
             Color(0x800000), Color(0x008000), Color(0x000080), Color(0x808000), Color(0x800080), Color(0x008080), Color(0xC0C0C0), Color(0x808080)
 
 /** Default color table for BIFF2. */
-static const Color spnDefColorTable2[] =
+const Color spnDefColorTable2[] =
 {
 /*  0 */    EXC_PALETTE_EGA_COLORS_LIGHT
 };
 
 /** Default color table for BIFF3/BIFF4. */
-static const Color spnDefColorTable3[] =
+const Color spnDefColorTable3[] =
 {
 /*  0 */    EXC_PALETTE_EGA_COLORS_LIGHT,
 /*  8 */    EXC_PALETTE_EGA_COLORS_LIGHT,
@@ -59,7 +59,7 @@ static const Color spnDefColorTable3[] =
 };
 
 /** Default color table for BIFF5/BIFF7. */
-static const Color spnDefColorTable5[] =
+const Color spnDefColorTable5[] =
 {
 /*  0 */    EXC_PALETTE_EGA_COLORS_LIGHT,
 /*  8 */    EXC_PALETTE_EGA_COLORS_LIGHT,
@@ -72,7 +72,7 @@ static const Color spnDefColorTable5[] =
 };
 
 /** Default color table for BIFF8. */
-static const Color spnDefColorTable8[] =
+const Color spnDefColorTable8[] =
 {
 /*  0 */    EXC_PALETTE_EGA_COLORS_LIGHT,
 /*  8 */    EXC_PALETTE_EGA_COLORS_LIGHT,
@@ -821,7 +821,7 @@ struct XclBuiltInFormat
 #define UTF8_KO_SEC     "\354\264\210"
 
 /** Default number format table. Last parent of all other tables, used for unknown languages. */
-static const XclBuiltInFormat spBuiltInFormats_DONTKNOW[] =
+const XclBuiltInFormat spBuiltInFormats_DONTKNOW[] =
 {
     EXC_NUMFMT_OFFSET(   0, NF_NUMBER_STANDARD ),       // General
     EXC_NUMFMT_OFFSET(   1, NF_NUMBER_INT ),            // 0
@@ -914,7 +914,7 @@ static const XclBuiltInFormat spBuiltInFormats_DONTKNOW[] =
 // ENGLISH --------------------------------------------------------------------
 
 /** Base table for English locales. */
-static const XclBuiltInFormat spBuiltInFormats_ENGLISH[] =
+const XclBuiltInFormat spBuiltInFormats_ENGLISH[] =
 {
     EXC_NUMFMT_STRING(  15, "DD-MMM-YY" ),
     EXC_NUMFMT_STRING(  16, "DD-MMM" ),
@@ -925,7 +925,7 @@ static const XclBuiltInFormat spBuiltInFormats_ENGLISH[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_ENGLISH_UK[] =
+const XclBuiltInFormat spBuiltInFormats_ENGLISH_UK[] =
 {
     EXC_NUMFMT_STRING(  63, UTF8_POUND_UK "#,##0;-" UTF8_POUND_UK "#,##0" ),
     EXC_NUMFMT_STRING(  64, UTF8_POUND_UK "#,##0;[RED]-" UTF8_POUND_UK "#,##0" ),
@@ -934,7 +934,7 @@ static const XclBuiltInFormat spBuiltInFormats_ENGLISH_UK[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_ENGLISH_EIRE[] =
+const XclBuiltInFormat spBuiltInFormats_ENGLISH_EIRE[] =
 {
     EXC_NUMFMT_STRING(  63, UTF8_EURO "#,##0;-" UTF8_EURO "#,##0" ),
     EXC_NUMFMT_STRING(  64, UTF8_EURO "#,##0;[RED]-" UTF8_EURO "#,##0" ),
@@ -943,7 +943,7 @@ static const XclBuiltInFormat spBuiltInFormats_ENGLISH_EIRE[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_ENGLISH_US[] =
+const XclBuiltInFormat spBuiltInFormats_ENGLISH_US[] =
 {
     EXC_NUMFMT_STRING(  14, "M/D/YYYY" ),
     EXC_NUMFMT_STRING(  15, "D-MMM-YY" ),
@@ -962,7 +962,7 @@ static const XclBuiltInFormat spBuiltInFormats_ENGLISH_US[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_ENGLISH_CAN[] =
+const XclBuiltInFormat spBuiltInFormats_ENGLISH_CAN[] =
 {
     EXC_NUMFMT_STRING(  20, "h:mm" ),
     EXC_NUMFMT_STRING(  21, "h:mm:ss" ),
@@ -974,7 +974,7 @@ static const XclBuiltInFormat spBuiltInFormats_ENGLISH_CAN[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_ENGLISH_AUS[] =
+const XclBuiltInFormat spBuiltInFormats_ENGLISH_AUS[] =
 {
     EXC_NUMFMT_STRING(  14, "D/MM/YYYY" ),
     EXC_NUMFMT_STRING(  15, "D-MMM-YY" ),
@@ -989,7 +989,7 @@ static const XclBuiltInFormat spBuiltInFormats_ENGLISH_AUS[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_ENGLISH_SAFRICA[] =
+const XclBuiltInFormat spBuiltInFormats_ENGLISH_SAFRICA[] =
 {
     EXC_NUMFMT_STRING(  14, "YYYY/MM/DD" ),
     EXC_NUMFMT_OFFSET(  18, NF_TIME_HHMMAMPM ),
@@ -1005,7 +1005,7 @@ static const XclBuiltInFormat spBuiltInFormats_ENGLISH_SAFRICA[] =
 // FRENCH ---------------------------------------------------------------------
 
 /** Base table for French locales. */
-static const XclBuiltInFormat spBuiltInFormats_FRENCH[] =
+const XclBuiltInFormat spBuiltInFormats_FRENCH[] =
 {
     EXC_NUMFMT_STRING(  15, "DD-MMM-YY" ),
     EXC_NUMFMT_STRING(  16, "DD-MMM" ),
@@ -1015,7 +1015,7 @@ static const XclBuiltInFormat spBuiltInFormats_FRENCH[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_FRENCH_FRANCE[] =
+const XclBuiltInFormat spBuiltInFormats_FRENCH_FRANCE[] =
 {
     EXC_NUMFMT_STRING(  22, "DD/MM/YYYY hh:mm" ),
     EXC_NUMFMT_STRING(  37, "#,##0\\ _" UTF8_EURO ";-#,##0\\ _" UTF8_EURO ),
@@ -1029,7 +1029,7 @@ static const XclBuiltInFormat spBuiltInFormats_FRENCH_FRANCE[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_FRENCH_CANADIAN[] =
+const XclBuiltInFormat spBuiltInFormats_FRENCH_CANADIAN[] =
 {
     EXC_NUMFMT_STRING(  22, "YYYY-MM-DD hh:mm" ),
     EXC_NUMFMT_STRING(  37, "#,##0\\ _$_-;#,##0\\ _$-" ),
@@ -1043,7 +1043,7 @@ static const XclBuiltInFormat spBuiltInFormats_FRENCH_CANADIAN[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_FRENCH_SWISS[] =
+const XclBuiltInFormat spBuiltInFormats_FRENCH_SWISS[] =
 {
     EXC_NUMFMT_STRING(  15, "DD.MMM.YY" ),
     EXC_NUMFMT_STRING(  16, "DD.MMM" ),
@@ -1056,7 +1056,7 @@ static const XclBuiltInFormat spBuiltInFormats_FRENCH_SWISS[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_FRENCH_BELGIAN[] =
+const XclBuiltInFormat spBuiltInFormats_FRENCH_BELGIAN[] =
 {
     EXC_NUMFMT_STRING(  14, "D/MM/YYYY" ),
     EXC_NUMFMT_STRING(  15, "D-MMM-YY" ),
@@ -1070,7 +1070,7 @@ static const XclBuiltInFormat spBuiltInFormats_FRENCH_BELGIAN[] =
 // GERMAN ---------------------------------------------------------------------
 
 /** Base table for German locales. */
-static const XclBuiltInFormat spBuiltInFormats_GERMAN[] =
+const XclBuiltInFormat spBuiltInFormats_GERMAN[] =
 {
     EXC_NUMFMT_STRING(  15, "DD. MMM YY" ),
     EXC_NUMFMT_STRING(  16, "DD. MMM" ),
@@ -1081,7 +1081,7 @@ static const XclBuiltInFormat spBuiltInFormats_GERMAN[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_GERMAN_GERMANY[] =
+const XclBuiltInFormat spBuiltInFormats_GERMAN_GERMANY[] =
 {
     EXC_NUMFMT_STRING(  37, "#,##0 _" UTF8_EURO ";-#,##0 _" UTF8_EURO ),
     EXC_NUMFMT_STRING(  38, "#,##0 _" UTF8_EURO ";[RED]-#,##0 _" UTF8_EURO ),
@@ -1094,7 +1094,7 @@ static const XclBuiltInFormat spBuiltInFormats_GERMAN_GERMANY[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_GERMAN_AUSTRIAN[] =
+const XclBuiltInFormat spBuiltInFormats_GERMAN_AUSTRIAN[] =
 {
     EXC_NUMFMT_STRING(  15, "DD.MMM.YY" ),
     EXC_NUMFMT_STRING(  16, "DD.MMM" ),
@@ -1106,7 +1106,7 @@ static const XclBuiltInFormat spBuiltInFormats_GERMAN_AUSTRIAN[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_GERMAN_SWISS[] =
+const XclBuiltInFormat spBuiltInFormats_GERMAN_SWISS[] =
 {
     EXC_NUMFMT_STRING(  63, "\"SFr. \"#,##0;\"SFr. \"-#,##0" ),
     EXC_NUMFMT_STRING(  64, "\"SFr. \"#,##0;[RED]\"SFr. \"-#,##0" ),
@@ -1115,7 +1115,7 @@ static const XclBuiltInFormat spBuiltInFormats_GERMAN_SWISS[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_GERMAN_LUXEMBOURG[] =
+const XclBuiltInFormat spBuiltInFormats_GERMAN_LUXEMBOURG[] =
 {
     EXC_NUMFMT_STRING(  15, "DD.MMM.YY" ),
     EXC_NUMFMT_STRING(  16, "DD.MMM" ),
@@ -1131,7 +1131,7 @@ static const XclBuiltInFormat spBuiltInFormats_GERMAN_LUXEMBOURG[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_GERMAN_LIECHTENSTEIN[] =
+const XclBuiltInFormat spBuiltInFormats_GERMAN_LIECHTENSTEIN[] =
 {
     EXC_NUMFMT_STRING(  63, "\"CHF \"#,##0;\"CHF \"-#,##0" ),
     EXC_NUMFMT_STRING(  64, "\"CHF \"#,##0;[RED]\"CHF \"-#,##0" ),
@@ -1142,7 +1142,7 @@ static const XclBuiltInFormat spBuiltInFormats_GERMAN_LIECHTENSTEIN[] =
 
 // ITALIAN --------------------------------------------------------------------
 
-static const XclBuiltInFormat spBuiltInFormats_ITALIAN_ITALY[] =
+const XclBuiltInFormat spBuiltInFormats_ITALIAN_ITALY[] =
 {
     EXC_NUMFMT_STRING(  15, "DD-MMM-YY" ),
     EXC_NUMFMT_STRING(  16, "DD-MMM" ),
@@ -1159,7 +1159,7 @@ static const XclBuiltInFormat spBuiltInFormats_ITALIAN_ITALY[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_ITALIAN_SWISS[] =
+const XclBuiltInFormat spBuiltInFormats_ITALIAN_SWISS[] =
 {
     EXC_NUMFMT_STRING(  15, "DD.MMM.YY" ),
     EXC_NUMFMT_STRING(  16, "DD.MMM" ),
@@ -1176,7 +1176,7 @@ static const XclBuiltInFormat spBuiltInFormats_ITALIAN_SWISS[] =
 
 // SWEDISH --------------------------------------------------------------------
 
-static const XclBuiltInFormat spBuiltInFormats_SWEDISH_SWEDEN[] =
+const XclBuiltInFormat spBuiltInFormats_SWEDISH_SWEDEN[] =
 {
     EXC_NUMFMT_STRING(  15, "DD-MMM-YY" ),
     EXC_NUMFMT_STRING(  16, "DD-MMM" ),
@@ -1195,7 +1195,7 @@ static const XclBuiltInFormat spBuiltInFormats_SWEDISH_SWEDEN[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_SWEDISH_FINLAND[] =
+const XclBuiltInFormat spBuiltInFormats_SWEDISH_FINLAND[] =
 {
     EXC_NUMFMT_STRING(   9, "0 %" ),
     EXC_NUMFMT_STRING(  10, "0.00 %" ),
@@ -1219,7 +1219,7 @@ static const XclBuiltInFormat spBuiltInFormats_SWEDISH_FINLAND[] =
 // ASIAN ----------------------------------------------------------------------
 
 /** Base table for Asian locales. */
-static const XclBuiltInFormat spBuiltInFormats_ASIAN[] =
+const XclBuiltInFormat spBuiltInFormats_ASIAN[] =
 {
     EXC_NUMFMT_STRING(  18, "h:mm AM/PM" ),
     EXC_NUMFMT_STRING(  19, "h:mm:ss AM/PM" ),
@@ -1243,7 +1243,7 @@ static const XclBuiltInFormat spBuiltInFormats_ASIAN[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_JAPANESE[] =
+const XclBuiltInFormat spBuiltInFormats_JAPANESE[] =
 {
     EXC_NUMFMT_STRING(  14, "YYYY/M/D" ),
     EXC_NUMFMT_STRING(  15, "D-MMM-YY" ),
@@ -1265,7 +1265,7 @@ static const XclBuiltInFormat spBuiltInFormats_JAPANESE[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_KOREAN[] =
+const XclBuiltInFormat spBuiltInFormats_KOREAN[] =
 {
     EXC_NUMFMT_STRING(  14, "YYYY-MM-DD" ),
     EXC_NUMFMT_STRING(  15, "DD-MMM-YY" ),
@@ -1287,7 +1287,7 @@ static const XclBuiltInFormat spBuiltInFormats_KOREAN[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_CHINESE_SIMPLIFIED[] =
+const XclBuiltInFormat spBuiltInFormats_CHINESE_SIMPLIFIED[] =
 {
     EXC_NUMFMT_STRING(  14, "YYYY-M-D" ),
     EXC_NUMFMT_STRING(  15, "D-MMM-YY" ),
@@ -1311,7 +1311,7 @@ static const XclBuiltInFormat spBuiltInFormats_CHINESE_SIMPLIFIED[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_CHINESE_TRADITIONAL[] =
+const XclBuiltInFormat spBuiltInFormats_CHINESE_TRADITIONAL[] =
 {
     EXC_NUMFMT_STRING(  15, "D-MMM-YY" ),
     EXC_NUMFMT_STRING(  16, "D-MMM" ),
@@ -1342,7 +1342,7 @@ static const XclBuiltInFormat spBuiltInFormats_CHINESE_TRADITIONAL[] =
 
 // OTHER ----------------------------------------------------------------------
 
-static const XclBuiltInFormat spBuiltInFormats_HEBREW[] =
+const XclBuiltInFormat spBuiltInFormats_HEBREW[] =
 {
     EXC_NUMFMT_STRING(  15, "DD-MMMM-YY" ),
     EXC_NUMFMT_STRING(  16, "DD-MMMM" ),
@@ -1356,7 +1356,7 @@ static const XclBuiltInFormat spBuiltInFormats_HEBREW[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-static const XclBuiltInFormat spBuiltInFormats_THAI[] =
+const XclBuiltInFormat spBuiltInFormats_THAI[] =
 {
     EXC_NUMFMT_STRING(  14, "D/M/YYYY" ),
     EXC_NUMFMT_STRING(  15, "D-MMM-YY" ),
@@ -1404,7 +1404,7 @@ struct XclBuiltInFormatTable
     const XclBuiltInFormat* mpFormats;      /// The number format table.
 };
 
-static const XclBuiltInFormatTable spBuiltInFormatTables[] =
+const XclBuiltInFormatTable spBuiltInFormatTables[] =
 {   //  language                        parent language             format table
     {   LANGUAGE_DONTKNOW,              LANGUAGE_NONE,              spBuiltInFormats_DONTKNOW               },
 
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index c069e73963e8..83983bb6bc4b 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -456,10 +456,10 @@ OUString XclTools::GetXclFontName( const OUString& rFontName )
 }
 
 // built-in defined names
-static const char maDefNamePrefix[]    = "Excel_BuiltIn_"; /// Prefix for built-in defined names.
-static const char maDefNamePrefixXml[] = "_xlnm.";         /// Prefix for built-in defined names for OOX
+const char maDefNamePrefix[]    = "Excel_BuiltIn_"; /// Prefix for built-in defined names.
+const char maDefNamePrefixXml[] = "_xlnm.";         /// Prefix for built-in defined names for OOX
 
-static const char* const ppcDefNames[] =
+const char* const ppcDefNames[] =
 {
     "Consolidate_Area",
     "Auto_Open",
@@ -530,10 +530,10 @@ sal_Unicode XclTools::GetBuiltInDefNameIndex( const OUString& rDefName )
 
 // built-in style names
 
-static const char maStyleNamePrefix1[] = "Excel_BuiltIn_";  /// Prefix for built-in cell style names.
-static const char maStyleNamePrefix2[] = "Excel Built-in "; /// Prefix for built-in cell style names from OOX filter.
+const char maStyleNamePrefix1[] = "Excel_BuiltIn_";  /// Prefix for built-in cell style names.
+const char maStyleNamePrefix2[] = "Excel Built-in "; /// Prefix for built-in cell style names from OOX filter.
 
-static const char* const ppcStyleNames[] =
+const char* const ppcStyleNames[] =
 {
     "",                 // "Normal" not used directly, but localized "Default"
     "RowLevel_",        // outline level will be appended
@@ -654,8 +654,8 @@ bool XclTools::GetBuiltInStyleId( sal_uInt8& rnStyleId, sal_uInt8& rnLevel, cons
 
 // conditional formatting style names
 
-static const char maCFStyleNamePrefix1[] = "Excel_CondFormat_"; /// Prefix for cond. formatting style names.
-static const char maCFStyleNamePrefix2[] = "ConditionalStyle_"; /// Prefix for cond. formatting style names from OOX filter.
+const char maCFStyleNamePrefix1[] = "Excel_CondFormat_"; /// Prefix for cond. formatting style names.
+const char maCFStyleNamePrefix2[] = "ConditionalStyle_"; /// Prefix for cond. formatting style names from OOX filter.
 
 OUString XclTools::GetCondFormatStyleName( SCTAB nScTab, sal_Int32 nFormat, sal_uInt16 nCondition )
 {
@@ -694,8 +694,8 @@ void XclTools::SkipSubStream( XclImpStream& rStrm )
 
 // Basic macro names
 
-static const char maSbMacroPrefix[] = "vnd.sun.star.script:";              /// Prefix for StarBasic macros.
-static const char maSbMacroSuffix[] = "?language=Basic&location=document"; /// Suffix for StarBasic macros.
+const char maSbMacroPrefix[] = "vnd.sun.star.script:";              /// Prefix for StarBasic macros.
+const char maSbMacroSuffix[] = "?language=Basic&location=document"; /// Suffix for StarBasic macros.
 
 OUString XclTools::GetSbMacroUrl( const OUString& rMacroName, SfxObjectShell* pDocShell )
 {
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 81f01f3f096d..6f1a3cfbbf36 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -81,11 +81,11 @@
 using ::editeng::SvxBorderLine;
 using namespace ::com::sun::star;
 
-const static char sMyBegComment[]   = "<!-- ";
-const static char sMyEndComment[]   = " -->";
-const static char sDisplay[]        = "display:";
-const static char sBorder[]         = "border:";
-const static char sBackground[]     = "background:";
+const char sMyBegComment[]   = "<!-- ";
+const char sMyEndComment[]   = " -->";
+const char sDisplay[]        = "display:";
+const char sBorder[]         = "border:";
+const char sBackground[]     = "background:";
 
 const sal_uInt16 ScHTMLExport::nDefaultFontSize[SC_HTML_FONTSIZES] =
 {
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index f29c922a26ba..9eb33e8e3308 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -228,7 +228,7 @@ const sal_uInt8 A = BIFF_TOKCLASS_ARR;
 // Note: parameter types of all macro sheet functions (FuncFlags::MACROFUNC/FuncFlags::MACROCMD) untested!
 
 /** Functions new in BIFF2. */
-static const FunctionData saFuncTableBiff2[] =
+const FunctionData saFuncTableBiff2[] =
 {
     { "COUNT",                  "COUNT",                0,      0,      0,  MX, V, { RX }, FuncFlags::NONE },
     { "IF",                     "IF",                   1,      1,      2,  3,  R, { VO, RO }, FuncFlags::NONE },
@@ -382,7 +382,7 @@ static const FunctionData saFuncTableBiff2[] =
 };
 
 /** Functions new in BIFF3. */
-static const FunctionData saFuncTableBiff3[] =
+const FunctionData saFuncTableBiff3[] =
 {
     { "LINEST",                 "LINEST",               49,     49,     1,  4,  A, { RA, RA, VV }, FuncFlags::NONE },             // BIFF2: 1-2, BIFF3: 1-4
     { "TREND",                  "TREND",                50,     50,     1,  4,  A, { RA, RA, RA, VV }, FuncFlags::NONE },             // BIFF2: 1-3, BIFF3: 1-4
@@ -428,7 +428,7 @@ static const FunctionData saFuncTableBiff3[] =
 };
 
 /** Functions new in BIFF4. */
-static const FunctionData saFuncTableBiff4[] =
+const FunctionData saFuncTableBiff4[] =
 {
     { "FIXED",                  "FIXED",                14,     14,     1,  3,  V, { VR }, FuncFlags::NONE },       // BIFF2-3: 1-2, BIFF4: 1-3
     { "RANK",                   "RANK",                 216,    216,    2,  3,  V, { VR, RO, VR }, FuncFlags::NONE },
@@ -603,7 +603,7 @@ static const FunctionData saFuncTableBiff4[] =
 };
 
 /** Functions new in BIFF5/BIFF7. */
-static const FunctionData saFuncTableBiff5[] =
+const FunctionData saFuncTableBiff5[] =
 {
     { "WEEKDAY",                "WEEKDAY",              70,     70,     1,  2,  V, { VR }, FuncFlags::NONE },                              // BIFF2-4: 1,   BIFF5: 1-2
     { "HLOOKUP",                "HLOOKUP",              101,    101,    3,  4,  V, { VV, RO, RO, VV }, FuncFlags::NONE },                     // BIFF2-4: 3,   BIFF5: 3-4
@@ -637,7 +637,7 @@ static const FunctionData saFuncTableBiff5[] =
 };
 
 /** Functions new in BIFF8. */
-static const FunctionData saFuncTableBiff8[] =
+const FunctionData saFuncTableBiff8[] =
 {
     { "GETPIVOTDATA",           "GETPIVOTDATA",         358,    358,    2,  MX, V, { RR, RR, VR, VR }, FuncFlags::IMPORTONLY | FuncFlags::PARAMPAIRS },
     { "HYPERLINK",              "HYPERLINK",            359,    359,    1,  2,  V, { VV, VO }, FuncFlags::NONE },
@@ -664,7 +664,7 @@ static const FunctionData saFuncTableBiff8[] =
 };
 
 /** Functions new in OOXML. */
-static const FunctionData saFuncTableOox[] =
+const FunctionData saFuncTableOox[] =
 {
     { nullptr,                        "CUBEVALUE",            380,    NOID,   1,  MX, V, { VR, RX }, FuncFlags::NONE },
     { nullptr,                        "CUBEMEMBER",           381,    NOID,   2,  3,  V, { VR, RX, VR }, FuncFlags::NONE },
@@ -700,7 +700,7 @@ static const FunctionData saFuncTableOox[] =
     @See sc/source/filter/excel/xlformula.cxx saFuncTable_2010
  */
 /* FIXME: BIFF12 function identifiers available? Where to obtain? */
-static const FunctionData saFuncTable2010[] =
+const FunctionData saFuncTable2010[] =
 {
     { "COM.MICROSOFT.COVARIANCE.P",           "COVARIANCE.P",        NOID,    NOID,   2,  2,  V, { VA }, FuncFlags::MACROCALL_NEW },
     { "COM.MICROSOFT.COVARIANCE.S",           "COVARIANCE.S",        NOID,    NOID,   2,  2,  V, { VA }, FuncFlags::MACROCALL_NEW },
@@ -780,7 +780,7 @@ static const FunctionData saFuncTable2010[] =
     @See sc/source/filter/excel/xlformula.cxx saFuncTable_2013
  */
 /* FIXME: BIFF12 function identifiers available? Where to obtain? */
-static const FunctionData saFuncTable2013[] =
+const FunctionData saFuncTable2013[] =
 {
     { "ACOT",                   "ACOT",                 NOID,   NOID,   1,  1,  V, { VR }, FuncFlags::MACROCALL_NEW },
     { "ACOTH",                  "ACOTH",                NOID,   NOID,   1,  1,  V, { VR }, FuncFlags::MACROCALL_NEW },
@@ -848,7 +848,7 @@ static const FunctionData saFuncTable2013[] =
     @See sc/source/filter/excel/xlformula.cxx saFuncTable_2016
  */
 /* FIXME: BIFF12 function identifiers available? Where to obtain? */
-static const FunctionData saFuncTable2016[] =
+const FunctionData saFuncTable2016[] =
 {
     { "COM.MICROSOFT.FORECAST.ETS",             "FORECAST.ETS",             NOID,   NOID,   3,  6,  V, { VR, VA, VR }, FuncFlags::MACROCALL_NEW },
     { "COM.MICROSOFT.FORECAST.ETS.CONFINT",     "FORECAST.ETS.CONFINT",     NOID,   NOID,   4,  7,  V, { VR, VA, VR }, FuncFlags::MACROCALL_NEW },
@@ -865,14 +865,14 @@ static const FunctionData saFuncTable2016[] =
 
 
 /** Functions defined by OpenFormula, but not supported by Calc or by Excel. */
-static const FunctionData saFuncTableOdf[] =
+const FunctionData saFuncTableOdf[] =
 {
     { "CHISQDIST",              nullptr,                      NOID,   NOID,   2,  3,  V, { VR }, FuncFlags::MACROCALLODF },
     { "CHISQINV",               nullptr,                      NOID,   NOID,   2,  2,  V, { VR }, FuncFlags::MACROCALLODF }
 };
 
 /** Functions defined by Calc, but not in OpenFormula nor supported by Excel. */
-static const FunctionData saFuncTableOOoLO[] =
+const FunctionData saFuncTableOOoLO[] =
 {
     { "ORG.OPENOFFICE.WEEKS",       "ORG.OPENOFFICE.WEEKS",       NOID,   NOID,   3,  3,  V, { VR }, FuncFlags::MACROCALL_NEW | FuncFlags::EXTERNAL },
     { "ORG.OPENOFFICE.MONTHS",      "ORG.OPENOFFICE.MONTHS",      NOID,   NOID,   3,  3,  V, { VR }, FuncFlags::MACROCALL_NEW | FuncFlags::EXTERNAL },
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index c83469de858a..5ca24adb1b42 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -430,7 +430,7 @@ struct BuiltinFormat
 #define UTF8_KO_SEC         "\354\264\210"
 
 /** Default number format table. Last parent of all other tables, used for unknown locales. */
-static const BuiltinFormat spBuiltinFormats_BASE[] =
+const BuiltinFormat spBuiltinFormats_BASE[] =
 {
     // 0..13 numeric and currency formats
     NUMFMT_PREDEF(   0, NUMBER_STANDARD ),          // General
@@ -526,7 +526,7 @@ static const BuiltinFormat spBuiltinFormats_BASE[] =
 };
 
 /** Arabic, U.A.E. */
-static const BuiltinFormat spBuiltinFormats_ar_AE[] =
+const BuiltinFormat spBuiltinFormats_ar_AE[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_NUMBER_MINUS( "\"" UTF8_CURR_AR_AE "\"", " " ),
@@ -534,7 +534,7 @@ static const BuiltinFormat spBuiltinFormats_ar_AE[] =
 };
 
 /** Arabic, Bahrain. */
-static const BuiltinFormat spBuiltinFormats_ar_BH[] =
+const BuiltinFormat spBuiltinFormats_ar_BH[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_NUMBER_MINUS( "\"" UTF8_CURR_AR_BH "\"", " " ),
@@ -542,7 +542,7 @@ static const BuiltinFormat spBuiltinFormats_ar_BH[] =
 };
 
 /** Arabic, Algeria. */
-static const BuiltinFormat spBuiltinFormats_ar_DZ[] =
+const BuiltinFormat spBuiltinFormats_ar_DZ[] =
 {
     NUMFMT_ALLDATETIMES( "DD-MM-YYYY", "DD", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_NUMBER_MINUS( "\"" UTF8_CURR_AR_DZ "\"", " " ),
@@ -550,7 +550,7 @@ static const BuiltinFormat spBuiltinFormats_ar_DZ[] =
 };
 
 /** Arabic, Egypt. */
-static const BuiltinFormat spBuiltinFormats_ar_EG[] =
+const BuiltinFormat spBuiltinFormats_ar_EG[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_NUMBER_MINUS( "\"" UTF8_CURR_AR_EG "\"", " " ),
@@ -558,7 +558,7 @@ static const BuiltinFormat spBuiltinFormats_ar_EG[] =
 };
 
 /** Arabic, Iraq. */
-static const BuiltinFormat spBuiltinFormats_ar_IQ[] =
+const BuiltinFormat spBuiltinFormats_ar_IQ[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_NUMBER_MINUS( "\"" UTF8_CURR_AR_IQ "\"", " " ),
@@ -566,7 +566,7 @@ static const BuiltinFormat spBuiltinFormats_ar_IQ[] =
 };
 
 /** Arabic, Jordan. */
-static const BuiltinFormat spBuiltinFormats_ar_JO[] =
+const BuiltinFormat spBuiltinFormats_ar_JO[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_NUMBER_MINUS( "\"" UTF8_CURR_AR_JO "\"", " " ),
@@ -574,7 +574,7 @@ static const BuiltinFormat spBuiltinFormats_ar_JO[] =
 };
 
 /** Arabic, Kuwait. */
-static const BuiltinFormat spBuiltinFormats_ar_KW[] =
+const BuiltinFormat spBuiltinFormats_ar_KW[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_NUMBER_MINUS( "\"" UTF8_CURR_AR_KW "\"", " " ),
@@ -582,7 +582,7 @@ static const BuiltinFormat spBuiltinFormats_ar_KW[] =
 };
 
 /** Arabic, Lebanon. */
-static const BuiltinFormat spBuiltinFormats_ar_LB[] =
+const BuiltinFormat spBuiltinFormats_ar_LB[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_NUMBER_MINUS( "\"" UTF8_CURR_AR_LB "\"", " " ),
@@ -590,7 +590,7 @@ static const BuiltinFormat spBuiltinFormats_ar_LB[] =
 };
 
 /** Arabic, Libya. */
-static const BuiltinFormat spBuiltinFormats_ar_LY[] =
+const BuiltinFormat spBuiltinFormats_ar_LY[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_NUMBER_MINUS( "\"" UTF8_CURR_AR_LY "\"", " " ),
@@ -598,7 +598,7 @@ static const BuiltinFormat spBuiltinFormats_ar_LY[] =
 };
 
 /** Arabic, Morocco. */
-static const BuiltinFormat spBuiltinFormats_ar_MA[] =
+const BuiltinFormat spBuiltinFormats_ar_MA[] =
 {
     NUMFMT_ALLDATETIMES( "DD-MM-YYYY", "DD", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_NUMBER_MINUS( "\"" UTF8_CURR_AR_MA "\"", " " ),
@@ -606,7 +606,7 @@ static const BuiltinFormat spBuiltinFormats_ar_MA[] =
 };
 
 /** Arabic, Oman. */
-static const BuiltinFormat spBuiltinFormats_ar_OM[] =
+const BuiltinFormat spBuiltinFormats_ar_OM[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_NUMBER_MINUS( "\"" UTF8_CURR_AR_OM "\"", " " ),
@@ -614,7 +614,7 @@ static const BuiltinFormat spBuiltinFormats_ar_OM[] =
 };
 
 /** Arabic, Qatar. */
-static const BuiltinFormat spBuiltinFormats_ar_QA[] =
+const BuiltinFormat spBuiltinFormats_ar_QA[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_NUMBER_MINUS( "\"" UTF8_CURR_AR_QA "\"", " " ),
@@ -622,7 +622,7 @@ static const BuiltinFormat spBuiltinFormats_ar_QA[] =
 };
 
 /** Arabic, Saudi Arabia. */
-static const BuiltinFormat spBuiltinFormats_ar_SA[] =
+const BuiltinFormat spBuiltinFormats_ar_SA[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_NUMBER_MINUS( "\"" UTF8_CURR_AR_SA "\"", " " ),
@@ -630,7 +630,7 @@ static const BuiltinFormat spBuiltinFormats_ar_SA[] =
 };
 
 /** Arabic, Syria. */
-static const BuiltinFormat spBuiltinFormats_ar_SY[] =
+const BuiltinFormat spBuiltinFormats_ar_SY[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_NUMBER_MINUS( "\"" UTF8_CURR_AR_SY "\"", " " ),
@@ -638,7 +638,7 @@ static const BuiltinFormat spBuiltinFormats_ar_SY[] =
 };
 
 /** Arabic, Tunisia. */
-static const BuiltinFormat spBuiltinFormats_ar_TN[] =
+const BuiltinFormat spBuiltinFormats_ar_TN[] =
 {
     NUMFMT_ALLDATETIMES( "DD-MM-YYYY", "DD", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_NUMBER_MINUS( "\"" UTF8_CURR_AR_TN "\"", " " ),
@@ -646,7 +646,7 @@ static const BuiltinFormat spBuiltinFormats_ar_TN[] =
 };
 
 /** Arabic, Yemen. */
-static const BuiltinFormat spBuiltinFormats_ar_YE[] =
+const BuiltinFormat spBuiltinFormats_ar_YE[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_NUMBER_MINUS( "\"" UTF8_CURR_AR_YE "\"", " " ),
@@ -654,7 +654,7 @@ static const BuiltinFormat spBuiltinFormats_ar_YE[] =
 };
 
 /** Belarusian, Belarus. */
-static const BuiltinFormat spBuiltinFormats_be_BY[] =
+const BuiltinFormat spBuiltinFormats_be_BY[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_ALLDATETIMES( "DD.MM.YYYY", "DD", ".", "MMM", ".", "YY", "h", "h" ),
@@ -663,7 +663,7 @@ static const BuiltinFormat spBuiltinFormats_be_BY[] =
 };
 
 /** Bulgarian, Bulgaria. */
-static const BuiltinFormat spBuiltinFormats_bg_BG[] =
+const BuiltinFormat spBuiltinFormats_bg_BG[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_ALLDATETIMES( "DD.M.YYYY", "DD", ".", "MMM", ".", "YY", "h", "hh" ),
@@ -672,7 +672,7 @@ static const BuiltinFormat spBuiltinFormats_bg_BG[] =
 };
 
 /** Bengali, India. */
-static const BuiltinFormat spBuiltinFormats_bn_IN[] =
+const BuiltinFormat spBuiltinFormats_bn_IN[] =
 {
     NUMFMT_ALLDATETIMES( "DD-MM-YY", "DD", "-", "MMM", "-", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( "\"" UTF8_CURR_BN_IN "\"", " " ),
@@ -680,7 +680,7 @@ static const BuiltinFormat spBuiltinFormats_bn_IN[] =
 };
 
 /** Czech, Czech Republic. */
-static const BuiltinFormat spBuiltinFormats_cs_CZ[] =
+const BuiltinFormat spBuiltinFormats_cs_CZ[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_ALLDATETIMES( "D.M.YYYY", "D", ".", "MMM", ".", "YY", "h", "h" ),
@@ -689,7 +689,7 @@ static const BuiltinFormat spBuiltinFormats_cs_CZ[] =
 };
 
 /** Danish, Denmark. */
-static const BuiltinFormat spBuiltinFormats_da_DK[] =
+const BuiltinFormat spBuiltinFormats_da_DK[] =
 {
     NUMFMT_ALLDATETIMES( "DD-MM-YYYY", "DD", "-", "MMM", "-", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( "\"kr\"", " " ),
@@ -697,7 +697,7 @@ static const BuiltinFormat spBuiltinFormats_da_DK[] =
 };
 
 /** German, Austria. */
-static const BuiltinFormat spBuiltinFormats_de_AT[] =
+const BuiltinFormat spBuiltinFormats_de_AT[] =
 {
     NUMFMT_ALLDATETIMES( "DD.MM.YYYY", "DD", ".", "MMM", ".", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_MINUS_SYMBOL_NUMBER( UTF8_EURO, " " ),
@@ -705,7 +705,7 @@ static const BuiltinFormat spBuiltinFormats_de_AT[] =
 };
 
 /** German, Switzerland. */
-static const BuiltinFormat spBuiltinFormats_de_CH[] =
+const BuiltinFormat spBuiltinFormats_de_CH[] =
 {
     NUMFMT_ALLDATETIMES( "DD.MM.YYYY", "DD", ". ", "MMM", " ", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( "\"SFr.\"", " " ),
@@ -713,7 +713,7 @@ static const BuiltinFormat spBuiltinFormats_de_CH[] =
 };
 
 /** German, Germany. */
-static const BuiltinFormat spBuiltinFormats_de_DE[] =
+const BuiltinFormat spBuiltinFormats_de_DE[] =
 {
     NUMFMT_ALLDATETIMES( "DD.MM.YYYY", "DD", ". ", "MMM", " ", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_MINUS_NUMBER_SYMBOL( UTF8_EURO, "_" UTF8_EURO, " " ),
@@ -721,7 +721,7 @@ static const BuiltinFormat spBuiltinFormats_de_DE[] =
 };
 
 /** German, Liechtenstein. */
-static const BuiltinFormat spBuiltinFormats_de_LI[] =
+const BuiltinFormat spBuiltinFormats_de_LI[] =
 {
     NUMFMT_ALLDATETIMES( "DD.MM.YYYY", "DD", ". ", "MMM", " ", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( "\"CHF\"", " " ),
@@ -729,7 +729,7 @@ static const BuiltinFormat spBuiltinFormats_de_LI[] =
 };
 
 /** German, Luxembourg. */
-static const BuiltinFormat spBuiltinFormats_de_LU[] =
+const BuiltinFormat spBuiltinFormats_de_LU[] =
 {
     NUMFMT_ALLDATETIMES( "DD.MM.YYYY", "DD", ".", "MMM", ".", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_MINUS_NUMBER_SYMBOL( UTF8_EURO, "_" UTF8_EURO, " " ),
@@ -737,7 +737,7 @@ static const BuiltinFormat spBuiltinFormats_de_LU[] =
 };
 
 /** Divehi, Maldives. */
-static const BuiltinFormat spBuiltinFormats_div_MV[] =
+const BuiltinFormat spBuiltinFormats_div_MV[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YY", "DD", "-", "MMM", "-", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_NUMBER_SYMBOL_MINUS( "\"" UTF8_RUFIYAA ".\"", "_" UTF8_RUFIYAA "_.", " " ),
@@ -745,7 +745,7 @@ static const BuiltinFormat spBuiltinFormats_div_MV[] =
 };
 
 /** Greek, Greece. */
-static const BuiltinFormat spBuiltinFormats_el_GR[] =
+const BuiltinFormat spBuiltinFormats_el_GR[] =
 {
     NUMFMT_ALLDATETIMES( "D/M/YYYY", "D", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_NUMBER_SYMBOL( UTF8_EURO, "_" UTF8_EURO, " " ),
@@ -753,7 +753,7 @@ static const BuiltinFormat spBuiltinFormats_el_GR[] =
 };
 
 /** English, Australia. */
-static const BuiltinFormat spBuiltinFormats_en_AU[] =
+const BuiltinFormat spBuiltinFormats_en_AU[] =
 {
     NUMFMT_ALLDATETIMES( "D/MM/YYYY", "D", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_SYMBOL_NUMBER( "$", "" ),
@@ -761,7 +761,7 @@ static const BuiltinFormat spBuiltinFormats_en_AU[] =
 };
 
 /** English, Belize. */
-static const BuiltinFormat spBuiltinFormats_en_BZ[] =
+const BuiltinFormat spBuiltinFormats_en_BZ[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "\"BZ$\"", "" ),
@@ -769,7 +769,7 @@ static const BuiltinFormat spBuiltinFormats_en_BZ[] =
 };
 
 /** English, Canada. */
-static const BuiltinFormat spBuiltinFormats_en_CA[] =
+const BuiltinFormat spBuiltinFormats_en_CA[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_SYMBOL_NUMBER( "$", "" ),
@@ -777,7 +777,7 @@ static const BuiltinFormat spBuiltinFormats_en_CA[] =
 };
 
 /** English, Caribbean. */
-static const BuiltinFormat spBuiltinFormats_en_CB[] =
+const BuiltinFormat spBuiltinFormats_en_CB[] =
 {
     NUMFMT_ALLDATETIMES( "MM/DD/YYYY", "DD", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_SYMBOL_NUMBER( "$", "" ),
@@ -785,7 +785,7 @@ static const BuiltinFormat spBuiltinFormats_en_CB[] =
 };
 
 /** English, United Kingdom. */
-static const BuiltinFormat spBuiltinFormats_en_GB[] =
+const BuiltinFormat spBuiltinFormats_en_GB[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_MINUS_SYMBOL_NUMBER( UTF8_POUND_GB, "" ),
@@ -793,7 +793,7 @@ static const BuiltinFormat spBuiltinFormats_en_GB[] =
 };
 
 /** English, Ireland. */
-static const BuiltinFormat spBuiltinFormats_en_IE[] =
+const BuiltinFormat spBuiltinFormats_en_IE[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_MINUS_SYMBOL_NUMBER( UTF8_EURO, "" ),
@@ -801,7 +801,7 @@ static const BuiltinFormat spBuiltinFormats_en_IE[] =
 };
 
 /** English, Jamaica. */
-static const BuiltinFormat spBuiltinFormats_en_JM[] =
+const BuiltinFormat spBuiltinFormats_en_JM[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_MINUS_SYMBOL_NUMBER( "\"J$\"", "" ),
@@ -809,7 +809,7 @@ static const BuiltinFormat spBuiltinFormats_en_JM[] =
 };
 
 /** English, New Zealand. */
-static const BuiltinFormat spBuiltinFormats_en_NZ[] =
+const BuiltinFormat spBuiltinFormats_en_NZ[] =
 {
     NUMFMT_ALLDATETIMES( "D/MM/YYYY", "D", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_SYMBOL_NUMBER( "$", "" ),
@@ -817,7 +817,7 @@ static const BuiltinFormat spBuiltinFormats_en_NZ[] =
 };
 
 /** English, Philippines. */
-static const BuiltinFormat spBuiltinFormats_en_PH[] =
+const BuiltinFormat spBuiltinFormats_en_PH[] =
 {
     NUMFMT_ALLDATETIMES( "M/D/YYYY", "D", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "\"Php\"", "" ),
@@ -825,7 +825,7 @@ static const BuiltinFormat spBuiltinFormats_en_PH[] =
 };
 
 /** English, Trinidad and Tobago. */
-static const BuiltinFormat spBuiltinFormats_en_TT[] =
+const BuiltinFormat spBuiltinFormats_en_TT[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "\"TT$\"", "" ),
@@ -833,7 +833,7 @@ static const BuiltinFormat spBuiltinFormats_en_TT[] =
 };
 
 /** English, USA. */
-static const BuiltinFormat spBuiltinFormats_en_US[] =
+const BuiltinFormat spBuiltinFormats_en_US[] =
 {
     NUMFMT_ALLDATETIMES( "M/D/YYYY", "D", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "$", "" ),
@@ -841,7 +841,7 @@ static const BuiltinFormat spBuiltinFormats_en_US[] =
 };
 
 /** English, South Africa. */
-static const BuiltinFormat spBuiltinFormats_en_ZA[] =
+const BuiltinFormat spBuiltinFormats_en_ZA[] =
 {
     NUMFMT_ALLDATETIMES( "YYYY/MM/DD", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( "\\R", " " ),
@@ -849,7 +849,7 @@ static const BuiltinFormat spBuiltinFormats_en_ZA[] =
 };
 
 /** English, Zimbabwe. */
-static const BuiltinFormat spBuiltinFormats_en_ZW[] =
+const BuiltinFormat spBuiltinFormats_en_ZW[] =
 {
     NUMFMT_ALLDATETIMES( "M/D/YYYY", "D", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "\"Z$\"", "" ),
@@ -857,7 +857,7 @@ static const BuiltinFormat spBuiltinFormats_en_ZW[] =
 };
 
 /** Spanish, Argentina. */
-static const BuiltinFormat spBuiltinFormats_es_AR[] =
+const BuiltinFormat spBuiltinFormats_es_AR[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( "$", " " ),
@@ -865,7 +865,7 @@ static const BuiltinFormat spBuiltinFormats_es_AR[] =
 };
 
 /** Spanish, Bolivia. */
-static const BuiltinFormat spBuiltinFormats_es_BO[] =
+const BuiltinFormat spBuiltinFormats_es_BO[] =
 {
     // slashes must be quoted to prevent conversion to minus
     NUMFMT_ALLDATETIMES( "DD\\/MM\\/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
@@ -874,7 +874,7 @@ static const BuiltinFormat spBuiltinFormats_es_BO[] =
 };
 
 /** Spanish, Chile. */
-static const BuiltinFormat spBuiltinFormats_es_CL[] =
+const BuiltinFormat spBuiltinFormats_es_CL[] =
 {
     NUMFMT_ALLDATETIMES( "DD-MM-YYYY", "DD", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_SYMBOL_NUMBER( "$", " " ),
@@ -882,7 +882,7 @@ static const BuiltinFormat spBuiltinFormats_es_CL[] =
 };
 
 /** Spanish, Colombia. */
-static const BuiltinFormat spBuiltinFormats_es_CO[] =
+const BuiltinFormat spBuiltinFormats_es_CO[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "$", " " ),
@@ -890,7 +890,7 @@ static const BuiltinFormat spBuiltinFormats_es_CO[] =
 };
 
 /** Spanish, Costa Rica. */
-static const BuiltinFormat spBuiltinFormats_es_CR[] =
+const BuiltinFormat spBuiltinFormats_es_CR[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( UTF8_COLON, "" ),
@@ -898,7 +898,7 @@ static const BuiltinFormat spBuiltinFormats_es_CR[] =
 };
 
 /** Spanish, Dominican Republic. */
-static const BuiltinFormat spBuiltinFormats_es_DO[] =
+const BuiltinFormat spBuiltinFormats_es_DO[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "\"RD$\"", "" ),
@@ -906,7 +906,7 @@ static const BuiltinFormat spBuiltinFormats_es_DO[] =
 };
 
 /** Spanish, Ecuador. */
-static const BuiltinFormat spBuiltinFormats_es_EC[] =
+const BuiltinFormat spBuiltinFormats_es_EC[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "$", " " ),
@@ -914,7 +914,7 @@ static const BuiltinFormat spBuiltinFormats_es_EC[] =
 };
 
 /** Spanish, Spain. */
-static const BuiltinFormat spBuiltinFormats_es_ES[] =
+const BuiltinFormat spBuiltinFormats_es_ES[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_NUMBER_SYMBOL( UTF8_EURO, "_" UTF8_EURO, " " ),
@@ -922,7 +922,7 @@ static const BuiltinFormat spBuiltinFormats_es_ES[] =
 };
 
 /** Spanish, Guatemala. */
-static const BuiltinFormat spBuiltinFormats_es_GT[] =
+const BuiltinFormat spBuiltinFormats_es_GT[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "\\Q", "" ),
@@ -930,7 +930,7 @@ static const BuiltinFormat spBuiltinFormats_es_GT[] =
 };
 
 /** Spanish, Honduras. */
-static const BuiltinFormat spBuiltinFormats_es_HN[] =
+const BuiltinFormat spBuiltinFormats_es_HN[] =
 {
     // slashes must be quoted to prevent conversion to minus
     NUMFMT_ALLDATETIMES( "DD\\/MM\\/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
@@ -939,7 +939,7 @@ static const BuiltinFormat spBuiltinFormats_es_HN[] =
 };
 
 /** Spanish, Mexico. */
-static const BuiltinFormat spBuiltinFormats_es_MX[] =
+const BuiltinFormat spBuiltinFormats_es_MX[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_MINUS_SYMBOL_NUMBER( "$", "" ),
@@ -947,7 +947,7 @@ static const BuiltinFormat spBuiltinFormats_es_MX[] =
 };
 
 /** Spanish, Nicaragua. */
-static const BuiltinFormat spBuiltinFormats_es_NI[] =
+const BuiltinFormat spBuiltinFormats_es_NI[] =
 {
     // slashes must be quoted to prevent conversion to minus
     NUMFMT_ALLDATETIMES( "DD\\/MM\\/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
@@ -956,7 +956,7 @@ static const BuiltinFormat spBuiltinFormats_es_NI[] =
 };
 
 /** Spanish, Panama. */
-static const BuiltinFormat spBuiltinFormats_es_PA[] =
+const BuiltinFormat spBuiltinFormats_es_PA[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "\"B/.\"", " " ),
@@ -964,7 +964,7 @@ static const BuiltinFormat spBuiltinFormats_es_PA[] =
 };
 
 /** Spanish, Peru. */
-static const BuiltinFormat spBuiltinFormats_es_PE[] =
+const BuiltinFormat spBuiltinFormats_es_PE[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( "\"S/.\"", " " ),
@@ -972,7 +972,7 @@ static const BuiltinFormat spBuiltinFormats_es_PE[] =
 };
 
 /** Spanish, Puerto Rico. */
-static const BuiltinFormat spBuiltinFormats_es_PR[] =
+const BuiltinFormat spBuiltinFormats_es_PR[] =
 {
     // slashes must be quoted to prevent conversion to minus
     NUMFMT_ALLDATETIMES( "DD\\/MM\\/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
@@ -981,7 +981,7 @@ static const BuiltinFormat spBuiltinFormats_es_PR[] =
 };
 
 /** Spanish, Paraguay. */
-static const BuiltinFormat spBuiltinFormats_es_PY[] =
+const BuiltinFormat spBuiltinFormats_es_PY[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "\"Gs\"", " " ),
@@ -989,7 +989,7 @@ static const BuiltinFormat spBuiltinFormats_es_PY[] =
 };
 
 /** Spanish, El Salvador. */
-static const BuiltinFormat spBuiltinFormats_es_SV[] =
+const BuiltinFormat spBuiltinFormats_es_SV[] =
 {
     // slashes must be quoted to prevent conversion to minus
     NUMFMT_ALLDATETIMES( "DD\\/MM\\/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
@@ -998,7 +998,7 @@ static const BuiltinFormat spBuiltinFormats_es_SV[] =
 };
 
 /** Spanish, Uruguay. */
-static const BuiltinFormat spBuiltinFormats_es_UY[] =
+const BuiltinFormat spBuiltinFormats_es_UY[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "\"$U\"", " " ),
@@ -1006,7 +1006,7 @@ static const BuiltinFormat spBuiltinFormats_es_UY[] =
 };
 
 /** Spanish, Venezuela. */
-static const BuiltinFormat spBuiltinFormats_es_VE[] =
+const BuiltinFormat spBuiltinFormats_es_VE[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( "Bs", " " ),
@@ -1014,7 +1014,7 @@ static const BuiltinFormat spBuiltinFormats_es_VE[] =
 };
 
 /** Estonian, Estonia. */
-static const BuiltinFormat spBuiltinFormats_et_EE[] =
+const BuiltinFormat spBuiltinFormats_et_EE[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_ALLDATETIMES( "D.MM.YYYY", "D", ".", "MMM", ".", "YY", "h", "h" ),
@@ -1023,7 +1023,7 @@ static const BuiltinFormat spBuiltinFormats_et_EE[] =
 };
 
 /** Farsi, Iran. */
-static const BuiltinFormat spBuiltinFormats_fa_IR[] =
+const BuiltinFormat spBuiltinFormats_fa_IR[] =
 {
     NUMFMT_ALLDATETIMES( "YYYY/MM/DD", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_NUMBER_MINUS( "\"" UTF8_CURR_FA_IR "\"", " " ),
@@ -1031,7 +1031,7 @@ static const BuiltinFormat spBuiltinFormats_fa_IR[] =
 };
 
 /** Finnish, Finland. */
-static const BuiltinFormat spBuiltinFormats_fi_FI[] =
+const BuiltinFormat spBuiltinFormats_fi_FI[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_STRING(  9, "0\\ %" ),
@@ -1042,7 +1042,7 @@ static const BuiltinFormat spBuiltinFormats_fi_FI[] =
 };
 
 /** Faroese, Faroe Islands. */
-static const BuiltinFormat spBuiltinFormats_fo_FO[] =
+const BuiltinFormat spBuiltinFormats_fo_FO[] =
 {
     NUMFMT_ALLDATETIMES( "DD-MM-YYYY", "DD", "-", "MMM", "-", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( "\"kr\"", " " ),
@@ -1050,7 +1050,7 @@ static const BuiltinFormat spBuiltinFormats_fo_FO[] =
 };
 
 /** French, Belgium. */
-static const BuiltinFormat spBuiltinFormats_fr_BE[] =
+const BuiltinFormat spBuiltinFormats_fr_BE[] =
 {
     NUMFMT_ALLDATETIMES( "D/MM/YYYY", "D", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_NUMBER_SYMBOL( UTF8_EURO, "_" UTF8_EURO, " " ),
@@ -1058,7 +1058,7 @@ static const BuiltinFormat spBuiltinFormats_fr_BE[] =
 };
 
 /** French, Canada. */
-static const BuiltinFormat spBuiltinFormats_fr_CA[] =
+const BuiltinFormat spBuiltinFormats_fr_CA[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_ALLDATETIMES( "YYYY-MM-DD", "DD", "-", "MMM", "-", "YY", "h", "hh" ),
@@ -1067,7 +1067,7 @@ static const BuiltinFormat spBuiltinFormats_fr_CA[] =
 };
 
 /** French, Switzerland. */
-static const BuiltinFormat spBuiltinFormats_fr_CH[] =
+const BuiltinFormat spBuiltinFormats_fr_CH[] =
 {
     NUMFMT_ALLDATETIMES( "DD.MM.YYYY", "DD", ".", "MMM", ".", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( "\"SFr.\"", " " ),
@@ -1075,7 +1075,7 @@ static const BuiltinFormat spBuiltinFormats_fr_CH[] =
 };
 
 /** French, France. */
-static const BuiltinFormat spBuiltinFormats_fr_FR[] =
+const BuiltinFormat spBuiltinFormats_fr_FR[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "h", "hh" ),
@@ -1084,7 +1084,7 @@ static const BuiltinFormat spBuiltinFormats_fr_FR[] =
 };
 
 /** French, Luxembourg. */
-static const BuiltinFormat spBuiltinFormats_fr_LU[] =
+const BuiltinFormat spBuiltinFormats_fr_LU[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "h", "hh" ),
@@ -1093,7 +1093,7 @@ static const BuiltinFormat spBuiltinFormats_fr_LU[] =
 };
 
 /** French, Monaco. */
-static const BuiltinFormat spBuiltinFormats_fr_MC[] =
+const BuiltinFormat spBuiltinFormats_fr_MC[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "h", "hh" ),
@@ -1102,7 +1102,7 @@ static const BuiltinFormat spBuiltinFormats_fr_MC[] =
 };
 
 /** Galizian, Spain. */
-static const BuiltinFormat spBuiltinFormats_gl_ES[] =
+const BuiltinFormat spBuiltinFormats_gl_ES[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YY", "DD", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_SYMBOL_NUMBER( UTF8_EURO, " " ),
@@ -1110,7 +1110,7 @@ static const BuiltinFormat spBuiltinFormats_gl_ES[] =
 };
 
 /** Gujarati, India. */
-static const BuiltinFormat spBuiltinFormats_gu_IN[] =
+const BuiltinFormat spBuiltinFormats_gu_IN[] =
 {
     NUMFMT_ALLDATETIMES( "DD-MM-YY", "DD", "-", "MMM", "-", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( "\"" UTF8_CURR_GU_IN "\"", " " ),
@@ -1118,7 +1118,7 @@ static const BuiltinFormat spBuiltinFormats_gu_IN[] =
 };
 
 /** Hebrew, Israel. */
-static const BuiltinFormat spBuiltinFormats_he_IL[] =
+const BuiltinFormat spBuiltinFormats_he_IL[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( UTF8_SHEQEL, " " ),
@@ -1126,7 +1126,7 @@ static const BuiltinFormat spBuiltinFormats_he_IL[] =
 };
 
 /** Hindi, India. */
-static const BuiltinFormat spBuiltinFormats_hi_IN[] =
+const BuiltinFormat spBuiltinFormats_hi_IN[] =
 {
     NUMFMT_ALLDATETIMES( "DD-MM-YYYY", "DD", "-", "MMM", "-", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( "\"" UTF8_CURR_HI_IN "\"", " " ),
@@ -1134,7 +1134,7 @@ static const BuiltinFormat spBuiltinFormats_hi_IN[] =
 };
 
 /** Croatian, Bosnia and Herzegowina. */
-static const BuiltinFormat spBuiltinFormats_hr_BA[] =
+const BuiltinFormat spBuiltinFormats_hr_BA[] =
 {
     NUMFMT_ALLDATETIMES( "D.M.YYYY", "D", ".", "MMM", ".", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_NUMBER_SYMBOL( "\"KM\"", "_K_M", " " ),
@@ -1142,7 +1142,7 @@ static const BuiltinFormat spBuiltinFormats_hr_BA[] =
 };
 
 /** Croatian, Croatia. */
-static const BuiltinFormat spBuiltinFormats_hr_HR[] =
+const BuiltinFormat spBuiltinFormats_hr_HR[] =
 {
     NUMFMT_ALLDATETIMES( "D.M.YYYY", "D", ".", "MMM", ".", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_NUMBER_SYMBOL( "\"kn\"", "_k_n", " " ),
@@ -1150,7 +1150,7 @@ static const BuiltinFormat spBuiltinFormats_hr_HR[] =
 };
 
 /** Hungarian, Hungary. */
-static const BuiltinFormat spBuiltinFormats_hu_HU[] =
+const BuiltinFormat spBuiltinFormats_hu_HU[] =
 {
     // space character is group separator, literal spaces must be quoted
     // MMM is rendered differently in Calc and Excel (see #i41488#)
@@ -1160,7 +1160,7 @@ static const BuiltinFormat spBuiltinFormats_hu_HU[] =
 };
 
 /** Armenian, Armenia. */
-static const BuiltinFormat spBuiltinFormats_hy_AM[] =
+const BuiltinFormat spBuiltinFormats_hy_AM[] =
 {
     NUMFMT_ALLDATETIMES( "DD.MM.YYYY", "DD", ".", "MMM", ".", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_NUMBER_SYMBOL( "\"" UTF8_HY_DA_LC UTF8_HY_REH_LC ".\"", "_" UTF8_HY_DA_LC "_" UTF8_HY_REH_LC "_.", " " ),
@@ -1168,7 +1168,7 @@ static const BuiltinFormat spBuiltinFormats_hy_AM[] =
 };
 
 /** Indonesian, Indonesia. */
-static const BuiltinFormat spBuiltinFormats_id_ID[] =
+const BuiltinFormat spBuiltinFormats_id_ID[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "\"Rp\"", "" ),
@@ -1176,7 +1176,7 @@ static const BuiltinFormat spBuiltinFormats_id_ID[] =
 };
 
 /** Icelandic, Iceland. */
-static const BuiltinFormat spBuiltinFormats_is_IS[] =
+const BuiltinFormat spBuiltinFormats_is_IS[] =
 {
     NUMFMT_ALLDATETIMES( "D.M.YYYY", "D", ".", "MMM", ".", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_MINUS_NUMBER_SYMBOL( "\"kr.\"", "_k_r_.", " " ),
@@ -1184,7 +1184,7 @@ static const BuiltinFormat spBuiltinFormats_is_IS[] =
 };
 
 /** Italian, Switzerland. */
-static const BuiltinFormat spBuiltinFormats_it_CH[] =
+const BuiltinFormat spBuiltinFormats_it_CH[] =
 {
     NUMFMT_ALLDATETIMES( "DD.MM.YYYY", "DD", ".", "MMM", ".", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( "\"SFr.\"", " " ),
@@ -1192,7 +1192,7 @@ static const BuiltinFormat spBuiltinFormats_it_CH[] =
 };
 
 /** Italian, Italy. */
-static const BuiltinFormat spBuiltinFormats_it_IT[] =
+const BuiltinFormat spBuiltinFormats_it_IT[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_SYMBOL_NUMBER( UTF8_EURO, " " ),
@@ -1200,7 +1200,7 @@ static const BuiltinFormat spBuiltinFormats_it_IT[] =
 };
 
 /** Georgian, Georgia. */
-static const BuiltinFormat spBuiltinFormats_ka_GE[] =
+const BuiltinFormat spBuiltinFormats_ka_GE[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_ALLDATETIMES( "DD.MM.YYYY", "DD", ".", "MMM", ".", "YY", "h", "h" ),
@@ -1209,7 +1209,7 @@ static const BuiltinFormat spBuiltinFormats_ka_GE[] =
 };
 
 /** Kazakh, Kazakhstan. */
-static const BuiltinFormat spBuiltinFormats_kk_KZ[] =
+const BuiltinFormat spBuiltinFormats_kk_KZ[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_ALLDATETIMES( "DD.MM.YYYY", "DD", ".", "MMM", ".", "YY", "h", "h" ),
@@ -1218,7 +1218,7 @@ static const BuiltinFormat spBuiltinFormats_kk_KZ[] =
 };
 
 /** Kannada, India. */
-static const BuiltinFormat spBuiltinFormats_kn_IN[] =
+const BuiltinFormat spBuiltinFormats_kn_IN[] =
 {
     NUMFMT_ALLDATETIMES( "DD-MM-YY", "DD", "-", "MMM", "-", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( "\"" UTF8_CURR_KN_IN "\"", " " ),
@@ -1226,7 +1226,7 @@ static const BuiltinFormat spBuiltinFormats_kn_IN[] =
 };
 
 /** Kyrgyz, Kyrgyzstan. */
-static const BuiltinFormat spBuiltinFormats_ky_KG[] =
+const BuiltinFormat spBuiltinFormats_ky_KG[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_ALLDATETIMES( "DD.MM.YY", "DD", ".", "MMM", ".", "YY", "h", "h" ),
@@ -1235,7 +1235,7 @@ static const BuiltinFormat spBuiltinFormats_ky_KG[] =
 };
 
 /** Lithuanian, Lithuania. */
-static const BuiltinFormat spBuiltinFormats_lt_LT[] =
+const BuiltinFormat spBuiltinFormats_lt_LT[] =
 {
     NUMFMT_ALLDATETIMES( "YYYY.MM.DD", "DD", ".", "MMM", ".", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_MINUS_NUMBER_SYMBOL( "\"Lt\"", "_L_t", " " ),
@@ -1243,7 +1243,7 @@ static const BuiltinFormat spBuiltinFormats_lt_LT[] =
 };
 
 /** Latvian, Latvia. */
-static const BuiltinFormat spBuiltinFormats_lv_LV[] =
+const BuiltinFormat spBuiltinFormats_lv_LV[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_ALLDATETIMES( "YYYY.MM.DD", "DD", ".", "MMM", ".", "YY", "h", "h" ),
@@ -1252,7 +1252,7 @@ static const BuiltinFormat spBuiltinFormats_lv_LV[] =
 };
 
 /** Malayalam, India. */
-static const BuiltinFormat spBuiltinFormats_ml_IN[] =
+const BuiltinFormat spBuiltinFormats_ml_IN[] =
 {
     NUMFMT_ALLDATETIMES( "DD-MM-YY", "DD", "-", "MMM", "-", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( "\"" UTF8_CURR_ML_IN "\"", " " ),
@@ -1260,7 +1260,7 @@ static const BuiltinFormat spBuiltinFormats_ml_IN[] =
 };
 
 /** Mongolian, Mongolia. */
-static const BuiltinFormat spBuiltinFormats_mn_MN[] =
+const BuiltinFormat spBuiltinFormats_mn_MN[] =
 {
     NUMFMT_ALLDATETIMES( "YY.MM.DD", "DD", ".", "MMM", ".", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_NUMBER_SYMBOL( UTF8_TUGRUG, "_" UTF8_TUGRUG, "" ),
@@ -1268,7 +1268,7 @@ static const BuiltinFormat spBuiltinFormats_mn_MN[] =
 };
 
 /** Malay, Brunei Darussalam. */
-static const BuiltinFormat spBuiltinFormats_ms_BN[] =
+const BuiltinFormat spBuiltinFormats_ms_BN[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "$", "" ),
@@ -1276,7 +1276,7 @@ static const BuiltinFormat spBuiltinFormats_ms_BN[] =
 };
 
 /** Malay, Malaysia. */
-static const BuiltinFormat spBuiltinFormats_ms_MY[] =
+const BuiltinFormat spBuiltinFormats_ms_MY[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "\\R", "" ),
@@ -1284,7 +1284,7 @@ static const BuiltinFormat spBuiltinFormats_ms_MY[] =
 };
 
 /** Maltese, Malta. */
-static const BuiltinFormat spBuiltinFormats_mt_MT[] =
+const BuiltinFormat spBuiltinFormats_mt_MT[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_MINUS_SYMBOL_NUMBER( "\"Lm\"", "" ),
@@ -1292,7 +1292,7 @@ static const BuiltinFormat spBuiltinFormats_mt_MT[] =
 };
 
 /** Dutch, Belgium. */
-static const BuiltinFormat spBuiltinFormats_nl_BE[] =
+const BuiltinFormat spBuiltinFormats_nl_BE[] =
 {
     // slashes must be quoted to prevent conversion to minus
     NUMFMT_ALLDATETIMES( "D\\/MM\\/YYYY", "D", "\\/", "MMM", "\\/", "YY", "h", "h" ),
@@ -1301,7 +1301,7 @@ static const BuiltinFormat spBuiltinFormats_nl_BE[] =
 };
 
 /** Dutch, Netherlands. */
-static const BuiltinFormat spBuiltinFormats_nl_NL[] =
+const BuiltinFormat spBuiltinFormats_nl_NL[] =
 {
     NUMFMT_ALLDATETIMES( "D-M-YYYY", "D", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_NUMBER_MINUS( UTF8_EURO, " " ),
@@ -1309,7 +1309,7 @@ static const BuiltinFormat spBuiltinFormats_nl_NL[] =
 };
 
 /** Norwegian (Bokmal and Nynorsk), Norway. */
-static const BuiltinFormat spBuiltinFormats_no_NO[] =
+const BuiltinFormat spBuiltinFormats_no_NO[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_ALLDATETIMES( "DD.MM.YYYY", "DD", ".", "MMM", ".", "YY", "h", "hh" ),
@@ -1318,7 +1318,7 @@ static const BuiltinFormat spBuiltinFormats_no_NO[] =
 };
 
 /** Punjabi, India. */
-static const BuiltinFormat spBuiltinFormats_pa_IN[] =
+const BuiltinFormat spBuiltinFormats_pa_IN[] =
 {
     NUMFMT_ALLDATETIMES( "DD-MM-YY", "DD", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( "\"" UTF8_CURR_PA_IN "\"", " " ),
@@ -1326,7 +1326,7 @@ static const BuiltinFormat spBuiltinFormats_pa_IN[] =
 };
 
 /** Polish, Poland. */
-static const BuiltinFormat spBuiltinFormats_pl_PL[] =
+const BuiltinFormat spBuiltinFormats_pl_PL[] =
 {
     // space character is group separator, literal spaces must be quoted
     // MMM is rendered differently in Calc and Excel (see #i72300#)
@@ -1336,7 +1336,7 @@ static const BuiltinFormat spBuiltinFormats_pl_PL[] =
 };
 
 /** Portuguese, Brazil. */
-static const BuiltinFormat spBuiltinFormats_pt_BR[] =
+const BuiltinFormat spBuiltinFormats_pt_BR[] =
 {
     NUMFMT_ALLDATETIMES( "D/M/YYYY", "D", "/", "MMM", "/", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "\"R$\"", " " ),
@@ -1344,7 +1344,7 @@ static const BuiltinFormat spBuiltinFormats_pt_BR[] =
 };
 
 /** Portuguese, Portugal. */
-static const BuiltinFormat spBuiltinFormats_pt_PT[] =
+const BuiltinFormat spBuiltinFormats_pt_PT[] =
 {
     NUMFMT_ALLDATETIMES( "DD-MM-YYYY", "DD", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_NUMBER_SYMBOL( UTF8_EURO, "_" UTF8_EURO, " " ),
@@ -1352,7 +1352,7 @@ static const BuiltinFormat spBuiltinFormats_pt_PT[] =
 };
 
 /** Romanian, Romania. */
-static const BuiltinFormat spBuiltinFormats_ro_RO[] =
+const BuiltinFormat spBuiltinFormats_ro_RO[] =
 {
     // space character is group separator, literal spaces must be quoted (but see #i75367#)
     NUMFMT_ALLDATETIMES( "DD.MM.YYYY", "DD", ".", "MMM", ".", "YY", "h", "hh" ),
@@ -1361,7 +1361,7 @@ static const BuiltinFormat spBuiltinFormats_ro_RO[] =
 };
 
 /** Russian, Russian Federation. */
-static const BuiltinFormat spBuiltinFormats_ru_RU[] =
+const BuiltinFormat spBuiltinFormats_ru_RU[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_ALLDATETIMES( "DD.MM.YYYY", "DD", ".", "MMM", ".", "YY", "h", "h" ),
@@ -1370,7 +1370,7 @@ static const BuiltinFormat spBuiltinFormats_ru_RU[] =
 };
 
 /** Slovak, Slovakia. */
-static const BuiltinFormat spBuiltinFormats_sk_SK[] =
+const BuiltinFormat spBuiltinFormats_sk_SK[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_ALLDATETIMES( "D.M.YYYY", "D", ".", "MMM", ".", "YY", "h", "h" ),
@@ -1379,7 +1379,7 @@ static const BuiltinFormat spBuiltinFormats_sk_SK[] =
 };
 
 /** Slovenian, Slovenia. */
-static const BuiltinFormat spBuiltinFormats_sl_SI[] =
+const BuiltinFormat spBuiltinFormats_sl_SI[] =
 {
     NUMFMT_ALLDATETIMES( "D.M.YYYY", "D", ".", "MMM", ".", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_NUMBER_SYMBOL( "\"SIT\"", "_S_I_T", " " ),
@@ -1387,7 +1387,7 @@ static const BuiltinFormat spBuiltinFormats_sl_SI[] =
 };
 
 /** Swedish, Finland. */
-static const BuiltinFormat spBuiltinFormats_sv_FI[] =
+const BuiltinFormat spBuiltinFormats_sv_FI[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_STRING(  9, "0\\ %" ),
@@ -1398,7 +1398,7 @@ static const BuiltinFormat spBuiltinFormats_sv_FI[] =
 };
 
 /** Swedish, Sweden. */
-static const BuiltinFormat spBuiltinFormats_sv_SE[] =
+const BuiltinFormat spBuiltinFormats_sv_SE[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_ALLDATETIMES( "YYYY-MM-DD", "DD", "-", "MMM", "-", "YY", "h", "hh" ),
@@ -1407,7 +1407,7 @@ static const BuiltinFormat spBuiltinFormats_sv_SE[] =
 };
 
 /** Swahili, Tanzania. */
-static const BuiltinFormat spBuiltinFormats_sw_TZ[] =
+const BuiltinFormat spBuiltinFormats_sw_TZ[] =
 {
     NUMFMT_ALLDATETIMES( "M/D/YYYY", "D", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "\\S", "" ),
@@ -1415,7 +1415,7 @@ static const BuiltinFormat spBuiltinFormats_sw_TZ[] =
 };
 
 /** Tamil, India. */
-static const BuiltinFormat spBuiltinFormats_ta_IN[] =
+const BuiltinFormat spBuiltinFormats_ta_IN[] =
 {
     NUMFMT_ALLDATETIMES( "DD-MM-YYYY", "DD", "-", "MMM", "-", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( "\"" UTF8_CURR_TA_IN "\"", " " ),
@@ -1423,7 +1423,7 @@ static const BuiltinFormat spBuiltinFormats_ta_IN[] =
 };
 
 /** Telugu, India. */
-static const BuiltinFormat spBuiltinFormats_te_IN[] =
+const BuiltinFormat spBuiltinFormats_te_IN[] =
 {
     NUMFMT_ALLDATETIMES( "DD-MM-YY", "DD", "-", "MMM", "-", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( "\"" UTF8_CURR_TE_IN "\"", " " ),
@@ -1431,7 +1431,7 @@ static const BuiltinFormat spBuiltinFormats_te_IN[] =
 };
 
 /** Thai, Thailand. */
-static const BuiltinFormat spBuiltinFormats_th_TH[] =
+const BuiltinFormat spBuiltinFormats_th_TH[] =
 {
     NUMFMT_ALLDATETIMES( "D/M/YYYY", "D", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_SYMBOL_NUMBER( UTF8_BAHT, "" ),
@@ -1459,7 +1459,7 @@ static const BuiltinFormat spBuiltinFormats_th_TH[] =
 };
 
 /** Turkish, Turkey. */
-static const BuiltinFormat spBuiltinFormats_tr_TR[] =
+const BuiltinFormat spBuiltinFormats_tr_TR[] =
 {
     NUMFMT_ALLDATETIMES( "DD.MM.YYYY", "DD", ".", "MMM", ".", "YY", "h", "hh" ),
     NUMFMT_ALLCURRENCIES_MINUS_NUMBER_SYMBOL( "\"TL\"", "_T_L", " " ),
@@ -1467,7 +1467,7 @@ static const BuiltinFormat spBuiltinFormats_tr_TR[] =
 };
 
 /** Tatar, Russian Federation. */
-static const BuiltinFormat spBuiltinFormats_tt_RU[] =
+const BuiltinFormat spBuiltinFormats_tt_RU[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_ALLDATETIMES( "DD.MM.YYYY", "DD", ".", "MMM", ".", "YY", "h", "h" ),
@@ -1476,7 +1476,7 @@ static const BuiltinFormat spBuiltinFormats_tt_RU[] =
 };
 
 /** Ukrainian, Ukraine. */
-static const BuiltinFormat spBuiltinFormats_uk_UA[] =
+const BuiltinFormat spBuiltinFormats_uk_UA[] =
 {
     // space character is group separator, literal spaces must be quoted
     NUMFMT_ALLDATETIMES( "DD.MM.YYYY", "DD", ".", "MMM", ".", "YY", "h", "h" ),
@@ -1485,7 +1485,7 @@ static const BuiltinFormat spBuiltinFormats_uk_UA[] =
 };
 
 /** Urdu, Pakistan. */
-static const BuiltinFormat spBuiltinFormats_ur_PK[] =
+const BuiltinFormat spBuiltinFormats_ur_PK[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_NUMBER_MINUS( "\"Rs\"", "" ),
@@ -1493,7 +1493,7 @@ static const BuiltinFormat spBuiltinFormats_ur_PK[] =
 };
 
 /** Vietnamese, Viet Nam. */
-static const BuiltinFormat spBuiltinFormats_vi_VN[] =
+const BuiltinFormat spBuiltinFormats_vi_VN[] =
 {
     NUMFMT_ALLDATETIMES( "DD/MM/YYYY", "DD", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_NUMBER_SYMBOL( UTF8_DONG, "_" UTF8_DONG, " " ),
@@ -1503,7 +1503,7 @@ static const BuiltinFormat spBuiltinFormats_vi_VN[] =
 // CJK ------------------------------------------------------------------------
 
 /** Base table for CJK locales. */
-static const BuiltinFormat spBuiltinFormats_CJK[] =
+const BuiltinFormat spBuiltinFormats_CJK[] =
 {
     NUMFMT_REUSE( 29, 28 ),
     NUMFMT_REUSE( 36, 27 ),
@@ -1520,7 +1520,7 @@ static const BuiltinFormat spBuiltinFormats_CJK[] =
 };
 
 /** Japanese, Japan. */
-static const BuiltinFormat spBuiltinFormats_ja_JP[] =
+const BuiltinFormat spBuiltinFormats_ja_JP[] =
 {
     NUMFMT_ALLDATETIMES( "YYYY/MM/DD", "DD", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_SYMBOL_NUMBER( UTF8_YEN_JP, "" ),
@@ -1536,7 +1536,7 @@ static const BuiltinFormat spBuiltinFormats_ja_JP[] =
 };
 
 /** Korean, South Korea. */
-static const BuiltinFormat spBuiltinFormats_ko_KR[] =
+const BuiltinFormat spBuiltinFormats_ko_KR[] =
 {
     NUMFMT_ALLDATETIMES( "YYYY-MM-DD", "DD", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_MINUS_SYMBOL_NUMBER( UTF8_WON, "" ),
@@ -1553,7 +1553,7 @@ static const BuiltinFormat spBuiltinFormats_ko_KR[] =
 };
 
 /** Chinese, China. */
-static const BuiltinFormat spBuiltinFormats_zh_CN[] =
+const BuiltinFormat spBuiltinFormats_zh_CN[] =
 {
     NUMFMT_ALLDATETIMES( "YYYY-M-D", "D", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_SYMBOL_MINUS_NUMBER( UTF8_YEN_CN, "" ),
@@ -1569,7 +1569,7 @@ static const BuiltinFormat spBuiltinFormats_zh_CN[] =
 };
 
 /** Chinese, Hong Kong. */
-static const BuiltinFormat spBuiltinFormats_zh_HK[] =
+const BuiltinFormat spBuiltinFormats_zh_HK[] =
 {
     NUMFMT_ALLDATETIMES( "D/M/YYYY", "D", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "\"HK$\"", "" ),
@@ -1583,7 +1583,7 @@ static const BuiltinFormat spBuiltinFormats_zh_HK[] =
 };
 
 /** Chinese, Macau. */
-static const BuiltinFormat spBuiltinFormats_zh_MO[] =
+const BuiltinFormat spBuiltinFormats_zh_MO[] =
 {
     NUMFMT_ALLDATETIMES( "D/M/YYYY", "D", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "\\P", "" ),
@@ -1597,7 +1597,7 @@ static const BuiltinFormat spBuiltinFormats_zh_MO[] =
 };
 
 /** Chinese, Singapore. */
-static const BuiltinFormat spBuiltinFormats_zh_SG[] =
+const BuiltinFormat spBuiltinFormats_zh_SG[] =
 {
     NUMFMT_ALLDATETIMES( "D/M/YYYY", "D", "-", "MMM", "-", "YY", "h", "h" ),
     NUMFMT_ALLCURRENCIES_OPEN_SYMBOL_NUMBER_CLOSE( "$", "" ),
@@ -1611,7 +1611,7 @@ static const BuiltinFormat spBuiltinFormats_zh_SG[] =
 };
 
 /** Chinese, Taiwan. */
-static const BuiltinFormat spBuiltinFormats_zh_TW[] =
+const BuiltinFormat spBuiltinFormats_zh_TW[] =
 {
     NUMFMT_ALLDATETIMES( "YYYY/M/D", "D", "-", "MMM", "-", "YY", "hh", "hh" ),
     NUMFMT_ALLCURRENCIES_MINUS_SYMBOL_NUMBER( "$", "" ),
@@ -1632,7 +1632,7 @@ struct BuiltinFormatTable
     const BuiltinFormat* mpFormats;         /// The number format table (may be 0, if equal to parent).
 };
 
-static const BuiltinFormatTable spBuiltinFormatTables[] =
+const BuiltinFormatTable spBuiltinFormatTables[] =
 { //  locale    parent      format table
     { "*",      "",         spBuiltinFormats_BASE   },  // Base table
     { "af-ZA",  "*",        spBuiltinFormats_en_ZA  },  // Afrikaans, South Africa
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index 461af3e85599..d2baf2b92354 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -446,7 +446,7 @@ private:
 namespace {
 
 // different names for bold font style (lowercase)
-static const char* const sppcBoldNames[] =
+const char* const sppcBoldNames[] =
 {
     "bold",
     "fett",             // German 'bold'
@@ -457,7 +457,7 @@ static const char* const sppcBoldNames[] =
 };
 
 // different names for italic font style (lowercase)
-static const char* const sppcItalicNames[] =
+const char* const sppcItalicNames[] =
 {
     "italic",
     "kursiv",           // German 'italic'
@@ -468,11 +468,11 @@ static const char* const sppcItalicNames[] =
 
 } // namespace
 
-static const OUStringLiteral gaPageNumberService( "com.sun.star.text.TextField.PageNumber" );
-static const OUStringLiteral gaPageCountService( "com.sun.star.text.TextField.PageCount" );
-static const OUStringLiteral gaSheetNameService( "com.sun.star.text.TextField.SheetName" );
-static const OUStringLiteral gaFileNameService( "com.sun.star.text.TextField.FileName" );
-static const OUStringLiteral gaDateTimeService( "com.sun.star.text.TextField.DateTime" );
+const OUStringLiteral gaPageNumberService( "com.sun.star.text.TextField.PageNumber" );
+const OUStringLiteral gaPageCountService( "com.sun.star.text.TextField.PageCount" );
+const OUStringLiteral gaSheetNameService( "com.sun.star.text.TextField.SheetName" );
+const OUStringLiteral gaFileNameService( "com.sun.star.text.TextField.FileName" );
+const OUStringLiteral gaDateTimeService( "com.sun.star.text.TextField.DateTime" );
 
 HeaderFooterParser::HeaderFooterParser( const WorkbookHelper& rHelper ) :
     WorkbookHelper( rHelper ),
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index d9f8214c2774..3ec09651ac11 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -350,7 +350,7 @@ namespace {
             ::Color(0x800000), ::Color(0x008000), ::Color(0x000080), ::Color(0x808000), ::Color(0x800080), ::Color(0x008080), ::Color(0xC0C0C0), ::Color(0x808080)
 
 /** Default color table for BIFF8/BIFF12/OOXML. */
-static const ::Color spnDefColors8[] =
+const ::Color spnDefColors8[] =
 {
 /*  0 */    PALETTE_EGA_COLORS_LIGHT,
 /*  8 */    PALETTE_EGA_COLORS_LIGHT,
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index 5fc46ecbfd30..9f92491780f2 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -389,7 +389,7 @@ private:
     bool                mbHasDefWidth;      /// True = default column width is set from defaultColWidth attribute.
 };
 
-static const OUStringLiteral gaSheetCellRanges( "com.sun.star.sheet.SheetCellRanges" ); /// Service name for a SheetCellRanges object.
+const OUStringLiteral gaSheetCellRanges( "com.sun.star.sheet.SheetCellRanges" ); /// Service name for a SheetCellRanges object.
 
 WorksheetGlobals::WorksheetGlobals( const WorkbookHelper& rHelper, const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, SCTAB nSheet ) :
     WorkbookHelper( rHelper ),
diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx
index 8ae35e49ebe3..2cb650eb45fc 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -395,7 +395,7 @@ ConvErr QProToSc::Convert( const ScDocument* pDoc, std::unique_ptr<ScTokenArray>
     return eRet;
 }
 
-static const struct
+const struct
 {
     DefTokenId     nToken;
     QPRO_FUNC_TYPE nType;
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 4f114bbbd04f..b58c00003d6b 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -1927,7 +1927,7 @@ void XclExpProt4RevPass::WriteBody( XclExpStream& rStrm )
     rStrm << static_cast<sal_uInt16>(0x0000);
 }
 
-static const sal_uInt8 nDataRecalcId[] = {
+const sal_uInt8 nDataRecalcId[] = {
     0xC1, 0x01, 0x00, 0x00, 0x54, 0x8D, 0x01, 0x00
 };
 
@@ -1936,7 +1936,7 @@ XclExpRecalcId::XclExpRecalcId() :
 {
 }
 
-static const sal_uInt8 nDataBookExt[] = {
+const sal_uInt8 nDataBookExt[] = {
     0x63, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x02
diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx
index 85d95e415b03..d7ed3fde5425 100644
--- a/sc/source/filter/xml/XMLCodeNameProvider.cxx
+++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx
@@ -46,8 +46,8 @@ bool XMLCodeNameProvider::_getCodeName( const uno::Any& aAny, OUString& rCodeNam
     return false;
 }
 
-static constexpr OUStringLiteral gsDocName( "*doc*" );
-static constexpr OUStringLiteral gsCodeNameProp( "CodeName" );
+constexpr OUStringLiteral gsDocName( "*doc*" );
+constexpr OUStringLiteral gsCodeNameProp( "CodeName" );
 
 XMLCodeNameProvider::XMLCodeNameProvider( ScDocument* pDoc ) :
     mpDoc( pDoc )
diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx
index b921af95e383..8f288b6b02b9 100644
--- a/sc/source/filter/xml/XMLConverter.cxx
+++ b/sc/source/filter/xml/XMLConverter.cxx
@@ -359,7 +359,7 @@ struct ScXMLConditionInfo
     sal_Int32                 mnIdentLength;
 };
 
-static const ScXMLConditionInfo spConditionInfos[] =
+const ScXMLConditionInfo spConditionInfos[] =
 {
     { XML_COND_AND,                     XML_COND_TYPE_KEYWORD,    sheet::ValidationType_ANY,      sheet::ConditionOperator_NONE,        RTL_CONSTASCII_STRINGPARAM( "and" ) },
     { XML_COND_CELLCONTENT,             XML_COND_TYPE_COMPARISON, sheet::ValidationType_ANY,      sheet::ConditionOperator_NONE,        RTL_CONSTASCII_STRINGPARAM( "cell-content" ) },
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index f5a374529b8b..4f1b820bf071 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -75,16 +75,16 @@ bool ScMyValidation::IsEqual(const ScMyValidation& aVal) const
         aVal.sFormula2 == sFormula2;
 }
 
-static const OUStringLiteral gsERRALSTY(SC_UNONAME_ERRALSTY);
-static const OUStringLiteral gsIGNOREBL(SC_UNONAME_IGNOREBL);
-static const OUStringLiteral gsSHOWLIST(SC_UNONAME_SHOWLIST);
-static const OUStringLiteral gsTYPE(SC_UNONAME_TYPE);
-static const OUStringLiteral gsSHOWINP(SC_UNONAME_SHOWINP);
-static const OUStringLiteral gsSHOWERR(SC_UNONAME_SHOWERR);
-static const OUStringLiteral gsINPTITLE(SC_UNONAME_INPTITLE);
-static const OUStringLiteral gsINPMESS(SC_UNONAME_INPMESS);
-static const OUStringLiteral gsERRTITLE(SC_UNONAME_ERRTITLE);
-static const OUStringLiteral gsERRMESS(SC_UNONAME_ERRMESS);
+const OUStringLiteral gsERRALSTY(SC_UNONAME_ERRALSTY);
+const OUStringLiteral gsIGNOREBL(SC_UNONAME_IGNOREBL);
+const OUStringLiteral gsSHOWLIST(SC_UNONAME_SHOWLIST);
+const OUStringLiteral gsTYPE(SC_UNONAME_TYPE);
+const OUStringLiteral gsSHOWINP(SC_UNONAME_SHOWINP);
+const OUStringLiteral gsSHOWERR(SC_UNONAME_SHOWERR);
+const OUStringLiteral gsINPTITLE(SC_UNONAME_INPTITLE);
+const OUStringLiteral gsINPMESS(SC_UNONAME_INPMESS);
+const OUStringLiteral gsERRTITLE(SC_UNONAME_ERRTITLE);
+const OUStringLiteral gsERRMESS(SC_UNONAME_ERRMESS);
 
 ScMyValidationsContainer::ScMyValidationsContainer()
     : aValidationVec()
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index eca716116c69..9ca21ed5498d 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -336,7 +336,7 @@ sal_Int16 ScXMLExport::GetMeasureUnit()
     return SvXMLUnitConverter::GetMeasureUnit(eFieldUnit);
 }
 
-static const OUStringLiteral gsLayerID( SC_LAYERID );
+const OUStringLiteral gsLayerID( SC_LAYERID );
 
 ScXMLExport::ScXMLExport(
     const css::uno::Reference< css::uno::XComponentContext >& rContext,
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 7908b7dd6aab..1a35ba93ed8f 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -575,9 +575,9 @@ SvXMLImportContext *ScXMLImport::CreateFastContext( sal_Int32 nElement,
     return pContext;
 }
 
-static constexpr OUStringLiteral gsNumberFormat(SC_UNONAME_NUMFMT);
-static constexpr OUStringLiteral gsLocale(SC_LOCALE);
-static constexpr OUStringLiteral gsCellStyle(SC_UNONAME_CELLSTYL);
+constexpr OUStringLiteral gsNumberFormat(SC_UNONAME_NUMFMT);
+constexpr OUStringLiteral gsLocale(SC_LOCALE);
+constexpr OUStringLiteral gsCellStyle(SC_UNONAME_CELLSTYL);
 
 ScXMLImport::ScXMLImport(
     const css::uno::Reference< css::uno::XComponentContext >& rContext,
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 410dea98bb2e..9dcc5893639b 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -676,10 +676,10 @@ SvXMLStyleContext *XMLTableStylesContext::CreateDefaultStyleStyleChildContext(
     return pStyle;
 }
 
-static const OUStringLiteral gsCellStyleServiceName("com.sun.star.style.CellStyle");
-static const OUStringLiteral gsColumnStyleServiceName(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME);
-static const OUStringLiteral gsRowStyleServiceName(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME);
-static const OUStringLiteral gsTableStyleServiceName(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME);
+const OUStringLiteral gsCellStyleServiceName("com.sun.star.style.CellStyle");
+const OUStringLiteral gsColumnStyleServiceName(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME);
+const OUStringLiteral gsRowStyleServiceName(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME);
+const OUStringLiteral gsTableStyleServiceName(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME);
 
 XMLTableStylesContext::XMLTableStylesContext( SvXMLImport& rImport,
         const bool bTempAutoStyles )
diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index f508b0217b60..23f9659c68c5 100644
--- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
@@ -26,7 +26,7 @@ struct StatisticCalculation {
     const char* aResultRangeName;
 };
 
-static StatisticCalculation const lclBasicStatistics[] =
+StatisticCalculation const lclBasicStatistics[] =
 {
     { STR_ANOVA_LABEL_GROUPS, nullptr,             nullptr       },
     { STRID_CALC_COUNT,       "=COUNT(%RANGE%)",   "COUNT_RANGE" },
@@ -36,7 +36,7 @@ static StatisticCalculation const lclBasicStatistics[] =
     { nullptr,                nullptr,             nullptr       }
 };
 
-static const char* lclAnovaLabels[] =
+const char* lclAnovaLabels[] =
 {
     STR_ANOVA_LABEL_SOURCE_OF_VARIATION,
     STR_ANOVA_LABEL_SS,
@@ -48,7 +48,7 @@ static const char* lclAnovaLabels[] =
     nullptr
 };
 
-static const char strWildcardRange[] = "%RANGE%";
+const char strWildcardRange[] = "%RANGE%";
 
 OUString lclCreateMultiParameterFormula(
             ScRangeList&        aRangeList, const OUString& aFormulaTemplate,
diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
index 434271d0a3ca..f82b04bdf17a 100644
--- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
@@ -24,7 +24,7 @@ struct StatisticCalculation {
     const char* aFormula;
 };
 
-static const StatisticCalculation lclCalcDefinitions[] =
+const StatisticCalculation lclCalcDefinitions[] =
 {
     { STRID_CALC_MEAN,           "=AVERAGE(%RANGE%)" },
     { STRID_CALC_STD_ERROR,      "=SQRT(VAR(%RANGE%)/COUNT(%RANGE%))"},
diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx
index 8a48a87bd290..d8ae220bf6dc 100644
--- a/sc/source/ui/app/msgpool.cxx
+++ b/sc/source/ui/app/msgpool.cxx
@@ -23,7 +23,7 @@
 #include <docpool.hxx>
 #include <msgpool.hxx>
 
-static SfxItemInfo const aMsgItemInfos[] =
+SfxItemInfo const aMsgItemInfos[] =
 {
     { 0,                         true },   // SCITEM_STRING
     { 0,                         true },   // SCITEM_SEARCHDATA - stop using this!
diff --git a/sc/source/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxx
index 9a27a0d0e298..330b8479b9a3 100644
--- a/sc/source/ui/app/rfindlst.cxx
+++ b/sc/source/ui/app/rfindlst.cxx
@@ -22,7 +22,7 @@
 
 #define SC_RANGECOLORS  8
 
-static const Color aColNames[SC_RANGECOLORS] =
+const Color aColNames[SC_RANGECOLORS] =
     { COL_LIGHTBLUE, COL_LIGHTRED, COL_LIGHTMAGENTA, COL_GREEN,
         COL_BLUE, COL_RED, COL_MAGENTA, COL_BROWN };
 
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index 6e05c824d5af..f03b789e8020 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -114,7 +114,7 @@ struct ScZoomSlider::ScZoomSliderWnd_Impl
         }
 };
 
-static constexpr sal_uInt16 gnSliderCenter(100);
+constexpr sal_uInt16 gnSliderCenter(100);
 
 const long nButtonWidth     = 10;
 const long nButtonHeight    = 10;
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index 5f719a31c21c..d2082706d917 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -22,8 +22,8 @@
 #include <comphelper/string.hxx>
 #include <osl/thread.h>
 
-static const char pStrFix[] = "FIX";
-static const char pStrMrg[] = "MRG";
+const char pStrFix[] = "FIX";
+const char pStrMrg[] = "MRG";
 
 ScAsciiOptions::ScAsciiOptions() :
     bFixedLen       ( false ),
diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx
index 44d5660cd793..64d61e55bbab 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -32,7 +32,7 @@
 namespace {
 
 /** Date part flags in order of the list box entries. */
-static const sal_Int32 spnDateParts[] =
+const sal_Int32 spnDateParts[] =
 {
     css::sheet::DataPilotFieldGroupBy::SECONDS,
     css::sheet::DataPilotFieldGroupBy::MINUTES,
@@ -43,7 +43,7 @@ static const sal_Int32 spnDateParts[] =
     css::sheet::DataPilotFieldGroupBy::YEARS
 };
 
-static const char* aDatePartResIds[] =
+const char* aDatePartResIds[] =
 {
     STR_DPFIELD_GROUP_BY_SECONDS,
     STR_DPFIELD_GROUP_BY_MINUTES,
diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx
index 3de4d7ade31a..4229c2a307a5 100644
--- a/sc/source/ui/dbgui/imoptdlg.cxx
+++ b/sc/source/ui/dbgui/imoptdlg.cxx
@@ -23,7 +23,7 @@
 #include <osl/thread.h>
 #include <global.hxx>
 
-static const char pStrFix[] = "FIX";
+const char pStrFix[] = "FIX";
 
 //  The option string can no longer contain a semicolon (because of pick list),
 //  therefore, starting with version 336 comma instead
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 5413b009a1a2..2456d40f608a 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -108,7 +108,7 @@ bool lclFillListBox(weld::TreeView& rLBox, const vector<ScDPLabelData::Member>&
 }
 
 /** This table represents the order of the strings in the resource string array. */
-static const PivotFunc spnFunctions[] =
+const PivotFunc spnFunctions[] =
 {
     PivotFunc::Sum,
     PivotFunc::Count,
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index ca92a787f18d..a270332ddf2c 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -279,7 +279,7 @@ static void lcl_SaveSeparators(
     aItem.PutProperties(aNames, aValues);
 }
 
-static constexpr OUStringLiteral gaTextSepList(SCSTR_TEXTSEP);
+constexpr OUStringLiteral gaTextSepList(SCSTR_TEXTSEP);
 
 ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, const OUString& aDatName,
                                    SvStream* pInStream, ScImportAsciiCall eCall)
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index a305a1b5bc12..b0d3dd8f55cc 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -139,25 +139,25 @@ using ::std::vector;
 
 //  Filter names (like in sclib.cxx)
 
-static const char pFilterSc50[]     = "StarCalc 5.0";
-static const char pFilterXML[]      = "StarOffice XML (Calc)";
-static const char pFilterAscii[]    = SC_TEXT_CSV_FILTER_NAME;
-static const char pFilterLotus[]    = "Lotus";
-static const char pFilterQPro6[]    = "Quattro Pro 6.0";
-static const char pFilterExcel4[]   = "MS Excel 4.0";
-static const char pFilterEx4Temp[]  = "MS Excel 4.0 Vorlage/Template";
-static const char pFilterExcel5[]   = "MS Excel 5.0/95";
-static const char pFilterEx5Temp[]  = "MS Excel 5.0/95 Vorlage/Template";
-static const char pFilterExcel95[]  = "MS Excel 95";
-static const char pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template";
-static const char pFilterExcel97[]  = "MS Excel 97";
-static const char pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template";
-static const char pFilterDBase[]    = "dBase";
-static const char pFilterDif[]      = "DIF";
-static const char pFilterSylk[]     = "SYLK";
-static const char pFilterHtml[]     = "HTML (StarCalc)";
-static const char pFilterHtmlWebQ[] = "calc_HTML_WebQuery";
-static const char pFilterRtf[]      = "Rich Text Format (StarCalc)";
+const char pFilterSc50[]     = "StarCalc 5.0";
+const char pFilterXML[]      = "StarOffice XML (Calc)";
+const char pFilterAscii[]    = SC_TEXT_CSV_FILTER_NAME;
+const char pFilterLotus[]    = "Lotus";
+const char pFilterQPro6[]    = "Quattro Pro 6.0";
+const char pFilterExcel4[]   = "MS Excel 4.0";
+const char pFilterEx4Temp[]  = "MS Excel 4.0 Vorlage/Template";
+const char pFilterExcel5[]   = "MS Excel 5.0/95";
+const char pFilterEx5Temp[]  = "MS Excel 5.0/95 Vorlage/Template";
+const char pFilterExcel95[]  = "MS Excel 95";
+const char pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template";
+const char pFilterExcel97[]  = "MS Excel 97";
+const char pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template";
+const char pFilterDBase[]    = "dBase";
+const char pFilterDif[]      = "DIF";
+const char pFilterSylk[]     = "SYLK";
+const char pFilterHtml[]     = "HTML (StarCalc)";
+const char pFilterHtmlWebQ[] = "calc_HTML_WebQuery";
+const char pFilterRtf[]      = "Rich Text Format (StarCalc)";
 
 #define ShellClass_ScDocShell
 #include <scslots.hxx>
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 543f516a1c4d..f87440b047b3 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -69,7 +69,7 @@
 // times maximum cell content length, 2*1024*64K=128M, and because it's
 // sal_Unicode that's 256MB. If it's 2GB of data without LF we're out of luck
 // anyway.
-static const sal_Int32 nArbitraryLineLengthLimit = 2 * MAXCOLCOUNT * 65536;
+const sal_Int32 nArbitraryLineLengthLimit = 2 * MAXCOLCOUNT * 65536;
 
 namespace
 {
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 49d8b62c7fcf..eaeb767cafaa 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -58,7 +58,7 @@ using namespace com::sun::star;
 
 //  order of the categories in navigator -------------------------------------
 
-static const ScContentId pTypeList[int(ScContentId::LAST) + 1] =
+const ScContentId pTypeList[int(ScContentId::LAST) + 1] =
 {
     ScContentId::ROOT,            // ROOT (0) has to be at the front
     ScContentId::TABLE,
@@ -71,7 +71,7 @@ static const ScContentId pTypeList[int(ScContentId::LAST) + 1] =
     ScContentId::DRAWING
 };
 
-static const OUStringLiteral aContentBmps[]=
+const OUStringLiteral aContentBmps[]=
 {
     RID_BMP_CONTENT_TABLE,
     RID_BMP_CONTENT_RANGENAME,
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index ab4e73f2cc91..f970ef9c8683 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -51,7 +51,7 @@ using namespace com::sun::star;
 // macro is sufficient since only used in ctor
 #define SCNAV_COLDIGITS     (static_cast<sal_Int32>( floor( log10( static_cast<double>(SCNAV_MAXCOL)))) + 1)   // 1...256...18278
 // precomputed constant because it is used in every change of spin button field
-static const sal_Int32 SCNAV_COLLETTERS = ::ScColToAlpha(SCNAV_MAXCOL).getLength();    // A...IV...ZZZ
+const sal_Int32 SCNAV_COLLETTERS = ::ScColToAlpha(SCNAV_MAXCOL).getLength();    // A...IV...ZZZ
 
 #define SCNAV_MAXROW        (MAXROWCOUNT)
 
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 5d1868dc61ef..5cedd09b6895 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -41,7 +41,7 @@
 #define CR  u'\x000D'
 #define LF  u'\x000A'
 
-static const sal_Unicode cDelimiter = ',';
+const sal_Unicode cDelimiter = ',';
 
 // Benutzerdefinierte Listen:
 
diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx
index 6f9a25fcca89..da62003a86c1 100644
--- a/sc/source/ui/unoobj/condformatuno.cxx
+++ b/sc/source/ui/unoobj/condformatuno.cxx
@@ -80,7 +80,7 @@ struct ConditionEntryApiMap
     sal_Int32 nApiMode;
 };
 
-static ConditionEntryApiMap const aConditionEntryMap[] =
+ConditionEntryApiMap const aConditionEntryMap[] =
 {
     {ScConditionMode::Equal, sheet::ConditionFormatOperator::EQUAL},
     {ScConditionMode::Less, sheet::ConditionFormatOperator::LESS},
@@ -131,7 +131,7 @@ struct ColorScaleEntryTypeApiMap
     sal_Int32 nApiType;
 };
 
-static ColorScaleEntryTypeApiMap const aColorScaleEntryTypeMap[] =
+ColorScaleEntryTypeApiMap const aColorScaleEntryTypeMap[] =
 {
     { COLORSCALE_MIN, sheet::ColorScaleEntryType::COLORSCALE_MIN },
     { COLORSCALE_MAX, sheet::ColorScaleEntryType::COLORSCALE_MAX },
@@ -180,7 +180,7 @@ struct DataBarAxisApiMap
     sal_Int32 nApiPos;
 };
 
-static DataBarAxisApiMap const aDataBarAxisMap[] =
+DataBarAxisApiMap const aDataBarAxisMap[] =
 {
     { databar::NONE, sheet::DataBarAxis::AXIS_NONE },
     { databar::AUTOMATIC, sheet::DataBarAxis::AXIS_AUTOMATIC },
@@ -193,7 +193,7 @@ struct DataBarEntryTypeApiMap
     sal_Int32 nApiType;
 };
 
-static DataBarEntryTypeApiMap const aDataBarEntryTypeMap[] =
+DataBarEntryTypeApiMap const aDataBarEntryTypeMap[] =
 {
     { COLORSCALE_AUTO, sheet::DataBarEntryType::DATABAR_AUTO },
     { COLORSCALE_MIN, sheet::DataBarEntryType::DATABAR_MIN },
@@ -260,7 +260,7 @@ struct IconSetEntryTypeApiMap
     sal_Int32 nApiType;
 };
 
-static IconSetEntryTypeApiMap const aIconSetEntryTypeMap[] =
+IconSetEntryTypeApiMap const aIconSetEntryTypeMap[] =
 {
     { COLORSCALE_MIN, sheet::IconSetFormatEntry::ICONSET_MIN },
     { COLORSCALE_VALUE, sheet::IconSetFormatEntry::ICONSET_VALUE },
@@ -292,7 +292,7 @@ struct DateTypeApiMap
     sal_Int32 nApiType;
 };
 
-static DateTypeApiMap const aDateTypeApiMap[] =
+DateTypeApiMap const aDateTypeApiMap[] =
 {
     { condformat::TODAY, sheet::DateType::TODAY },
     { condformat::YESTERDAY, sheet::DateType::YESTERDAY },
diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx
index 2fc3f06c8313..74e3ba29a493 100644
--- a/sc/source/ui/unoobj/dispuno.cxx
+++ b/sc/source/ui/unoobj/dispuno.cxx
@@ -33,8 +33,8 @@
 
 using namespace com::sun::star;
 
-static const char cURLInsertColumns[] = ".uno:DataSourceBrowser/InsertColumns"; //data into text
-static const char cURLDocDataSource[] = ".uno:DataSourceBrowser/DocumentDataSource";
+const char cURLInsertColumns[] = ".uno:DataSourceBrowser/InsertColumns"; //data into text
+const char cURLDocDataSource[] = ".uno:DataSourceBrowser/DocumentDataSource";
 
 static uno::Reference<view::XSelectionSupplier> lcl_GetSelectionSupplier( const SfxViewShell* pViewShell )
 {
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index ead34c2a9518..2a8f17da4d95 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -385,7 +385,7 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap()
 #define SC_FAMILYNAME_CELL  "CellStyles"
 #define SC_FAMILYNAME_PAGE  "PageStyles"
 
-static const SfxStyleFamily aStyleFamilyTypes[SC_STYLE_FAMILY_COUNT] = { SfxStyleFamily::Para, SfxStyleFamily::Page };
+const SfxStyleFamily aStyleFamilyTypes[SC_STYLE_FAMILY_COUNT] = { SfxStyleFamily::Para, SfxStyleFamily::Page };
 
 using sc::HMMToTwips;
 using sc::TwipsToHMM;
diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx
index 4da1765fd265..6ed91ab9b440 100644
--- a/sc/source/ui/unoobj/targuno.cxx
+++ b/sc/source/ui/unoobj/targuno.cxx
@@ -199,7 +199,7 @@ void SAL_CALL ScLinkTargetTypeObj::setPropertyValue(const OUString& /* aProperty
     //! exception?
 }
 
-static const OUStringLiteral aContentBmps[]=
+const OUStringLiteral aContentBmps[]=
 {
     RID_BMP_CONTENT_TABLE,
     RID_BMP_CONTENT_RANGENAME,
diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx
index 25da8eee15eb..48e1ba22401f 100644
--- a/sc/source/ui/vba/vbaassistant.cxx
+++ b/sc/source/ui/vba/vbaassistant.cxx
@@ -26,7 +26,7 @@ using namespace ooo::vba;
 
 using namespace ooo::vba::office::MsoAnimationType;
 
-static constexpr OUStringLiteral g_sName = "Clippit";
+constexpr OUStringLiteral g_sName = "Clippit";
 
 ScVbaAssistant::ScVbaAssistant( const uno::Reference< XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext ): ScVbaAssistantImpl_BASE(rParent, rContext)
 {
diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx
index 41e8f03c56d6..97034dec7a0b 100644
--- a/sc/source/ui/vba/vbaborders.cxx
+++ b/sc/source/ui/vba/vbaborders.cxx
@@ -40,15 +40,15 @@ typedef InheritedHelperInterfaceWeakImpl<excel::XBorder > ScVbaBorder_Base;
 
 // #TODO sort these indexes to match the order in which Excel iterates over the
 // borders, the enumeration will match the order in this list
-static const sal_Int16 supportedIndexTable[] = {  XlBordersIndex::xlEdgeLeft, XlBordersIndex::xlEdgeTop, XlBordersIndex::xlEdgeBottom, XlBordersIndex::xlEdgeRight, XlBordersIndex::xlDiagonalDown, XlBordersIndex::xlDiagonalUp, XlBordersIndex::xlInsideVertical, XlBordersIndex::xlInsideHorizontal };
+const sal_Int16 supportedIndexTable[] = {  XlBordersIndex::xlEdgeLeft, XlBordersIndex::xlEdgeTop, XlBordersIndex::xlEdgeBottom, XlBordersIndex::xlEdgeRight, XlBordersIndex::xlDiagonalDown, XlBordersIndex::xlDiagonalUp, XlBordersIndex::xlInsideVertical, XlBordersIndex::xlInsideHorizontal };
 
-static const char sTableBorder[] = "TableBorder";
+const char sTableBorder[] = "TableBorder";
 
 //  Equiv widths in 1/100 mm
-const static sal_Int32 OOLineThin = 35;
-const static sal_Int32 OOLineMedium = 88;
-const static sal_Int32 OOLineThick = 141;
-const static sal_Int32 OOLineHairline = 2;
+const sal_Int32 OOLineThin = 35;
+const sal_Int32 OOLineMedium = 88;
+const sal_Int32 OOLineThick = 141;
+const sal_Int32 OOLineHairline = 2;
 
 namespace {
 
diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx
index d3e47a289cc1..546b4a304e8e 100644
--- a/sc/source/ui/vba/vbadialog.cxx
+++ b/sc/source/ui/vba/vbadialog.cxx
@@ -23,7 +23,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-static const OUStringLiteral aStringList[]=
+const OUStringLiteral aStringList[]=
 {
     ".uno:Open",
     ".uno:FormatCellDialog",
diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx
index 0fe22e786e0e..c4897d92328c 100644
--- a/sc/source/ui/vba/vbainterior.cxx
+++ b/sc/source/ui/vba/vbainterior.cxx
@@ -34,9 +34,9 @@ using namespace ::com::sun::star;
 using namespace ::ooo::vba;
 using namespace ::ooo::vba::excel::XlPattern;
 
-static const char BACKCOLOR[] = "CellBackColor";
-static const char PATTERN[] = "Pattern";
-static const char PATTERNCOLOR[] = "PatternColor";
+const char BACKCOLOR[] = "CellBackColor";
+const char PATTERN[] = "Pattern";
+const char PATTERNCOLOR[] = "PatternColor";
 
 static std::map< sal_Int32, sal_Int32 > aPatternMap {
     { xlPatternAutomatic, 0 },
diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx
index 86bbc1031f15..2fdb74d77bfa 100644
--- a/sc/source/ui/vba/vbapalette.cxx
+++ b/sc/source/ui/vba/vbapalette.cxx
@@ -38,7 +38,7 @@ using namespace ::ooo::vba;
 #define EXC_PALETTE_EGA_COLORS_DARK \
             Color(0x800000), Color(0x008000), Color(0x000080), Color(0x808000), Color(0x800080), Color(0x008080), Color(0xC0C0C0), Color(0x808080)
 
-static const Color spnDefColorTable8[] =
+const Color spnDefColorTable8[] =
 {
 /*  8 */    EXC_PALETTE_EGA_COLORS_LIGHT,
 /* 16 */    EXC_PALETTE_EGA_COLORS_DARK,
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 546ff7871c71..30c1904aed8b 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -171,7 +171,7 @@ const double fExtraWidth = 182.0 / 256.0;
 //    * 1 cm = 567 twips
 static double lcl_hmmToPoints( double nVal ) { return nVal / 1000 * 567 / 20; }
 
-static const sal_Int16 supportedIndexTable[] = {  excel::XlBordersIndex::xlEdgeLeft, excel::XlBordersIndex::xlEdgeTop, excel::XlBordersIndex::xlEdgeBottom, excel::XlBordersIndex::xlEdgeRight, excel::XlBordersIndex::xlDiagonalDown, excel::XlBordersIndex::xlDiagonalUp, excel::XlBordersIndex::xlInsideVertical, excel::XlBordersIndex::xlInsideHorizontal };
+const sal_Int16 supportedIndexTable[] = {  excel::XlBordersIndex::xlEdgeLeft, excel::XlBordersIndex::xlEdgeTop, excel::XlBordersIndex::xlEdgeBottom, excel::XlBordersIndex::xlEdgeRight, excel::XlBordersIndex::xlDiagonalDown, excel::XlBordersIndex::xlDiagonalUp, excel::XlBordersIndex::xlInsideVertical, excel::XlBordersIndex::xlInsideHorizontal };
 
 static sal_uInt16 lcl_pointsToTwips( double nVal )
 {
@@ -673,15 +673,15 @@ public:
 
 }
 
-static const char ISVISIBLE[] = "IsVisible";
-static const char EQUALS[] = "=";
-static const char NOTEQUALS[] = "<>";
-static const char GREATERTHAN[] = ">";
-static const char GREATERTHANEQUALS[] = ">=";
-static const char LESSTHAN[] = "<";
-static const char LESSTHANEQUALS[] = "<=";
-static const char STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY[] = "The command you chose cannot be performed with multiple selections.\nSelect a single range and click the command again";
-static const char CELLSTYLE[] = "CellStyle";
+const char ISVISIBLE[] = "IsVisible";
+const char EQUALS[] = "=";
+const char NOTEQUALS[] = "<>";
+const char GREATERTHAN[] = ">";
+const char GREATERTHANEQUALS[] = ">=";
+const char LESSTHAN[] = "<";
+const char LESSTHANEQUALS[] = "<=";
+const char STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY[] = "The command you chose cannot be performed with multiple selections.\nSelect a single range and click the command again";
+const char CELLSTYLE[] = "CellStyle";
 
 namespace {
 
@@ -970,7 +970,7 @@ public:
 
 }
 
-static const char sNA[] = "#N/A";
+const char sNA[] = "#N/A";
 
 namespace {
 
diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx
index ba2d04553231..cf0012b45371 100644
--- a/sc/source/ui/vba/vbastyle.cxx
+++ b/sc/source/ui/vba/vbastyle.cxx
@@ -25,7 +25,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-static const char DISPLAYNAME[] = "DisplayName";
+const char DISPLAYNAME[] = "DisplayName";
 
 uno::Reference< container::XNameAccess >
 ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel )
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index ea117e566c90..867e309c08b9 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -597,7 +597,7 @@ void ScOutlineWindow::HideFocus()
     }
 }
 
-static const OUStringLiteral aLevelBmps[]=
+const OUStringLiteral aLevelBmps[]=
 {
     RID_BMP_LEVEL1,
     RID_BMP_LEVEL2,
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 8683ecdadf77..4e1e53abc397 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -70,7 +70,7 @@ using namespace com::sun::star;
 
 #define SC_AUTHORCOLORCOUNT     9
 
-static const Color nAuthorColor[ SC_AUTHORCOLORCOUNT ] = {
+const Color nAuthorColor[ SC_AUTHORCOLORCOUNT ] = {
                     COL_LIGHTRED,       COL_LIGHTBLUE,      COL_LIGHTMAGENTA,
                     COL_GREEN,          COL_RED,            COL_BLUE,
                     COL_BROWN,          COL_MAGENTA,        COL_CYAN };
@@ -819,7 +819,7 @@ void ScOutputData::DrawDocumentBackground()
 
 namespace {
 
-static const double lclCornerRectTransparency = 40.0;
+const double lclCornerRectTransparency = 40.0;
 
 void drawDataBars(vcl::RenderContext& rRenderContext, const ScDataBarInfo* pOldDataBarInfo, const tools::Rectangle& rRect, long nOneX, long nOneY)
 {
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 4d92510d3257..51339744bc98 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -727,7 +727,7 @@ ScSplitPos ScViewDataTable::SanitizeWhichActive() const
     return eWhichActive;
 }
 
-static const ScSheetLimits gaNoShellSheetLimits(MAXCOL, MAXROW);
+const ScSheetLimits gaNoShellSheetLimits(MAXCOL, MAXROW);
 
 ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh ) :
         nPPTX(0.0),
author	Stephan Bergmann <sbergman@redhat.com>	2020-07-01 19:56:24 +0200
committer	Stephan Bergmann <sbergman@redhat.com>	2020-07-01 21:23:34 +0200
commit	45170005287b7f1c9610684b3d5913a356b0f4e1 (patch)
tree	edb06323c3e22b6e49247679222b392be9ce0561 /sc/source
parent	8e50b9ca808e668d1f55d6b2dc517e6221fe1df7 (diff)