[Libreoffice-commits] core.git: sw/source

[Miklos Vajna (via logerrit)]

 sw/source/core/inc/SwXMLBlockImport.hxx |    6 ++---
 sw/source/core/swg/SwXMLBlockImport.cxx |   34 +++++++++++++++-----------------
 2 files changed, 19 insertions(+), 21 deletions(-)

New commits:
commit 149743a124a3731cb98caf94190ef4a7deca9cb7
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Mon Dec 21 09:00:49 2020 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Dec 21 12:34:48 2020 +0100

    sw: prefix members of SwXMLBlockListImport, SwXMLTextBlockImport, ...
    
    ... SwXMLTextBlockParContext and SwXMLTextBlockTextContext
    
    See tdf#94879 for motivation.
    
    Change-Id: I85fb65a140381b258d51c2f35c5a8cf27d6dfa4b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108074
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins

diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx
index baa88d4fcefd..79b16b0791f7 100644
--- a/sw/source/core/inc/SwXMLBlockImport.hxx
+++ b/sw/source/core/inc/SwXMLBlockImport.hxx
@@ -33,7 +33,7 @@ class SwXMLTextBlocks;
 class SwXMLBlockListImport : public SvXMLImport
 {
 private:
-    SwXMLTextBlocks &rBlockList;
+    SwXMLTextBlocks &m_rBlockList;
 
 protected:
     // This method is called after the namespace map has been updated, but
@@ -48,7 +48,7 @@ public:
 
     SwXMLTextBlocks& getBlockList()
     {
-        return rBlockList;
+        return m_rBlockList;
     }
     virtual ~SwXMLBlockListImport()
         throw() override;
@@ -63,7 +63,7 @@ protected:
         const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override;
 
 public:
-    bool bTextOnly;
+    bool m_bTextOnly;
     OUString &m_rText;
     SwXMLTextBlockImport(
         const css::uno::Reference< css::uno::XComponentContext >& rContext,
diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx
index 8c94f68cb4c1..7b43b91ea3ab 100644
--- a/sw/source/core/swg/SwXMLBlockImport.cxx
+++ b/sw/source/core/swg/SwXMLBlockImport.cxx
@@ -92,7 +92,7 @@ public:
 class SwXMLTextBlockTextContext : public SvXMLImportContext
 {
 private:
-    SwXMLTextBlockImport & rLocalRef;
+    SwXMLTextBlockImport& m_rLocalRef;
 
 public:
     SwXMLTextBlockTextContext( SwXMLTextBlockImport& rImport );
@@ -105,7 +105,7 @@ public:
 class SwXMLTextBlockParContext : public SvXMLImportContext
 {
 private:
-    SwXMLTextBlockImport & rLocalRef;
+    SwXMLTextBlockImport& m_rLocalRef;
 
 public:
     SwXMLTextBlockParContext( SwXMLTextBlockImport & rImport );
@@ -230,10 +230,9 @@ SwXMLTextBlockDocumentContext::createFastChildContext( sal_Int32 Element,
     return nullptr;
 }
 
-SwXMLTextBlockTextContext::SwXMLTextBlockTextContext(
-    SwXMLTextBlockImport& rImport) :
-    SvXMLImportContext ( rImport ),
-    rLocalRef( rImport )
+SwXMLTextBlockTextContext::SwXMLTextBlockTextContext(SwXMLTextBlockImport& rImport)
+    : SvXMLImportContext(rImport)
+    , m_rLocalRef(rImport)
 {
 }
 
@@ -242,7 +241,7 @@ SwXMLTextBlockTextContext::createFastChildContext( sal_Int32 Element,
     const uno::Reference< xml::sax::XFastAttributeList > & /*xAttrList*/ )
 {
     if ( Element == SwXMLTextBlockToken::TEXT_P )
-        return new SwXMLTextBlockParContext( rLocalRef );
+        return new SwXMLTextBlockParContext(m_rLocalRef);
     return nullptr;
 }
 
@@ -263,26 +262,25 @@ SwXMLTextBlockBodyContext::createFastChildContext( sal_Int32 Element,
     return nullptr;
 }
 
-SwXMLTextBlockParContext::SwXMLTextBlockParContext(
-    SwXMLTextBlockImport& rImport ) :
-    SvXMLImportContext( rImport ),
-    rLocalRef( rImport )
+SwXMLTextBlockParContext::SwXMLTextBlockParContext(SwXMLTextBlockImport& rImport)
+    : SvXMLImportContext(rImport)
+    , m_rLocalRef(rImport)
 {
 }
 
 void SAL_CALL SwXMLTextBlockParContext::characters( const OUString & aChars )
 {
-    rLocalRef.m_rText += aChars;
+    m_rLocalRef.m_rText += aChars;
 }
 
 SwXMLTextBlockParContext::~SwXMLTextBlockParContext()
 {
-    if (rLocalRef.bTextOnly)
-        rLocalRef.m_rText += "\015";
+    if (m_rLocalRef.m_bTextOnly)
+        m_rLocalRef.m_rText += "\015";
     else
     {
-        if (!rLocalRef.m_rText.endsWith( " " ))
-            rLocalRef.m_rText += " ";
+        if (!m_rLocalRef.m_rText.endsWith(" "))
+            m_rLocalRef.m_rText += " ";
     }
 }
 
@@ -291,7 +289,7 @@ SwXMLBlockListImport::SwXMLBlockListImport(
     const uno::Reference< uno::XComponentContext >& rContext,
     SwXMLTextBlocks &rBlocks )
 :   SvXMLImport( rContext, "", SvXMLImportFlags::NONE ),
-    rBlockList (rBlocks)
+    m_rBlockList (rBlocks)
 {
 }
 
@@ -313,7 +311,7 @@ SwXMLTextBlockImport::SwXMLTextBlockImport(
     OUString & rNewText,
     bool bNewTextOnly )
 :   SvXMLImport(rContext, "", SvXMLImportFlags::ALL ),
-    bTextOnly ( bNewTextOnly ),
+    m_bTextOnly ( bNewTextOnly ),
     m_rText ( rNewText )
 {
 }