writerfilter: replace 's_m_' prefixes with just 's_'

The intention was to replace m_ with s_ for static members, not to
prepend s_ to the existing prefix.

Reviewed-on: https://gerrit.libreoffice.org/24700
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit e9514bcc28caa83d39b40137ca09ebe83dc97e0c)

Change-Id: If8538061de8b1d22a89c8987201f4cae4ed484df

2 files changed, 30 insertions, 30 deletions

diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index cb7808575c3c..a23c181a3d3d 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -21,10 +21,10 @@ namespace writerfilter
 namespace rtftok
 {
 
-std::vector<RTFSymbol> RTFTokenizer::m_aRTFControlWords;
-bool RTFTokenizer::m_bControlWordsSorted;
-std::vector<RTFMathSymbol> RTFTokenizer::m_aRTFMathControlWords;
-bool RTFTokenizer::m_bMathControlWordsSorted;
+std::vector<RTFSymbol> RTFTokenizer::s_aRTFControlWords;
+bool RTFTokenizer::s_bControlWordsSorted;
+std::vector<RTFMathSymbol> RTFTokenizer::s_aRTFMathControlWords;
+bool RTFTokenizer::s_bMathControlWordsSorted;
 
 RTFTokenizer::RTFTokenizer(RTFListener& rImport, SvStream* pInStream, uno::Reference<task::XStatusIndicator> const& xStatusIndicator)
     : m_rImport(rImport),
@@ -35,17 +35,17 @@ RTFTokenizer::RTFTokenizer(RTFListener& rImport, SvStream* pInStream, uno::Refer
       m_nLineStartPos(0),
       m_nGroupStart(0)
 {
-    if (!RTFTokenizer::m_bControlWordsSorted)
+    if (!RTFTokenizer::s_bControlWordsSorted)
     {
-        RTFTokenizer::m_bControlWordsSorted = true;
-        m_aRTFControlWords = std::vector<RTFSymbol>(aRTFControlWords, aRTFControlWords + nRTFControlWords);
-        std::sort(m_aRTFControlWords.begin(), m_aRTFControlWords.end());
+        RTFTokenizer::s_bControlWordsSorted = true;
+        s_aRTFControlWords = std::vector<RTFSymbol>(aRTFControlWords, aRTFControlWords + nRTFControlWords);
+        std::sort(s_aRTFControlWords.begin(), s_aRTFControlWords.end());
     }
-    if (!RTFTokenizer::m_bMathControlWordsSorted)
+    if (!RTFTokenizer::s_bMathControlWordsSorted)
     {
-        RTFTokenizer::m_bMathControlWordsSorted = true;
-        m_aRTFMathControlWords = std::vector<RTFMathSymbol>(aRTFMathControlWords, aRTFMathControlWords + nRTFMathControlWords);
-        std::sort(m_aRTFMathControlWords.begin(), m_aRTFMathControlWords.end());
+        RTFTokenizer::s_bMathControlWordsSorted = true;
+        s_aRTFMathControlWords = std::vector<RTFMathSymbol>(aRTFMathControlWords, aRTFMathControlWords + nRTFMathControlWords);
+        std::sort(s_aRTFMathControlWords.begin(), s_aRTFMathControlWords.end());
     }
 }
 
@@ -271,11 +271,11 @@ RTFError RTFTokenizer::resolveKeyword()
 
 bool RTFTokenizer::lookupMathKeyword(RTFMathSymbol& rSymbol)
 {
-    std::vector<RTFMathSymbol>::iterator low = std::lower_bound(m_aRTFMathControlWords.begin(), m_aRTFMathControlWords.end(), rSymbol);
-    int i = low - m_aRTFMathControlWords.begin();
-    if (low == m_aRTFMathControlWords.end() || rSymbol < *low)
+    std::vector<RTFMathSymbol>::iterator low = std::lower_bound(s_aRTFMathControlWords.begin(), s_aRTFMathControlWords.end(), rSymbol);
+    int i = low - s_aRTFMathControlWords.begin();
+    if (low == s_aRTFMathControlWords.end() || rSymbol < *low)
         return false;
-    rSymbol = m_aRTFMathControlWords[i];
+    rSymbol = s_aRTFMathControlWords[i];
     return true;
 }
 
@@ -293,9 +293,9 @@ RTFError RTFTokenizer::dispatchKeyword(OString& rKeyword, bool bParam, int nPara
              "' with param? " << (bParam ? 1 : 0) <<" param val: '" << (bParam ? nParam : 0) << "'");
     RTFSymbol aSymbol;
     aSymbol.sKeyword = rKeyword.getStr();
-    std::vector<RTFSymbol>::iterator low = std::lower_bound(m_aRTFControlWords.begin(), m_aRTFControlWords.end(), aSymbol);
-    int i = low - m_aRTFControlWords.begin();
-    if (low == m_aRTFControlWords.end() || aSymbol < *low)
+    std::vector<RTFSymbol>::iterator low = std::lower_bound(s_aRTFControlWords.begin(), s_aRTFControlWords.end(), aSymbol);
+    int i = low - s_aRTFControlWords.begin();
+    if (low == s_aRTFControlWords.end() || aSymbol < *low)
     {
         SAL_INFO("writerfilter", OSL_THIS_FUNC << ": unknown keyword '\\" << rKeyword.getStr() << "'");
         RTFSkipDestination aSkip(m_rImport);
@@ -304,36 +304,36 @@ RTFError RTFTokenizer::dispatchKeyword(OString& rKeyword, bool bParam, int nPara
     }
 
     RTFError ret;
-    switch (m_aRTFControlWords[i].nControlType)
+    switch (s_aRTFControlWords[i].nControlType)
     {
     case CONTROL_FLAG:
         // flags ignore any parameter by definition
-        ret = m_rImport.dispatchFlag(m_aRTFControlWords[i].nIndex);
+        ret = m_rImport.dispatchFlag(s_aRTFControlWords[i].nIndex);
         if (ret != RTFError::OK)
             return ret;
         break;
     case CONTROL_DESTINATION:
         // same for destinations
-        ret = m_rImport.dispatchDestination(m_aRTFControlWords[i].nIndex);
+        ret = m_rImport.dispatchDestination(s_aRTFControlWords[i].nIndex);
         if (ret != RTFError::OK)
             return ret;
         break;
     case CONTROL_SYMBOL:
         // and symbols
-        ret = m_rImport.dispatchSymbol(m_aRTFControlWords[i].nIndex);
+        ret = m_rImport.dispatchSymbol(s_aRTFControlWords[i].nIndex);
         if (ret != RTFError::OK)
             return ret;
         break;
     case CONTROL_TOGGLE:
-        ret = m_rImport.dispatchToggle(m_aRTFControlWords[i].nIndex, bParam, nParam);
+        ret = m_rImport.dispatchToggle(s_aRTFControlWords[i].nIndex, bParam, nParam);
         if (ret != RTFError::OK)
             return ret;
         break;
     case CONTROL_VALUE:
         // Values require a parameter by definition, but Word doesn't respect this for \dibitmap.
-        if (bParam || m_aRTFControlWords[i].nIndex == RTF_DIBITMAP)
+        if (bParam || s_aRTFControlWords[i].nIndex == RTF_DIBITMAP)
         {
-            ret = m_rImport.dispatchValue(m_aRTFControlWords[i].nIndex, nParam);
+            ret = m_rImport.dispatchValue(s_aRTFControlWords[i].nIndex, nParam);
             if (ret != RTFError::OK)
                 return ret;
         }
diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx b/writerfilter/source/rtftok/rtftokenizer.hxx
index 8e831ecbd7ba..9701f65918d6 100644
--- a/writerfilter/source/rtftok/rtftokenizer.hxx
+++ b/writerfilter/source/rtftok/rtftokenizer.hxx
@@ -60,11 +60,11 @@ private:
     SvStream* m_pInStream;
     css::uno::Reference<css::task::XStatusIndicator> const& m_xStatusIndicator;
     // This is the same as aRTFControlWords, but sorted
-    static std::vector<RTFSymbol> m_aRTFControlWords;
-    static bool m_bControlWordsSorted;
+    static std::vector<RTFSymbol> s_aRTFControlWords;
+    static bool s_bControlWordsSorted;
     // This is the same as aRTFMathControlWords, but sorted
-    static std::vector<RTFMathSymbol> m_aRTFMathControlWords;
-    static bool m_bMathControlWordsSorted;
+    static std::vector<RTFMathSymbol> s_aRTFMathControlWords;
+    static bool s_bMathControlWordsSorted;
     /// Same as the size of the importer's states, except that this can be negative for invalid input.
     int m_nGroup;
     sal_Int32 m_nLineNumber;