From d9a276bc6aaf66241e3a0b5d53b1e8d2dd238d7e Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.com>
Date: Mon, 8 May 2023 06:01:13 +0200
Subject: sw: prefix members of ProgressBarHelper, SvI18NMapEntry_Key, ...

... XMLBase64ImportContext and XMLErrors

See tdf#94879 for motivation.

Change-Id: Ic8d1b3515727981c50d8f3a64fe6bf030f0521fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151491
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
 xmloff/source/core/ProgressBarHelper.cxx      | 64 +++++++++++++--------------
 xmloff/source/core/XMLBase64ImportContext.cxx |  6 +--
 xmloff/source/core/xmlerror.cxx               |  6 +--
 3 files changed, 38 insertions(+), 38 deletions(-)

(limited to 'xmloff')

diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx
index 61248c06e8df..3ff70fb0434d 100644
--- a/xmloff/source/core/ProgressBarHelper.cxx
+++ b/xmloff/source/core/ProgressBarHelper.cxx
@@ -29,15 +29,15 @@ const float fProgressStep = 0.5;
 
 ProgressBarHelper::ProgressBarHelper(css::uno::Reference < css::task::XStatusIndicator> xTempStatusIndicator,
                                     const bool bTempStrict)
-: xStatusIndicator(std::move(xTempStatusIndicator))
-, nRange(nDefaultProgressBarRange)
-, nReference(100)
-, nValue(0)
-, fOldPercent(0.0)
-, bStrict(bTempStrict)
-, bRepeat(true)
+: m_xStatusIndicator(std::move(xTempStatusIndicator))
+, m_nRange(nDefaultProgressBarRange)
+, m_nReference(100)
+, m_nValue(0)
+, m_fOldPercent(0.0)
+, m_bStrict(bTempStrict)
+, m_bRepeat(true)
 #ifdef DBG_UTIL
-, bFailure(false)
+, m_bFailure(false)
 #endif
 {
 }
@@ -48,59 +48,59 @@ ProgressBarHelper::~ProgressBarHelper()
 
 void ProgressBarHelper::ChangeReference(sal_Int32 nNewReference)
 {
-    if((nNewReference <= 0) || (nNewReference == nReference))
+    if((nNewReference <= 0) || (nNewReference == m_nReference))
         return;
 
-    if (nReference)
+    if (m_nReference)
     {
-        double fPercent(static_cast<double>(nNewReference) / nReference);
-        double fValue(nValue * fPercent);
-        nValue = static_cast<sal_Int32>(fValue);
-        nReference = nNewReference;
+        double fPercent(static_cast<double>(nNewReference) / m_nReference);
+        double fValue(m_nValue * fPercent);
+        m_nValue = static_cast<sal_Int32>(fValue);
+        m_nReference = nNewReference;
     }
     else
     {
-        nReference = nNewReference;
-        nValue = 0;
+        m_nReference = nNewReference;
+        m_nValue = 0;
     }
 }
 
 void ProgressBarHelper::SetValue(sal_Int32 nTempValue)
 {
-    if (!xStatusIndicator.is() || (nReference <= 0))
+    if (!m_xStatusIndicator.is() || (m_nReference <= 0))
         return;
 
-    if ((nTempValue >= nValue) && (!bStrict || (nTempValue <= nReference)))
+    if ((nTempValue >= m_nValue) && (!m_bStrict || (nTempValue <= m_nReference)))
     {
         // #91317# no progress bar with values > 100%
-        if (nTempValue > nReference)
+        if (nTempValue > m_nReference)
         {
-            if (!bRepeat)
-                nValue = nReference;
+            if (!m_bRepeat)
+                m_nValue = m_nReference;
             else
             {
-                xStatusIndicator->reset();
-                nValue = 0;
+                m_xStatusIndicator->reset();
+                m_nValue = 0;
             }
         }
         else
-            nValue = nTempValue;
+            m_nValue = nTempValue;
 
-        double fValue(nValue);
-        double fNewValue ((fValue * nRange) / nReference);
+        double fValue(m_nValue);
+        double fNewValue ((fValue * m_nRange) / m_nReference);
 
-        double fPercent((fNewValue * 100) / nRange);
-        if (fPercent >= (fOldPercent + fProgressStep) || fPercent < fOldPercent)
+        double fPercent((fNewValue * 100) / m_nRange);
+        if (fPercent >= (m_fOldPercent + fProgressStep) || fPercent < m_fOldPercent)
         {
-            xStatusIndicator->setValue(static_cast<sal_Int32>(fNewValue));
-            fOldPercent = fPercent;
+            m_xStatusIndicator->setValue(static_cast<sal_Int32>(fNewValue));
+            m_fOldPercent = fPercent;
         }
     }
 #ifdef DBG_UTIL
-    else if (!bFailure)
+    else if (!m_bFailure)
     {
         OSL_FAIL("tried to set a wrong value on the progressbar");
-        bFailure = true;
+        m_bFailure = true;
     }
 #endif
 }
diff --git a/xmloff/source/core/XMLBase64ImportContext.cxx b/xmloff/source/core/XMLBase64ImportContext.cxx
index 81d2498bbabd..1476733642a3 100644
--- a/xmloff/source/core/XMLBase64ImportContext.cxx
+++ b/xmloff/source/core/XMLBase64ImportContext.cxx
@@ -34,7 +34,7 @@ XMLBase64ImportContext::XMLBase64ImportContext(
         SvXMLImport& rImport,
         const Reference< XOutputStream >& rOut ) :
     SvXMLImportContext( rImport ),
-    xOut( rOut )
+    m_xOut( rOut )
 {
 }
 
@@ -49,10 +49,10 @@ void XMLBase64ImportContext::endFastElement(sal_Int32 )
     {
         Sequence< sal_Int8 > aBuffer( (sChars.size() / 4) * 3 );
         ::comphelper::Base64::decodeSomeChars( aBuffer, sChars );
-        xOut->writeBytes( aBuffer );
+        m_xOut->writeBytes( aBuffer );
     }
     maCharBuffer.setLength(0);
-    xOut->closeOutput();
+    m_xOut->closeOutput();
 }
 
 void XMLBase64ImportContext::characters( const OUString& rChars )
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx
index 9cda2297e0af..df99c4a281fb 100644
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@@ -96,7 +96,7 @@ void XMLErrors::AddRecord(
     const OUString& rPublicId,
     const OUString& rSystemId )
 {
-    aErrors.emplace_back( nId, rParams, rExceptionMessage,
+    m_aErrors.emplace_back( nId, rParams, rExceptionMessage,
                                     nRow, nColumn, rPublicId, rSystemId );
 
 #ifdef DBG_UTIL
@@ -186,12 +186,12 @@ void XMLErrors::AddRecord(
 void XMLErrors::ThrowErrorAsSAXException(sal_Int32 nIdMask)
 {
     // search first error/warning that matches the nIdMask
-    for( const auto& rError : aErrors )
+    for( const auto& rError : m_aErrors )
     {
         if ( (rError.nId & nIdMask) != 0 )
         {
             // we throw the error
-            ErrorRecord& rErr = aErrors[0];
+            ErrorRecord& rErr = m_aErrors[0];
             throw SAXParseException(
                 rErr.sExceptionMessage, nullptr, Any(rErr.aParams),
                 rErr.sPublicId, rErr.sSystemId, rErr.nRow, rErr.nColumn );
-- 
cgit