sw: prefix members of XMLEventsImportContext, XMLFontStylesContext, ...

... XMLMarkerStyleExport and XMLMarkerStyleImport

See tdf#94879 for motivation.

Change-Id: Ief48236f16c5525c6bd49d78e6ba4f9643ef1214
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152376
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins

4 files changed, 28 insertions, 28 deletions

diff --git a/xmloff/source/forms/eventimport.cxx b/xmloff/source/forms/eventimport.cxx
index 02bfe7764a6b..ae909fd9e9c0 100644
--- a/xmloff/source/forms/eventimport.cxx
+++ b/xmloff/source/forms/eventimport.cxx
@@ -40,12 +40,12 @@ namespace xmloff
 
     void OFormEventsImportContext::endFastElement(sal_Int32 )
     {
-        Sequence< ScriptEventDescriptor > aTranslated(aCollectEvents.size());
+        Sequence< ScriptEventDescriptor > aTranslated(m_aCollectEvents.size());
         ScriptEventDescriptor* pTranslated = aTranslated.getArray();
 
         // loop through the collected events and translate them
         sal_Int32 nSeparatorPos = -1;
-        for ( const auto& rEvent : aCollectEvents )
+        for ( const auto& rEvent : m_aCollectEvents )
         {
             // the name of the event is built from ListenerType::EventMethod
             nSeparatorPos = rEvent.first.indexOf(EVENT_NAME_SEPARATOR);
diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx
index 10c8f55d97aa..0b236579f726 100644
--- a/xmloff/source/script/XMLEventsImportContext.cxx
+++ b/xmloff/source/script/XMLEventsImportContext.cxx
@@ -48,7 +48,7 @@ XMLEventsImportContext::XMLEventsImportContext(
     SvXMLImport& rImport,
     const Reference<XEventsSupplier> & xEventsSupplier) :
         SvXMLImportContext(rImport),
-        xEvents(xEventsSupplier->getEvents())
+        m_xEvents(xEventsSupplier->getEvents())
 {
 }
 
@@ -57,7 +57,7 @@ XMLEventsImportContext::XMLEventsImportContext(
     SvXMLImport& rImport,
     const Reference<XNameReplace> & xNameReplace) :
         SvXMLImportContext(rImport),
-        xEvents(xNameReplace)
+        m_xEvents(xNameReplace)
 {
 }
 
@@ -116,14 +116,14 @@ void XMLEventsImportContext::SetEvents(
 {
     if (xNameRepl.is())
     {
-        xEvents = xNameRepl;
+        m_xEvents = xNameRepl;
 
         // now iterate over vector and a) insert b) delete all elements
-        for(const auto& rEvent : aCollectEvents)
+        for(const auto& rEvent : m_aCollectEvents)
         {
             AddEventValues(rEvent.first, rEvent.second);
         }
-        aCollectEvents.clear();
+        m_aCollectEvents.clear();
     }
 }
 
@@ -135,11 +135,11 @@ void XMLEventsImportContext::GetEventSequence(
     // (This shouldn't take a lot of time, since this method should only get
     //  called if only one (or few) events are being expected)
 
-    auto aIter = std::find_if(aCollectEvents.begin(), aCollectEvents.end(),
+    auto aIter = std::find_if(m_aCollectEvents.begin(), m_aCollectEvents.end(),
         [&rName](EventNameValuesPair& rEvent) { return rEvent.first == rName; });
 
     // if we're not at the end, set the sequence
-    if (aIter != aCollectEvents.end())
+    if (aIter != m_aCollectEvents.end())
     {
         rSequence = aIter->second;
     }
@@ -150,14 +150,14 @@ void XMLEventsImportContext::AddEventValues(
     const Sequence<PropertyValue> & rValues )
 {
     // if we already have the events, set them; else just collect
-    if (xEvents.is())
+    if (m_xEvents.is())
     {
         // set event (if name is known)
-        if (xEvents->hasByName(rEventName))
+        if (m_xEvents->hasByName(rEventName))
         {
             try
             {
-                xEvents->replaceByName(rEventName, Any(rValues));
+                m_xEvents->replaceByName(rEventName, Any(rValues));
             } catch ( const IllegalArgumentException & rException )
             {
                 Sequence<OUString> aMsgParams { rEventName };
@@ -171,7 +171,7 @@ void XMLEventsImportContext::AddEventValues(
     else
     {
         EventNameValuesPair aPair(rEventName, rValues);
-        aCollectEvents.push_back(aPair);
+        m_aCollectEvents.push_back(aPair);
     }
 }
 
diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx
index 8f902feb9cbd..9cf9ecc9423e 100644
--- a/xmloff/source/style/MarkerStyle.cxx
+++ b/xmloff/source/style/MarkerStyle.cxx
@@ -40,7 +40,7 @@ using namespace ::xmloff::token;
 // Import
 
 XMLMarkerStyleImport::XMLMarkerStyleImport( SvXMLImport& rImp )
-    : rImport( rImp )
+    : m_rImport( rImp )
 {
 }
 
@@ -55,7 +55,7 @@ void XMLMarkerStyleImport::importXML(
 
     std::unique_ptr<SdXMLImExViewBox> xViewBox;
 
-    SvXMLUnitConverter& rUnitConverter = rImport.GetMM100UnitConverter();
+    SvXMLUnitConverter& rUnitConverter = m_rImport.GetMM100UnitConverter();
 
     OUString strPathData;
 
@@ -88,7 +88,7 @@ void XMLMarkerStyleImport::importXML(
     {
         basegfx::B2DPolyPolygon aPolyPolygon;
 
-        if(basegfx::utils::importFromSvgD(aPolyPolygon, strPathData, rImport.needFixPositionAfterZ(), nullptr))
+        if(basegfx::utils::importFromSvgD(aPolyPolygon, strPathData, m_rImport.needFixPositionAfterZ(), nullptr))
         {
             if(aPolyPolygon.count())
             {
@@ -122,7 +122,7 @@ void XMLMarkerStyleImport::importXML(
 
         if( !aDisplayName.isEmpty() )
         {
-            rImport.AddStyleDisplayName( XmlStyleFamily::SD_MARKER_ID, rStrName,
+            m_rImport.AddStyleDisplayName( XmlStyleFamily::SD_MARKER_ID, rStrName,
                                         aDisplayName );
             rStrName = aDisplayName;
         }
@@ -134,7 +134,7 @@ void XMLMarkerStyleImport::importXML(
 // Export
 
 XMLMarkerStyleExport::XMLMarkerStyleExport( SvXMLExport& rExp )
-    : rExport( rExp )
+    : m_rExport( rExp )
 {
 }
 
@@ -153,11 +153,11 @@ void XMLMarkerStyleExport::exportXML(
     // Name
     bool bEncoded(false);
 
-    rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_NAME, rExport.EncodeStyleName( rStrName, &bEncoded ) );
+    m_rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_NAME, m_rExport.EncodeStyleName( rStrName, &bEncoded ) );
 
     if( bEncoded )
     {
-        rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, rStrName );
+        m_rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, rStrName );
     }
 
     const basegfx::B2DPolyPolygon aPolyPolygon(
@@ -173,7 +173,7 @@ void XMLMarkerStyleExport::exportXML(
         aPolyPolygonRange.getMinY(),
         aPolyPolygonRange.getWidth(),
         aPolyPolygonRange.getHeight());
-    rExport.AddAttribute( XML_NAMESPACE_SVG, XML_VIEWBOX, aViewBox.GetExportString() );
+    m_rExport.AddAttribute( XML_NAMESPACE_SVG, XML_VIEWBOX, aViewBox.GetExportString() );
 
     // Pathdata
     const OUString aPolygonString(
@@ -184,10 +184,10 @@ void XMLMarkerStyleExport::exportXML(
             true));         // bHandleRelativeNextPointCompatible
 
     // write point array
-    rExport.AddAttribute(XML_NAMESPACE_SVG, XML_D, aPolygonString);
+    m_rExport.AddAttribute(XML_NAMESPACE_SVG, XML_D, aPolygonString);
 
     // Do Write
-    SvXMLElementExport rElem( rExport, XML_NAMESPACE_DRAW, XML_MARKER, true, false );
+    SvXMLElementExport rElem( m_rExport, XML_NAMESPACE_DRAW, XML_MARKER, true, false );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index 56d87c02cad4..dd495ce928c6 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -323,11 +323,11 @@ SvXMLStyleContext *XMLFontStylesContext::CreateStyleChildContext(
 XMLFontStylesContext::XMLFontStylesContext( SvXMLImport& rImport,
         rtl_TextEncoding eDfltEnc ) :
     SvXMLStylesContext( rImport ),
-    pFamilyNameHdl( new XMLFontFamilyNamePropHdl ),
-    pFamilyHdl( new XMLFontFamilyPropHdl ),
-    pPitchHdl( new XMLFontPitchPropHdl ),
-    pEncHdl( new XMLFontEncodingPropHdl ),
-    eDfltEncoding( eDfltEnc )
+    m_pFamilyNameHdl( new XMLFontFamilyNamePropHdl ),
+    m_pFamilyHdl( new XMLFontFamilyPropHdl ),
+    m_pPitchHdl( new XMLFontPitchPropHdl ),
+    m_pEncHdl( new XMLFontEncodingPropHdl ),
+    m_eDefaultEncoding( eDfltEnc )
 {
 }