const up s_stdMeta, s_stdStats

Change-Id: I8fe029daa696e4228abaa6ec76539945b60c7c68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187904
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>

sfx2/source/doc/SfxDocumentMetaData.cxx

@@ -394,7 +394,7 @@ constexpr OUString s_stdStatAttrs[] = {
 };
 
 // NB: keep these two arrays in sync!
-const char* s_stdStats[] = {
+const char* const s_stdStats[] = {
     "PageCount",
     "TableCount",
     "DrawCount",
@@ -413,7 +413,7 @@ const char* s_stdStats[] = {
     nullptr
 };
 
-const char* s_stdMeta[] = {
+const char* const s_stdMeta[] = {
     "meta:generator",           // string
     "dc:title",                 // string
     "dc:description",           // string
@@ -1212,7 +1212,7 @@ void SfxDocumentMetaData::init(
 
 
     // select nodes for elements of which we only handle one occurrence
-    for (const char **pName = s_stdMeta; *pName != nullptr; ++pName) {
+    for (const char* const* pName = s_stdMeta; *pName != nullptr; ++pName) {
         OUString name = OUString::createFromAscii(*pName);
         // NB: If a document contains more than one occurrence of a
         // meta-data element, we arbitrarily pick one of them here.

svx/source/svdraw/svdattr.cxx

@@ -1726,7 +1726,7 @@ SdrMeasureTextHPosItem* SdrMeasureTextHPosItem::Clone(SfxItemPool* /*pPool*/) co
 
 const OUString & SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos)
 {
-    static std::array<OUString, 4> aMeasureTextHPosItem
+    static constexpr std::array<OUString, 4> aMeasureTextHPosItem
     {
         u"automatic"_ustr,
         u"left outside"_ustr,

sw/source/core/unocore/unoobj.cxx

@@ -2503,7 +2503,7 @@ void SAL_CALL SwXTextCursor::firePropertiesChangeEvent(
 }
 
 // para specific attribute ranges
-static sal_uInt16 g_ParaResetableSetRange[] = {
+const sal_uInt16 g_ParaResetableSetRange[] = {
     RES_FRMATR_BEGIN, RES_FRMATR_END-1,
     RES_PARATR_BEGIN, RES_PARATR_END-1,
     RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1,
@@ -2512,7 +2512,7 @@ static sal_uInt16 g_ParaResetableSetRange[] = {
 };
 
 // selection specific attribute ranges
-static sal_uInt16 g_ResetableSetRange[] = {
+const sal_uInt16 g_ResetableSetRange[] = {
     RES_CHRATR_BEGIN, RES_CHRATR_END-1,
     RES_TXTATR_INETFMT, RES_TXTATR_INETFMT,
     RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT,

unotools/source/misc/fontcvt.cxx

@@ -1332,7 +1332,7 @@ const RecodeTable aAppleSymbolRecodeTable[] = {
     {"symbol",         {aAdobeSymbolToAppleSymbolTab, u"AppleSymbol"_ustr, nullptr}}
 };
 
-static ConvertChar aImplStarSymbolCvt = { nullptr, u"StarBats"_ustr, ImplStarSymbolToStarBats };
+const ConvertChar aImplStarSymbolCvt = { nullptr, u"StarBats"_ustr, ImplStarSymbolToStarBats };
 
 const ConvertChar* ConvertChar::GetRecodeData( std::u16string_view rOrgFontName, std::u16string_view rMapFontName )
 {