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

[Miklos Vajna (via logerrit)]

 sw/source/filter/ww8/ww8toolbar.cxx |   32 ++++++++++++++++----------------
 sw/source/filter/ww8/ww8toolbar.hxx |   16 ++++++++--------
 2 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 5a13d43e7f26d7c86aeb44a0912230a2d9ba0f68
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jul 18 08:05:25 2022 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jul 18 08:50:21 2022 +0200

    sw: prefix members of ww8toolbar
    
    Tcg255, Tcg255SubStruct, TcgSttbf and TcgSttbfCore
    
    See tdf#94879 for motivation.
    
    Change-Id: I8a37a640c564131839cd2ed651a93bb44dbb6d0b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137160
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    Tested-by: Jenkins

diff --git a/sw/source/filter/ww8/ww8toolbar.cxx 
b/sw/source/filter/ww8/ww8toolbar.cxx
index 1f49edabe47d..f6639bd716d3 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -687,17 +687,17 @@ bool Tcg255::processSubStruct( sal_uInt8 nId, SvStream 
&rS )
             SAL_INFO("sw.ww8","Unknown id 0x" << std::hex << nId);
             return false;
     }
-    xSubStruct->ch = nId;
+    xSubStruct->m_ch = nId;
     if (!xSubStruct->Read(rS))
         return false;
-    rgtcgData.push_back(std::move(xSubStruct));
+    m_rgtcgData.push_back(std::move(xSubStruct));
     return true;
 }
 
 bool Tcg255::ImportCustomToolBar( SfxObjectShell& rDocSh )
 {
     // Find the SwCTBWrapper
-    for ( const auto & rSubStruct : rgtcgData )
+    for ( const auto & rSubStruct : m_rgtcgData )
     {
         if ( rSubStruct->id() == 0x12 )
         {
@@ -734,7 +734,7 @@ bool Tcg255::Read(SvStream &rS)
     // Peek at
 }
 
-Tcg255SubStruct::Tcg255SubStruct( ) : ch(0)
+Tcg255SubStruct::Tcg255SubStruct( ) : m_ch(0)
 {
 }
 
@@ -852,12 +852,12 @@ bool TcgSttbf::Read( SvStream &rS)
     SAL_INFO("sw.ww8","TcgSttbf::Read() stream pos 0x" << std::hex << 
rS.Tell() );
     nOffSet = rS.Tell();
     Tcg255SubStruct::Read( rS );
-    return sttbf.Read( rS );
+    return m_sttbf.Read( rS );
 }
 
-TcgSttbfCore::TcgSttbfCore() : fExtend( 0 )
-,cData( 0 )
-,cbExtra( 0 )
+TcgSttbfCore::TcgSttbfCore() : m_fExtend( 0 )
+,m_cData( 0 )
+,m_cbExtra( 0 )
 {
 }
 
@@ -869,17 +869,17 @@ bool TcgSttbfCore::Read( SvStream& rS )
 {
     SAL_INFO("sw.ww8","TcgSttbfCore::Read() stream pos 0x" << std::hex << 
rS.Tell() );
     nOffSet = rS.Tell();
-    rS.ReadUInt16( fExtend ).ReadUInt16( cData ).ReadUInt16( cbExtra );
-    if ( cData )
+    rS.ReadUInt16( m_fExtend ).ReadUInt16( m_cData ).ReadUInt16( m_cbExtra );
+    if ( m_cData )
     {
-        if (cData > rS.remainingSize() / 4) //definitely an invalid record
+        if (m_cData > rS.remainingSize() / 4) //definitely an invalid record
             return false;
-        dataItems.reset( new SBBItem[ cData ] );
-        for ( sal_Int32 index = 0; index < cData; ++index )
+        m_dataItems.reset( new SBBItem[ m_cData ] );
+        for ( sal_Int32 index = 0; index < m_cData; ++index )
         {
-            rS.ReadUInt16( dataItems[ index ].cchData );
-            dataItems[ index ].data = read_uInt16s_ToOUString(rS, 
dataItems[index].cchData);
-            rS.ReadUInt16( dataItems[ index ].extraData );
+            rS.ReadUInt16( m_dataItems[ index ].cchData );
+            m_dataItems[ index ].data = read_uInt16s_ToOUString(rS, 
m_dataItems[index].cchData);
+            rS.ReadUInt16( m_dataItems[ index ].extraData );
         }
     }
     return rS.good();
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx 
b/sw/source/filter/ww8/ww8toolbar.hxx
index b80d0a0d0a5c..00a52806f21f 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -93,11 +93,11 @@ class Tcg255SubStruct : public TBBase
     Tcg255SubStruct& operator = ( const Tcg255SubStruct&) = delete;
 
 protected:
-    sal_uInt8 ch;
+    sal_uInt8 m_ch;
 
 public:
     explicit Tcg255SubStruct();
-    sal_uInt8 id() const { return ch; }
+    sal_uInt8 id() const { return m_ch; }
     bool Read(SvStream &rS) override;
 };
 
@@ -247,10 +247,10 @@ class TcgSttbfCore : public TBBase
         SBBItem() : cchData(0), extraData(0){}
     };
 
-    sal_uInt16 fExtend;
-    sal_uInt16 cData;
-    sal_uInt16 cbExtra;
-    std::unique_ptr<SBBItem[]> dataItems;
+    sal_uInt16 m_fExtend;
+    sal_uInt16 m_cData;
+    sal_uInt16 m_cbExtra;
+    std::unique_ptr<SBBItem[]> m_dataItems;
     TcgSttbfCore(const TcgSttbfCore&) = delete;
     TcgSttbfCore& operator = ( const TcgSttbfCore&) = delete;
 
@@ -262,7 +262,7 @@ public:
 
 class TcgSttbf : public Tcg255SubStruct
 {
-    TcgSttbfCore sttbf;
+    TcgSttbfCore m_sttbf;
     TcgSttbf(const TcgSttbf&) = delete;
     TcgSttbf& operator = ( const TcgSttbf&) = delete;
 
@@ -312,7 +312,7 @@ public:
 
 class Tcg255 : public TBBase
 {
-    std::vector< std::unique_ptr<Tcg255SubStruct> > rgtcgData; // array of sub 
structures
+    std::vector< std::unique_ptr<Tcg255SubStruct> > m_rgtcgData; // array of 
sub structures
     Tcg255(const Tcg255&) = delete;
     Tcg255& operator = ( const Tcg255&) = delete;
     bool processSubStruct( sal_uInt8 nId, SvStream& );