xmloff: prefix members of SvxXMLListStyleContext, SvxXMLNumRuleExport, ...

... XMLConstantsPropertyHandler and XMLTextMasterPageContext

See tdf#94879 for motivation.

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

8 files changed, 78 insertions, 78 deletions

diff --git a/include/xmloff/XMLConstantsPropertyHandler.hxx b/include/xmloff/XMLConstantsPropertyHandler.hxx
index 5db0aa63f675..7152c7180932 100644
--- a/include/xmloff/XMLConstantsPropertyHandler.hxx
+++ b/include/xmloff/XMLConstantsPropertyHandler.hxx
@@ -34,14 +34,14 @@ struct SvXMLEnumMapEntry;
 */
 class XMLOFF_DLLPUBLIC XMLConstantsPropertyHandler: public XMLPropertyHandler
 {
-    const SvXMLEnumMapEntry<sal_uInt16> *pMap;
-    const enum ::xmloff::token::XMLTokenEnum eDefault;
+    const SvXMLEnumMapEntry<sal_uInt16> *m_pMap;
+    const enum ::xmloff::token::XMLTokenEnum m_eDefault;
 
 public:
     template<typename EnumT>
     XMLConstantsPropertyHandler( const SvXMLEnumMapEntry<EnumT> *pM,
                                  enum ::xmloff::token::XMLTokenEnum eDflt)
-     : pMap(reinterpret_cast<const SvXMLEnumMapEntry<sal_uInt16>*>(pM)), eDefault(eDflt) {}
+     : m_pMap(reinterpret_cast<const SvXMLEnumMapEntry<sal_uInt16>*>(pM)), m_eDefault(eDflt) {}
 
     // Just needed for virtual destruction
     virtual ~XMLConstantsPropertyHandler() override;
diff --git a/include/xmloff/XMLTextMasterPageContext.hxx b/include/xmloff/XMLTextMasterPageContext.hxx
index d39159890788..36243d6005b5 100644
--- a/include/xmloff/XMLTextMasterPageContext.hxx
+++ b/include/xmloff/XMLTextMasterPageContext.hxx
@@ -31,24 +31,24 @@ namespace com::sun::star {
 
 class XMLOFF_DLLPUBLIC XMLTextMasterPageContext : public SvXMLStyleContext
 {
-    OUString       sFollow;
-    OUString       sPageMasterName;
+    OUString       m_sFollow;
+    OUString       m_sPageMasterName;
     OUString m_sDrawingPageStyle;
 
-    css::uno::Reference < css::style::XStyle > xStyle;
+    css::uno::Reference < css::style::XStyle > m_xStyle;
 
-    bool bInsertHeader;
-    bool bInsertFooter;
-    bool bInsertHeaderLeft;
-    bool bInsertFooterLeft;
-    bool bInsertHeaderFirst;
-    bool bInsertFooterFirst;
-    bool bHeaderInserted;
-    bool bFooterInserted;
+    bool m_bInsertHeader;
+    bool m_bInsertFooter;
+    bool m_bInsertHeaderLeft;
+    bool m_bInsertFooterLeft;
+    bool m_bInsertHeaderFirst;
+    bool m_bInsertFooterFirst;
+    bool m_bHeaderInserted;
+    bool m_bFooterInserted;
 
     SAL_DLLPRIVATE css::uno::Reference< css::style::XStyle > Create();
 protected:
-    const css::uno::Reference< css::style::XStyle >& GetStyle() const { return xStyle; }
+    const css::uno::Reference< css::style::XStyle >& GetStyle() const { return m_xStyle; }
 public:
 
 
diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx
index 85f78047ee80..705af6e78d0c 100644
--- a/include/xmloff/xmlnume.hxx
+++ b/include/xmloff/xmlnume.hxx
@@ -37,7 +37,7 @@ class XMLTextListAutoStylePool;
 
 class XMLOFF_DLLPUBLIC SvxXMLNumRuleExport final
 {
-    SvXMLExport& rExport;
+    SvXMLExport& m_rExport;
     // Boolean indicating, if properties for position-and-space-mode LABEL_ALIGNMENT
     // are exported or not. (#i89178#)
     // These properties have been introduced in ODF 1.2. Thus, its export have
@@ -52,7 +52,7 @@ class XMLOFF_DLLPUBLIC SvxXMLNumRuleExport final
     SAL_DLLPRIVATE void exportStyle( const css::uno::Reference< css::style::XStyle >& rStyle );
     SAL_DLLPRIVATE void exportOutline();
 
-    SvXMLExport& GetExport() { return rExport; }
+    SvXMLExport& GetExport() { return m_rExport; }
 
 public:
 
diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index 4adfd437b95d..e79978f2e77d 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -36,12 +36,12 @@ typedef std::vector<rtl::Reference<SvxXMLListLevelStyleContext_Impl>> SvxXMLList
 class XMLOFF_DLLPUBLIC SvxXMLListStyleContext final
     : public SvXMLStyleContext
 {
-    css::uno::Reference< css::container::XIndexReplace > xNumRules;
+    css::uno::Reference< css::container::XIndexReplace > m_xNumRules;
 
-    std::unique_ptr<SvxXMLListStyle_Impl> pLevelStyles;
+    std::unique_ptr<SvxXMLListStyle_Impl> m_pLevelStyles;
 
-    bool                        bConsecutive : 1;
-    bool                        bOutline : 1;
+    bool                        m_bConsecutive : 1;
+    bool                        m_bOutline : 1;
 
     SAL_DLLPRIVATE virtual void SetAttribute( sal_Int32 nElement,
                                const OUString& rValue ) override;
@@ -61,7 +61,7 @@ public:
             const css::uno::Reference< css::container::XIndexReplace> & rNumRule) const;
 
     const css::uno::Reference< css::container::XIndexReplace >& GetNumRules() const
-        { return xNumRules; }
+        { return m_xNumRules; }
 
     static css::uno::Reference< css::container::XIndexReplace >
     CreateNumRule(
diff --git a/xmloff/source/style/XMLConstantsPropertyHandler.cxx b/xmloff/source/style/XMLConstantsPropertyHandler.cxx
index a5467f247354..54145a46f8fc 100644
--- a/xmloff/source/style/XMLConstantsPropertyHandler.cxx
+++ b/xmloff/source/style/XMLConstantsPropertyHandler.cxx
@@ -36,7 +36,7 @@ bool XMLConstantsPropertyHandler::importXML(
 {
     sal_uInt16 nEnum;
     bool bRet = SvXMLUnitConverter::convertEnum(
-        nEnum, rStrImpValue, pMap );
+        nEnum, rStrImpValue, m_pMap );
 
     if( bRet )
         rValue <<= static_cast<sal_Int16>(nEnum);
@@ -71,7 +71,7 @@ bool XMLConstantsPropertyHandler::exportXML(
             OUStringBuffer aOut;
 
             bRet = SvXMLUnitConverter::convertEnum(
-                aOut, nConst, pMap, eDefault );
+                aOut, nConst, m_pMap, m_eDefault );
 
             rStrExpValue = aOut.makeStringAndClear();
         }
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 9ec9350374db..8280ce2f47be 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -622,7 +622,7 @@ constexpr OUStringLiteral gsIsPhysical( u"IsPhysical" );
 constexpr OUStringLiteral gsIsContinuousNumbering( u"IsContinuousNumbering" );
 
 SvxXMLNumRuleExport::SvxXMLNumRuleExport( SvXMLExport& rExp ) :
-    rExport( rExp ),
+    m_rExport( rExp ),
     // Let list style creation depend on Load/Save option "ODF format version" (#i89178#)
     mbExportPositionAndSpaceModeLabelAlignment( true )
 {
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index f75a325ba0de..3e8b6fe7253d 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -832,7 +832,7 @@ void SvxXMLListStyleContext::SetAttribute( sal_Int32 nElement,
 {
     if( nElement == XML_ELEMENT(TEXT, XML_CONSECUTIVE_NUMBERING) )
     {
-        bConsecutive = IsXMLToken( rValue, XML_TRUE );
+        m_bConsecutive = IsXMLToken( rValue, XML_TRUE );
     }
     else
     {
@@ -847,8 +847,8 @@ constexpr OUStringLiteral sIsContinuousNumbering( u"IsContinuousNumbering"  );
 SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport,
         bool bOutl )
 :   SvXMLStyleContext( rImport, bOutl ? XmlStyleFamily::TEXT_OUTLINE : XmlStyleFamily::TEXT_LIST )
-,   bConsecutive( false )
-,   bOutline( bOutl )
+,   m_bConsecutive( false )
+,   m_bOutline( bOutl )
 {
 }
 
@@ -858,7 +858,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SvxXMLListStyleContext
         sal_Int32 nElement,
         const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
 {
-    if( bOutline
+    if( m_bOutline
         ? nElement == XML_ELEMENT(TEXT, XML_OUTLINE_LEVEL_STYLE)
         : ( nElement == XML_ELEMENT(TEXT, XML_LIST_LEVEL_STYLE_NUMBER) ||
             nElement == XML_ELEMENT(TEXT, XML_LIST_LEVEL_STYLE_BULLET) ||
@@ -866,9 +866,9 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SvxXMLListStyleContext
     {
         rtl::Reference<SvxXMLListLevelStyleContext_Impl> xLevelStyle{
             new SvxXMLListLevelStyleContext_Impl( GetImport(), nElement, xAttrList )};
-        if( !pLevelStyles )
-            pLevelStyles = std::make_unique<SvxXMLListStyle_Impl>();
-        pLevelStyles->push_back( xLevelStyle );
+        if( !m_pLevelStyles )
+            m_pLevelStyles = std::make_unique<SvxXMLListStyle_Impl>();
+        m_pLevelStyles->push_back( xLevelStyle );
 
         return xLevelStyle;
     }
@@ -881,10 +881,10 @@ void SvxXMLListStyleContext::FillUnoNumRule(
 {
     try
     {
-        if( pLevelStyles && rNumRule.is() )
+        if( m_pLevelStyles && rNumRule.is() )
         {
             sal_Int32 l_nLevels = rNumRule->getCount();
-            for (const auto& pLevelStyle : *pLevelStyles)
+            for (const auto& pLevelStyle : *m_pLevelStyles)
             {
                 sal_Int32 nLevel = pLevelStyle->GetLevel();
                 if( nLevel >= 0 && nLevel < l_nLevels )
@@ -903,7 +903,7 @@ void SvxXMLListStyleContext::FillUnoNumRule(
         if( xPropSetInfo.is() &&
             xPropSetInfo->hasPropertyByName( sIsContinuousNumbering ) )
         {
-            xPropSet->setPropertyValue( sIsContinuousNumbering, Any(bConsecutive) );
+            xPropSet->setPropertyValue( sIsContinuousNumbering, Any(m_bConsecutive) );
         }
     }
     catch (const Exception&)
@@ -914,7 +914,7 @@ void SvxXMLListStyleContext::FillUnoNumRule(
 
 void SvxXMLListStyleContext::CreateAndInsertLate( bool bOverwrite )
 {
-    if( bOutline )
+    if( m_bOutline )
     {
         if( bOverwrite )
         {
@@ -987,11 +987,11 @@ void SvxXMLListStyleContext::CreateAndInsertLate( bool bOverwrite )
                                              GetName(), rName );
 
         Any aAny = xPropSet->getPropertyValue( sNumberingRules );
-        aAny >>= xNumRules;
+        aAny >>= m_xNumRules;
         if( bOverwrite || bNew )
         {
-            FillUnoNumRule(xNumRules);
-            xPropSet->setPropertyValue( sNumberingRules, Any(xNumRules) );
+            FillUnoNumRule(m_xNumRules);
+            xPropSet->setPropertyValue( sNumberingRules, Any(m_xNumRules) );
         }
         else
         {
@@ -1004,20 +1004,20 @@ void SvxXMLListStyleContext::CreateAndInsertLate( bool bOverwrite )
 
 void SvxXMLListStyleContext::CreateAndInsertAuto() const
 {
-    SAL_WARN_IF( bOutline, "xmloff", "Outlines cannot be inserted here" );
-    SAL_WARN_IF( xNumRules.is(), "xmloff", "Numbering Rule is existing already" );
+    SAL_WARN_IF( m_bOutline, "xmloff", "Outlines cannot be inserted here" );
+    SAL_WARN_IF( m_xNumRules.is(), "xmloff", "Numbering Rule is existing already" );
 
     const OUString& rName = GetName();
-    if( bOutline || xNumRules.is() || rName.isEmpty() )
+    if( m_bOutline || m_xNumRules.is() || rName.isEmpty() )
     {
         const_cast<SvxXMLListStyleContext *>(this)->SetValid( false );
         return;
     }
 
-    const_cast<SvxXMLListStyleContext *>(this)->xNumRules = CreateNumRule(
+    const_cast<SvxXMLListStyleContext *>(this)->m_xNumRules = CreateNumRule(
         GetImport().GetModel() );
 
-    FillUnoNumRule(xNumRules);
+    FillUnoNumRule(m_xNumRules);
 }
 
 Reference < XIndexReplace > SvxXMLListStyleContext::CreateNumRule(
diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx
index f9584cc81d23..73048a4e4685 100644
--- a/xmloff/source/text/XMLTextMasterPageContext.cxx
+++ b/xmloff/source/text/XMLTextMasterPageContext.cxx
@@ -72,14 +72,14 @@ XMLTextMasterPageContext::XMLTextMasterPageContext( SvXMLImport& rImport,
         const Reference< XFastAttributeList > & xAttrList,
         bool bOverwrite )
 :   SvXMLStyleContext( rImport, XmlStyleFamily::MASTER_PAGE )
-,   bInsertHeader( false )
-,   bInsertFooter( false )
-,   bInsertHeaderLeft( false )
-,   bInsertFooterLeft( false )
-,   bInsertHeaderFirst( false )
-,   bInsertFooterFirst( false )
-,   bHeaderInserted( false )
-,   bFooterInserted( false )
+,   m_bInsertHeader( false )
+,   m_bInsertFooter( false )
+,   m_bInsertHeaderLeft( false )
+,   m_bInsertFooterLeft( false )
+,   m_bInsertHeaderFirst( false )
+,   m_bInsertFooterFirst( false )
+,   m_bHeaderInserted( false )
+,   m_bFooterInserted( false )
 {
     OUString sName, sDisplayName;
     for (auto &aIter : sax_fastparser::castToFastAttributeList( xAttrList ))
@@ -94,10 +94,10 @@ XMLTextMasterPageContext::XMLTextMasterPageContext( SvXMLImport& rImport,
                 sDisplayName = aValue;
                 break;
             case XML_ELEMENT(STYLE, XML_NEXT_STYLE_NAME):
-                sFollow = aValue;
+                m_sFollow = aValue;
                 break;
             case XML_ELEMENT(STYLE, XML_PAGE_LAYOUT_NAME):
-                sPageMasterName = aValue;
+                m_sPageMasterName = aValue;
                 break;
             case XML_ELEMENT(DRAW, XML_STYLE_NAME):
                 m_sDrawingPageStyle = aValue;
@@ -130,19 +130,19 @@ XMLTextMasterPageContext::XMLTextMasterPageContext( SvXMLImport& rImport,
     if( xPageStyles->hasByName( sDisplayName ) )
     {
         aAny = xPageStyles->getByName( sDisplayName );
-        aAny >>= xStyle;
+        aAny >>= m_xStyle;
     }
     else
     {
-        xStyle = Create();
-        if( !xStyle.is() )
+        m_xStyle = Create();
+        if( !m_xStyle.is() )
             return;
 
-        xPageStyles->insertByName( sDisplayName, Any(xStyle) );
+        xPageStyles->insertByName( sDisplayName, Any(m_xStyle) );
         bNew = true;
     }
 
-    Reference < XPropertySet > xPropSet( xStyle, UNO_QUERY );
+    Reference < XPropertySet > xPropSet( m_xStyle, UNO_QUERY );
     Reference< XPropertySetInfo > xPropSetInfo =
                 xPropSet->getPropertySetInfo();
     OUString sIsPhysical( "IsPhysical" );
@@ -169,9 +169,9 @@ XMLTextMasterPageContext::XMLTextMasterPageContext( SvXMLImport& rImport,
     if ( xPropSetInfo->hasPropertyByName( "GridPrint" ) )
         xPropSet->setPropertyValue( "GridPrint", Any(false) );
 
-    bInsertHeader = bInsertFooter = true;
-    bInsertHeaderLeft = bInsertFooterLeft = true;
-    bInsertHeaderFirst = bInsertFooterFirst = true;
+    m_bInsertHeader = m_bInsertFooter = true;
+    m_bInsertHeaderLeft = m_bInsertFooterLeft = true;
+    m_bInsertHeaderFirst = m_bInsertFooterFirst = true;
 }
 
 XMLTextMasterPageContext::~XMLTextMasterPageContext()
@@ -188,40 +188,40 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLTextMasterPageConte
     switch( nElement )
     {
     case XML_ELEMENT(STYLE, XML_HEADER):
-        if( bInsertHeader && !bHeaderInserted )
+        if( m_bInsertHeader && !m_bHeaderInserted )
         {
             bInsert = true;
-            bHeaderInserted = true;
+            m_bHeaderInserted = true;
         }
         break;
     case XML_ELEMENT(STYLE, XML_FOOTER):
-        if( bInsertFooter && !bFooterInserted )
+        if( m_bInsertFooter && !m_bFooterInserted )
         {
             bInsert = bFooter = true;
-            bFooterInserted = true;
+            m_bFooterInserted = true;
         }
         break;
     case XML_ELEMENT(STYLE, XML_HEADER_LEFT):
-        if( bInsertHeaderLeft && bHeaderInserted )
+        if( m_bInsertHeaderLeft && m_bHeaderInserted )
             bInsert = bLeft = true;
         break;
     case XML_ELEMENT(STYLE, XML_FOOTER_LEFT):
-        if( bInsertFooterLeft && bFooterInserted )
+        if( m_bInsertFooterLeft && m_bFooterInserted )
             bInsert = bFooter = bLeft = true;
         break;
     case XML_ELEMENT(LO_EXT, XML_HEADER_FIRST):
     case XML_ELEMENT(STYLE, XML_HEADER_FIRST):
-        if( bInsertHeaderFirst && bHeaderInserted )
+        if( m_bInsertHeaderFirst && m_bHeaderInserted )
             bInsert = bFirst = true;
         break;
     case XML_ELEMENT(LO_EXT, XML_FOOTER_FIRST):
     case XML_ELEMENT(STYLE, XML_FOOTER_FIRST):
-        if( bInsertFooterFirst && bFooterInserted )
+        if( m_bInsertFooterFirst && m_bFooterInserted )
             bInsert = bFooter = bFirst = true;
         break;
     }
 
-    if( bInsert && xStyle.is() )
+    if( bInsert && m_xStyle.is() )
     {
         xContext = CreateHeaderFooterContext( nElement, xAttrList,
                                               bFooter, bLeft, bFirst );
@@ -237,25 +237,25 @@ SvXMLImportContext *XMLTextMasterPageContext::CreateHeaderFooterContext(
             const bool bLeft,
             const bool bFirst )
 {
-    Reference < XPropertySet > xPropSet( xStyle, UNO_QUERY );
+    Reference < XPropertySet > xPropSet( m_xStyle, UNO_QUERY );
     return new XMLTextHeaderFooterContext( GetImport(), xPropSet, bFooter, bLeft, bFirst );
 }
 
 void XMLTextMasterPageContext::Finish( bool bOverwrite )
 {
-    if( !(xStyle.is() && (IsNew() || bOverwrite)) )
+    if( !(m_xStyle.is() && (IsNew() || bOverwrite)) )
         return;
 
-    Reference < XPropertySet > xPropSet( xStyle, UNO_QUERY );
+    Reference < XPropertySet > xPropSet( m_xStyle, UNO_QUERY );
     XMLPropStyleContext * pDrawingPageStyle(nullptr);
     if (!m_sDrawingPageStyle.isEmpty())
     {
         pDrawingPageStyle = GetImport().GetTextImport()->FindDrawingPage(m_sDrawingPageStyle);
     }
     PageStyleContext * pPageLayout(nullptr);
-    if( !sPageMasterName.isEmpty() )
+    if( !m_sPageMasterName.isEmpty() )
     {
-        pPageLayout = static_cast<PageStyleContext *>(GetImport().GetTextImport()->FindPageMaster(sPageMasterName));
+        pPageLayout = static_cast<PageStyleContext *>(GetImport().GetTextImport()->FindPageMaster(m_sPageMasterName));
     }
     if (pPageLayout)
     {
@@ -278,10 +278,10 @@ void XMLTextMasterPageContext::Finish( bool bOverwrite )
     {
         OUString sDisplayFollow(
             GetImport().GetStyleDisplayName(
-                    XmlStyleFamily::MASTER_PAGE, sFollow ) );
+                    XmlStyleFamily::MASTER_PAGE, m_sFollow ) );
         if( sDisplayFollow.isEmpty() ||
             !xPageStyles->hasByName( sDisplayFollow ) )
-            sDisplayFollow = xStyle->getName();
+            sDisplayFollow = m_xStyle->getName();
 
         Any aAny = xPropSet->getPropertyValue( gsFollowStyle );
         OUString sCurrFollow;