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

[Miklos Vajna]

 sw/source/uibase/config/caption.cxx |   20 ++++-----
 sw/source/uibase/inc/caption.hxx    |   76 ++++++++++++++++++------------------
 2 files changed, 48 insertions(+), 48 deletions(-)

New commits:
commit 8fde560d58a8ddc9c023251e55e6542f8ec6c1e9
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu May 17 08:46:37 2018 +0200

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

diff --git a/sw/source/uibase/config/caption.cxx b/sw/source/uibase/config/caption.cxx
index 0458826a30d7..f13f9b8409d6 100644
--- a/sw/source/uibase/config/caption.cxx
+++ b/sw/source/uibase/config/caption.cxx
@@ -22,18 +22,18 @@
 #include <caption.hxx>
 
 InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName* pOleId) :
-    bUseCaption(false),
-    eObjType(eType),
-    nNumType(SVX_NUM_ARABIC),
-    sNumberSeparator(". "),
-    nPos(1),
-    nLevel(0),
-    sSeparator( OUString(": ") ),
-    bIgnoreSeqOpts(false),
-    bCopyAttributes(false)
+    m_bUseCaption(false),
+    m_eObjType(eType),
+    m_nNumType(SVX_NUM_ARABIC),
+    m_sNumberSeparator(". "),
+    m_nPos(1),
+    m_nLevel(0),
+    m_sSeparator( OUString(": ") ),
+    m_bIgnoreSeqOpts(false),
+    m_bCopyAttributes(false)
 {
     if (pOleId)
-        aOleId = *pOleId;
+        m_aOleId = *pOleId;
 }
 
 InsCaptionOpt::~InsCaptionOpt() = default;
diff --git a/sw/source/uibase/inc/caption.hxx b/sw/source/uibase/inc/caption.hxx
index fba8ac06b65e..33008631e1c9 100644
--- a/sw/source/uibase/inc/caption.hxx
+++ b/sw/source/uibase/inc/caption.hxx
@@ -27,62 +27,62 @@
 class SW_DLLPUBLIC InsCaptionOpt
 {
 private:
-    bool            bUseCaption;
-    SwCapObjType    eObjType;
-    SvGlobalName    aOleId;
-    OUString        sCategory;
-    sal_uInt16      nNumType;
-    OUString        sNumberSeparator;
-    OUString        sCaption;
-    sal_uInt16      nPos;
-    sal_uInt16      nLevel;
-    OUString        sSeparator;
-    OUString        sCharacterStyle;
-
-    bool         bIgnoreSeqOpts;    // is not being saved
-    bool         bCopyAttributes;   //          -""-
+    bool            m_bUseCaption;
+    SwCapObjType    m_eObjType;
+    SvGlobalName    m_aOleId;
+    OUString        m_sCategory;
+    sal_uInt16      m_nNumType;
+    OUString        m_sNumberSeparator;
+    OUString        m_sCaption;
+    sal_uInt16      m_nPos;
+    sal_uInt16      m_nLevel;
+    OUString        m_sSeparator;
+    OUString        m_sCharacterStyle;
+
+    bool         m_bIgnoreSeqOpts;    // is not being saved
+    bool         m_bCopyAttributes;   //          -""-
 
 public:
     InsCaptionOpt(const SwCapObjType eType = FRAME_CAP, const SvGlobalName* pOleId = nullptr);
     ~InsCaptionOpt();
 
-    bool&            UseCaption()                    { return bUseCaption; }
-    bool             UseCaption() const              { return bUseCaption; }
+    bool&            UseCaption()                    { return m_bUseCaption; }
+    bool             UseCaption() const              { return m_bUseCaption; }
 
-    SwCapObjType     GetObjType() const              { return eObjType; }
+    SwCapObjType     GetObjType() const              { return m_eObjType; }
 
-    const SvGlobalName&  GetOleId() const                { return aOleId; }
+    const SvGlobalName&  GetOleId() const                { return m_aOleId; }
 
-    const OUString&  GetCategory() const             { return sCategory; }
-    void             SetCategory(const OUString& rCat) { sCategory = rCat; }
+    const OUString&  GetCategory() const             { return m_sCategory; }
+    void             SetCategory(const OUString& rCat) { m_sCategory = rCat; }
 
-    sal_uInt16           GetNumType() const              { return nNumType; }
-    void             SetNumType(const sal_uInt16 nNT)    { nNumType = nNT; }
+    sal_uInt16           GetNumType() const              { return m_nNumType; }
+    void             SetNumType(const sal_uInt16 nNT)    { m_nNumType = nNT; }
 
-    const OUString&  GetNumSeparator() const { return sNumberSeparator; }
-    void                    SetNumSeparator(const OUString& rSet) {sNumberSeparator = rSet;}
+    const OUString&  GetNumSeparator() const { return m_sNumberSeparator; }
+    void                    SetNumSeparator(const OUString& rSet) {m_sNumberSeparator = rSet;}
 
-    const OUString&  GetCaption() const              { return sCaption; }
-    void             SetCaption(const OUString& rCap)  { sCaption = rCap; }
+    const OUString&  GetCaption() const              { return m_sCaption; }
+    void             SetCaption(const OUString& rCap)  { m_sCaption = rCap; }
 
-    sal_uInt16           GetPos() const                  { return nPos; }
-    void             SetPos(const sal_uInt16 nP)         { nPos = nP; }
+    sal_uInt16           GetPos() const                  { return m_nPos; }
+    void             SetPos(const sal_uInt16 nP)         { m_nPos = nP; }
 
-    sal_uInt16           GetLevel() const                { return nLevel; }
-    void             SetLevel(const sal_uInt16 nLvl)     { nLevel = nLvl; }
+    sal_uInt16           GetLevel() const                { return m_nLevel; }
+    void             SetLevel(const sal_uInt16 nLvl)     { m_nLevel = nLvl; }
 
-    const OUString&  GetSeparator() const                { return sSeparator; }
-    void             SetSeparator(const OUString& rSep)    { sSeparator = rSep; }
+    const OUString&  GetSeparator() const                { return m_sSeparator; }
+    void             SetSeparator(const OUString& rSep)    { m_sSeparator = rSep; }
 
-    const OUString&         GetCharacterStyle() const { return sCharacterStyle; }
+    const OUString&         GetCharacterStyle() const { return m_sCharacterStyle; }
     void                    SetCharacterStyle(const OUString& rStyle)
-                                    { sCharacterStyle = rStyle; }
+                                    { m_sCharacterStyle = rStyle; }
 
-    bool&            IgnoreSeqOpts()                 { return bIgnoreSeqOpts; }
-    bool             IgnoreSeqOpts() const           { return bIgnoreSeqOpts; }
+    bool&            IgnoreSeqOpts()                 { return m_bIgnoreSeqOpts; }
+    bool             IgnoreSeqOpts() const           { return m_bIgnoreSeqOpts; }
 
-    bool&            CopyAttributes()                { return bCopyAttributes; }
-    bool             CopyAttributes() const          { return bCopyAttributes; }
+    bool&            CopyAttributes()                { return m_bCopyAttributes; }
+    bool             CopyAttributes() const          { return m_bCopyAttributes; }
 };
 
 #endif