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

[Miklos Vajna]

 sw/inc/modcfg.hxx                  |   24 ++++++++++++------------
 sw/source/uibase/config/modcfg.cxx |   24 ++++++++++++------------
 2 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 67f3063b7c334d4d5c59132d90b938671aad09f0
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Jul 9 09:12:09 2018 +0200

    sw: prefix members of SwCompareConfig
    
    Change-Id: If475eb38df6851eccde4570c69d36df4bc522a4e
    Reviewed-on: https://gerrit.libreoffice.org/57176
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins

diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index 857f3aa292f7..f4d82aaf2be3 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -94,12 +94,12 @@ class SwCompareConfig : public utl::ConfigItem
 {
     friend class SwModuleOptions;
 
-    SwCompareMode  eCmpMode;       //Compare/CompareDocuments;
-    bool            bUseRsid;       //Compare/Settings/Use RSID
+    SwCompareMode  m_eCmpMode;       //Compare/CompareDocuments;
+    bool            m_bUseRsid;       //Compare/Settings/Use RSID
     /// Compare/Settings/Store RSID
     bool            m_bStoreRsid;
-    bool            bIgnorePieces;  //Compare/Settings/Ignore pieces of length
-    sal_uInt16      nPieceLen;      //Compare/Settings/Ignore pieces of length
+    bool            m_bIgnorePieces;  //Compare/Settings/Ignore pieces of length
+    sal_uInt16      m_nPieceLen;      //Compare/Settings/Ignore pieces of length
 
     static const css::uno::Sequence<OUString>& GetPropertyNames();
 
@@ -351,20 +351,20 @@ public:
     bool    IsHideFieldTips() const {return bHideFieldTips;}
     void        SetHideFieldTips(bool bSet) {bHideFieldTips = bSet;}
 
-    SwCompareMode  GetCompareMode() const { return aCompareConfig.eCmpMode; }
-    void            SetCompareMode( SwCompareMode eMode ) { aCompareConfig.eCmpMode = eMode;
+    SwCompareMode  GetCompareMode() const { return aCompareConfig.m_eCmpMode; }
+    void            SetCompareMode( SwCompareMode eMode ) { aCompareConfig.m_eCmpMode = eMode;
                                                              aCompareConfig.SetModified(); }
 
-    bool    IsUseRsid() const { return aCompareConfig.bUseRsid; }
-    void        SetUseRsid( bool b ) { aCompareConfig.bUseRsid = b;
+    bool    IsUseRsid() const { return aCompareConfig.m_bUseRsid; }
+    void        SetUseRsid( bool b ) { aCompareConfig.m_bUseRsid = b;
                                                             aCompareConfig.SetModified(); }
 
-    bool    IsIgnorePieces() const { return aCompareConfig.bIgnorePieces; }
-    void        SetIgnorePieces( bool b ) { aCompareConfig.bIgnorePieces = b;
+    bool    IsIgnorePieces() const { return aCompareConfig.m_bIgnorePieces; }
+    void        SetIgnorePieces( bool b ) { aCompareConfig.m_bIgnorePieces = b;
                                                 aCompareConfig.SetModified(); }
 
-    sal_uInt16  GetPieceLen() const { return aCompareConfig.nPieceLen; }
-    void        SetPieceLen( sal_uInt16 nLen ) { aCompareConfig.nPieceLen = nLen;
+    sal_uInt16  GetPieceLen() const { return aCompareConfig.m_nPieceLen; }
+    void        SetPieceLen( sal_uInt16 nLen ) { aCompareConfig.m_nPieceLen = nLen;
                                                  aCompareConfig.SetModified(); }
 
     bool IsStoreRsid() const
diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index dc605f7f644e..3d73202fdb70 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -1317,10 +1317,10 @@ SwCompareConfig::SwCompareConfig() :
         ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree)
     ,m_bStoreRsid(true)
 {
-    eCmpMode = SwCompareMode::Auto;
-    bUseRsid = false;
-    bIgnorePieces = false;
-    nPieceLen = 1;
+    m_eCmpMode = SwCompareMode::Auto;
+    m_bUseRsid = false;
+    m_bIgnorePieces = false;
+    m_nPieceLen = 1;
 
     Load();
 }
@@ -1335,10 +1335,10 @@ void SwCompareConfig::ImplCommit()
     Sequence<Any> aValues(aNames.getLength());
     Any* pValues = aValues.getArray();
 
-    pValues[0] <<= static_cast<sal_Int32>(eCmpMode);
-    pValues[1] <<= bUseRsid;
-    pValues[2] <<= bIgnorePieces;
-    pValues[3] <<= static_cast<sal_Int32>(nPieceLen);
+    pValues[0] <<= static_cast<sal_Int32>(m_eCmpMode);
+    pValues[1] <<= m_bUseRsid;
+    pValues[2] <<= m_bIgnorePieces;
+    pValues[3] <<= static_cast<sal_Int32>(m_nPieceLen);
     pValues[4] <<= m_bStoreRsid;
 
     PutProperties(aNames, aValues);
@@ -1359,10 +1359,10 @@ void SwCompareConfig::Load()
 
             switch(nProp)
             {
-                case 0 : eCmpMode = static_cast<SwCompareMode>(nVal); break;
-                case 1 : bUseRsid = *o3tl::doAccess<bool>(pValues[nProp]); break;
-                case 2 : bIgnorePieces = *o3tl::doAccess<bool>(pValues[nProp]); break;
-                case 3 : nPieceLen = nVal; break;
+                case 0 : m_eCmpMode = static_cast<SwCompareMode>(nVal); break;
+                case 1 : m_bUseRsid = *o3tl::doAccess<bool>(pValues[nProp]); break;
+                case 2 : m_bIgnorePieces = *o3tl::doAccess<bool>(pValues[nProp]); break;
+                case 3 : m_nPieceLen = nVal; break;
                 case 4 : m_bStoreRsid = *o3tl::doAccess<bool>(pValues[nProp]); break;
             }
         }