sw: rename static members in SwStyleNameMapper

Other code in sw seems to use the 'm_' prefix only for non-static
members, while the most used convention for static members is 's_', so
use that here as well.

Change-Id: Ic7dd5c454e98753a9489664ee022e05ef743b863
Reviewed-on: https://gerrit.libreoffice.org/29958Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

sw/inc/SwStyleNameMapper.hxx

@@ -82,49 +82,49 @@ class SwStyleNameMapper
 
 protected:
     // UI Name tables
-    static std::vector<OUString> *m_pTextUINameArray,
-                            *m_pListsUINameArray,
-                            *m_pExtraUINameArray,
-                            *m_pRegisterUINameArray,
-                            *m_pDocUINameArray,
-                            *m_pHTMLUINameArray,
-                            *m_pFrameFormatUINameArray,
-                            *m_pChrFormatUINameArray,
-                            *m_pHTMLChrFormatUINameArray,
-                            *m_pPageDescUINameArray,
-                            *m_pNumRuleUINameArray,
-                            *m_pTableStyleUINameArray,
-                            *m_pCellStyleUINameArray,
+    static std::vector<OUString> *s_pTextUINameArray,
+                            *s_pListsUINameArray,
+                            *s_pExtraUINameArray,
+                            *s_pRegisterUINameArray,
+                            *s_pDocUINameArray,
+                            *s_pHTMLUINameArray,
+                            *s_pFrameFormatUINameArray,
+                            *s_pChrFormatUINameArray,
+                            *s_pHTMLChrFormatUINameArray,
+                            *s_pPageDescUINameArray,
+                            *s_pNumRuleUINameArray,
+                            *s_pTableStyleUINameArray,
+                            *s_pCellStyleUINameArray,
     // Programmatic Name tables
-                            *m_pTextProgNameArray,
-                            *m_pListsProgNameArray,
-                            *m_pExtraProgNameArray,
-                            *m_pRegisterProgNameArray,
-                            *m_pDocProgNameArray,
-                            *m_pHTMLProgNameArray,
-                            *m_pFrameFormatProgNameArray,
-                            *m_pChrFormatProgNameArray,
-                            *m_pHTMLChrFormatProgNameArray,
-                            *m_pPageDescProgNameArray,
-                            *m_pNumRuleProgNameArray,
-                            *m_pTableStyleProgNameArray,
-                            *m_pCellStyleProgNameArray;
-
-    static NameToIdHash     *m_pParaUIMap,
-                            *m_pCharUIMap,
-                            *m_pPageUIMap,
-                            *m_pFrameUIMap,
-                            *m_pNumRuleUIMap,
-                            *m_pTableStyleUIMap,
-                            *m_pCellStyleUIMap,
-
-                            *m_pParaProgMap,
-                            *m_pCharProgMap,
-                            *m_pPageProgMap,
-                            *m_pFrameProgMap,
-                            *m_pNumRuleProgMap,
-                            *m_pTableStyleProgMap,
-                            *m_pCellStyleProgMap;
+                            *s_pTextProgNameArray,
+                            *s_pListsProgNameArray,
+                            *s_pExtraProgNameArray,
+                            *s_pRegisterProgNameArray,
+                            *s_pDocProgNameArray,
+                            *s_pHTMLProgNameArray,
+                            *s_pFrameFormatProgNameArray,
+                            *s_pChrFormatProgNameArray,
+                            *s_pHTMLChrFormatProgNameArray,
+                            *s_pPageDescProgNameArray,
+                            *s_pNumRuleProgNameArray,
+                            *s_pTableStyleProgNameArray,
+                            *s_pCellStyleProgNameArray;
+
+    static NameToIdHash     *s_pParaUIMap,
+                            *s_pCharUIMap,
+                            *s_pPageUIMap,
+                            *s_pFrameUIMap,
+                            *s_pNumRuleUIMap,
+                            *s_pTableStyleUIMap,
+                            *s_pCellStyleUIMap,
+
+                            *s_pParaProgMap,
+                            *s_pCharProgMap,
+                            *s_pPageProgMap,
+                            *s_pFrameProgMap,
+                            *s_pNumRuleProgMap,
+                            *s_pTableStyleProgMap,
+                            *s_pCellStyleProgMap;
 
     static void fillNameFromId(sal_uInt16 nId, OUString &rName, bool bProgName);
     static const OUString& getNameFromId(sal_uInt16 nId, const OUString &rName,

sw/source/core/bastyp/init.cxx

@@ -780,43 +780,43 @@ void FinitCore()
 #endif
     delete SwDoc::mpACmpltWords;
 
-    delete SwStyleNameMapper::m_pTextUINameArray;
-    delete SwStyleNameMapper::m_pListsUINameArray;
-    delete SwStyleNameMapper::m_pExtraUINameArray;
-    delete SwStyleNameMapper::m_pRegisterUINameArray;
-    delete SwStyleNameMapper::m_pDocUINameArray;
-    delete SwStyleNameMapper::m_pHTMLUINameArray;
-    delete SwStyleNameMapper::m_pFrameFormatUINameArray;
-    delete SwStyleNameMapper::m_pChrFormatUINameArray;
-    delete SwStyleNameMapper::m_pHTMLChrFormatUINameArray;
-    delete SwStyleNameMapper::m_pPageDescUINameArray;
-    delete SwStyleNameMapper::m_pNumRuleUINameArray;
+    delete SwStyleNameMapper::s_pTextUINameArray;
+    delete SwStyleNameMapper::s_pListsUINameArray;
+    delete SwStyleNameMapper::s_pExtraUINameArray;
+    delete SwStyleNameMapper::s_pRegisterUINameArray;
+    delete SwStyleNameMapper::s_pDocUINameArray;
+    delete SwStyleNameMapper::s_pHTMLUINameArray;
+    delete SwStyleNameMapper::s_pFrameFormatUINameArray;
+    delete SwStyleNameMapper::s_pChrFormatUINameArray;
+    delete SwStyleNameMapper::s_pHTMLChrFormatUINameArray;
+    delete SwStyleNameMapper::s_pPageDescUINameArray;
+    delete SwStyleNameMapper::s_pNumRuleUINameArray;
 
     // Delete programmatic name arrays also
-    delete SwStyleNameMapper::m_pTextProgNameArray;
-    delete SwStyleNameMapper::m_pListsProgNameArray;
-    delete SwStyleNameMapper::m_pExtraProgNameArray;
-    delete SwStyleNameMapper::m_pRegisterProgNameArray;
-    delete SwStyleNameMapper::m_pDocProgNameArray;
-    delete SwStyleNameMapper::m_pHTMLProgNameArray;
-    delete SwStyleNameMapper::m_pFrameFormatProgNameArray;
-    delete SwStyleNameMapper::m_pChrFormatProgNameArray;
-    delete SwStyleNameMapper::m_pHTMLChrFormatProgNameArray;
-    delete SwStyleNameMapper::m_pPageDescProgNameArray;
-    delete SwStyleNameMapper::m_pNumRuleProgNameArray;
+    delete SwStyleNameMapper::s_pTextProgNameArray;
+    delete SwStyleNameMapper::s_pListsProgNameArray;
+    delete SwStyleNameMapper::s_pExtraProgNameArray;
+    delete SwStyleNameMapper::s_pRegisterProgNameArray;
+    delete SwStyleNameMapper::s_pDocProgNameArray;
+    delete SwStyleNameMapper::s_pHTMLProgNameArray;
+    delete SwStyleNameMapper::s_pFrameFormatProgNameArray;
+    delete SwStyleNameMapper::s_pChrFormatProgNameArray;
+    delete SwStyleNameMapper::s_pHTMLChrFormatProgNameArray;
+    delete SwStyleNameMapper::s_pPageDescProgNameArray;
+    delete SwStyleNameMapper::s_pNumRuleProgNameArray;
 
     // And finally, any hash tables that we used
-    delete SwStyleNameMapper::m_pParaUIMap;
-    delete SwStyleNameMapper::m_pCharUIMap;
-    delete SwStyleNameMapper::m_pPageUIMap;
-    delete SwStyleNameMapper::m_pFrameUIMap;
-    delete SwStyleNameMapper::m_pNumRuleUIMap;
-
-    delete SwStyleNameMapper::m_pParaProgMap;
-    delete SwStyleNameMapper::m_pCharProgMap;
-    delete SwStyleNameMapper::m_pPageProgMap;
-    delete SwStyleNameMapper::m_pFrameProgMap;
-    delete SwStyleNameMapper::m_pNumRuleProgMap;
+    delete SwStyleNameMapper::s_pParaUIMap;
+    delete SwStyleNameMapper::s_pCharUIMap;
+    delete SwStyleNameMapper::s_pPageUIMap;
+    delete SwStyleNameMapper::s_pFrameUIMap;
+    delete SwStyleNameMapper::s_pNumRuleUIMap;
+
+    delete SwStyleNameMapper::s_pParaProgMap;
+    delete SwStyleNameMapper::s_pCharProgMap;
+    delete SwStyleNameMapper::s_pPageProgMap;
+    delete SwStyleNameMapper::s_pFrameProgMap;
+    delete SwStyleNameMapper::s_pNumRuleProgMap;
 
     // delete all default attributes
     for(SfxPoolItem* pHt : aAttrTab)