sw: prefix members of SwMiscConfig

Change-Id: I1582641032f6641c14db461eb9910d3639ab0865
Reviewed-on: https://gerrit.libreoffice.org/58909
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins

2 files changed, 61 insertions, 61 deletions

diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index 3e277328c87d..f815b5ba9cfc 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -173,18 +173,18 @@ class SwMiscConfig : public utl::ConfigItem
 {
     friend class SwModuleOptions;
 
-    OUString    sWordDelimiter;             // Statistics/WordNumber/Delimiter
-    bool        bDefaultFontsInCurrDocOnly; // DefaultFont/Document
-    bool        bShowIndexPreview;          // Index/ShowPreview
-    bool        bGrfToGalleryAsLnk;         // Misc/GraphicToGalleryAsLink
-    bool        bNumAlignSize;              // Numbering/Graphic/KeepRatio
-    bool        bSinglePrintJob;            // FormLetter/PrintOutput/SinglePrintJobs
-    bool        bIsNameFromColumn;          // FormLetter/FileOutput/FileName/Generation
-    bool        bAskForMailMergeInPrint;    // Ask if documents containing fields should be 'mailmerged'
-    MailTextFormats nMailingFormats;            // FormLetter/MailingOutput/Formats
-    OUString    sNameFromColumn;            // FormLetter/FileOutput/FileName/FromDatabaseField (string!)
-    OUString    sMailingPath;               // FormLetter/FileOutput/Path
-    OUString    sMailName;                  // FormLetter/FileOutput/FileName/FromManualSetting (string!)
+    OUString    m_sWordDelimiter;             // Statistics/WordNumber/Delimiter
+    bool        m_bDefaultFontsInCurrDocOnly; // DefaultFont/Document
+    bool        m_bShowIndexPreview;          // Index/ShowPreview
+    bool        m_bGrfToGalleryAsLnk;         // Misc/GraphicToGalleryAsLink
+    bool        m_bNumAlignSize;              // Numbering/Graphic/KeepRatio
+    bool        m_bSinglePrintJob;            // FormLetter/PrintOutput/SinglePrintJobs
+    bool        m_bIsNameFromColumn;          // FormLetter/FileOutput/FileName/Generation
+    bool        m_bAskForMailMergeInPrint;    // Ask if documents containing fields should be 'mailmerged'
+    MailTextFormats m_nMailingFormats;            // FormLetter/MailingOutput/Formats
+    OUString    m_sNameFromColumn;            // FormLetter/FileOutput/FileName/FromDatabaseField (string!)
+    OUString    m_sMailingPath;               // FormLetter/FileOutput/Path
+    OUString    m_sMailName;                  // FormLetter/FileOutput/FileName/FromManualSetting (string!)
 
     static const css::uno::Sequence<OUString>& GetPropertyNames();
 
@@ -302,49 +302,49 @@ public:
     const InsCaptionOpt* GetCapOption(bool bHTML, const SwCapObjType eType, const SvGlobalName *pOleId);
     bool        SetCapOption(bool bHTML, const InsCaptionOpt* pOpt);
 
-    bool        IsGrfToGalleryAsLnk() const     { return aMiscConfig.bGrfToGalleryAsLnk; }
-    void        SetGrfToGalleryAsLnk( bool b )  { aMiscConfig.bGrfToGalleryAsLnk = b;
+    bool        IsGrfToGalleryAsLnk() const     { return aMiscConfig.m_bGrfToGalleryAsLnk; }
+    void        SetGrfToGalleryAsLnk( bool b )  { aMiscConfig.m_bGrfToGalleryAsLnk = b;
                                                   aMiscConfig.SetModified();}
 
-    MailTextFormats GetMailingFormats() const               { return aMiscConfig.nMailingFormats;}
-    void           SetMailingFormats( MailTextFormats nSet ) { aMiscConfig.nMailingFormats = nSet;
+    MailTextFormats GetMailingFormats() const               { return aMiscConfig.m_nMailingFormats;}
+    void           SetMailingFormats( MailTextFormats nSet ) { aMiscConfig.m_nMailingFormats = nSet;
                                                             aMiscConfig.SetModified();}
 
-    void        SetSinglePrintJob( bool b )     { aMiscConfig.bSinglePrintJob = b;
+    void        SetSinglePrintJob( bool b )     { aMiscConfig.m_bSinglePrintJob = b;
                                                   aMiscConfig.SetModified();}
 
-    bool        IsNameFromColumn() const        { return aMiscConfig.bIsNameFromColumn; }
+    bool        IsNameFromColumn() const        { return aMiscConfig.m_bIsNameFromColumn; }
     void        SetIsNameFromColumn( bool bSet )
                         {
                             aMiscConfig.SetModified();
-                            aMiscConfig.bIsNameFromColumn = bSet;
+                            aMiscConfig.m_bIsNameFromColumn = bSet;
                         }
 
-    bool        IsAskForMailMerge() const       { return aMiscConfig.bAskForMailMergeInPrint;}
+    bool        IsAskForMailMerge() const       { return aMiscConfig.m_bAskForMailMergeInPrint;}
 
-    const OUString& GetNameFromColumn() const       { return aMiscConfig.sNameFromColumn; }
-    void        SetNameFromColumn( const OUString& rSet )       { aMiscConfig.sNameFromColumn = rSet;
+    const OUString& GetNameFromColumn() const       { return aMiscConfig.m_sNameFromColumn; }
+    void        SetNameFromColumn( const OUString& rSet )       { aMiscConfig.m_sNameFromColumn = rSet;
                                                                   aMiscConfig.SetModified();}
 
-    const OUString& GetMailingPath() const          { return aMiscConfig.sMailingPath; }
-    void        SetMailingPath(const OUString& sPath) { aMiscConfig.sMailingPath = sPath;
+    const OUString& GetMailingPath() const          { return aMiscConfig.m_sMailingPath; }
+    void        SetMailingPath(const OUString& sPath) { aMiscConfig.m_sMailingPath = sPath;
                                                       aMiscConfig.SetModified();}
 
-    const OUString& GetWordDelimiter() const        { return aMiscConfig.sWordDelimiter; }
-    void        SetWordDelimiter(const OUString& sDelim)  { aMiscConfig.sWordDelimiter = sDelim;
+    const OUString& GetWordDelimiter() const        { return aMiscConfig.m_sWordDelimiter; }
+    void        SetWordDelimiter(const OUString& sDelim)  { aMiscConfig.m_sWordDelimiter = sDelim;
                                                           aMiscConfig.SetModified();}
 
     //convert word delimiter from or to user interface
     static OUString ConvertWordDelimiter(const OUString& rDelim, bool bFromUI);
 
-    bool    IsShowIndexPreview() const {return  aMiscConfig.bShowIndexPreview;}
+    bool    IsShowIndexPreview() const {return  aMiscConfig.m_bShowIndexPreview;}
     void        SetShowIndexPreview(bool bSet)
-                    {aMiscConfig.bShowIndexPreview = bSet;
+                    {aMiscConfig.m_bShowIndexPreview = bSet;
                     aMiscConfig.SetModified();}
 
     void        SetDefaultFontInCurrDocOnly(bool bSet)
                     {
-                        aMiscConfig.bDefaultFontsInCurrDocOnly = bSet;
+                        aMiscConfig.m_bDefaultFontsInCurrDocOnly = bSet;
                         aMiscConfig.SetModified();
                     }
 
diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index d4684ce434cc..a35b1fb76afc 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -1181,14 +1181,14 @@ void SwTableConfig::Load()
 SwMiscConfig::SwMiscConfig() :
     ConfigItem("Office.Writer",
         ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree),
-    bDefaultFontsInCurrDocOnly(false),
-    bShowIndexPreview(false),
-    bGrfToGalleryAsLnk(true),
-    bNumAlignSize(true),
-    bSinglePrintJob(false),
-    bIsNameFromColumn(true),
-    bAskForMailMergeInPrint(true),
-    nMailingFormats(MailTextFormats::NONE)
+    m_bDefaultFontsInCurrDocOnly(false),
+    m_bShowIndexPreview(false),
+    m_bGrfToGalleryAsLnk(true),
+    m_bNumAlignSize(true),
+    m_bSinglePrintJob(false),
+    m_bIsNameFromColumn(true),
+    m_bAskForMailMergeInPrint(true),
+    m_nMailingFormats(MailTextFormats::NONE)
 {
     Load();
 }
@@ -1240,19 +1240,19 @@ void SwMiscConfig::ImplCommit()
         {
             case 0 :
                 pValues[nProp] <<=
-                    SwModuleOptions::ConvertWordDelimiter(sWordDelimiter, false);
+                    SwModuleOptions::ConvertWordDelimiter(m_sWordDelimiter, false);
             break;
-            case 1 : pValues[nProp] <<= bDefaultFontsInCurrDocOnly; break;
-            case 2 : pValues[nProp] <<= bShowIndexPreview; break;
-            case 3 : pValues[nProp] <<= bGrfToGalleryAsLnk; break;
-            case 4 : pValues[nProp] <<= bNumAlignSize; break;
-            case 5 : pValues[nProp] <<= bSinglePrintJob; break;
-            case 6 : pValues[nProp] <<= static_cast<sal_Int32>(nMailingFormats); break;
-            case 7 : pValues[nProp] <<= sNameFromColumn;  break;
-            case 8 : pValues[nProp] <<= sMailingPath;     break;
-            case 9 : pValues[nProp] <<= sMailName;        break;
-            case 10: pValues[nProp] <<= bIsNameFromColumn; break;
-            case 11: pValues[nProp] <<= bAskForMailMergeInPrint; break;
+            case 1 : pValues[nProp] <<= m_bDefaultFontsInCurrDocOnly; break;
+            case 2 : pValues[nProp] <<= m_bShowIndexPreview; break;
+            case 3 : pValues[nProp] <<= m_bGrfToGalleryAsLnk; break;
+            case 4 : pValues[nProp] <<= m_bNumAlignSize; break;
+            case 5 : pValues[nProp] <<= m_bSinglePrintJob; break;
+            case 6 : pValues[nProp] <<= static_cast<sal_Int32>(m_nMailingFormats); break;
+            case 7 : pValues[nProp] <<= m_sNameFromColumn;  break;
+            case 8 : pValues[nProp] <<= m_sMailingPath;     break;
+            case 9 : pValues[nProp] <<= m_sMailName;        break;
+            case 10: pValues[nProp] <<= m_bIsNameFromColumn; break;
+            case 11: pValues[nProp] <<= m_bAskForMailMergeInPrint; break;
         }
     }
     PutProperties(aNames, aValues);
@@ -1272,19 +1272,19 @@ void SwMiscConfig::Load()
             switch (nProp)
             {
                 case 0 : pValues[nProp] >>= sTmp;
-                    sWordDelimiter = SwModuleOptions::ConvertWordDelimiter(sTmp, true);
+                    m_sWordDelimiter = SwModuleOptions::ConvertWordDelimiter(sTmp, true);
                 break;
-                case 1 : bDefaultFontsInCurrDocOnly = *o3tl::doAccess<bool>(pValues[nProp]); break;
-                case 2 : bShowIndexPreview = *o3tl::doAccess<bool>(pValues[nProp]); break;
-                case 3 : bGrfToGalleryAsLnk = *o3tl::doAccess<bool>(pValues[nProp]); break;
-                case 4 : bNumAlignSize = *o3tl::doAccess<bool>(pValues[nProp]); break;
-                case 5 : bSinglePrintJob = *o3tl::doAccess<bool>(pValues[nProp]); break;
-                case 6 : nMailingFormats = static_cast<MailTextFormats>(*o3tl::doAccess<sal_Int32>(pValues[nProp])); break;
-                case 7 : pValues[nProp] >>= sTmp; sNameFromColumn = sTmp; break;
-                case 8 : pValues[nProp] >>= sTmp; sMailingPath = sTmp;  break;
-                case 9 : pValues[nProp] >>= sTmp; sMailName = sTmp;     break;
-                case 10: bIsNameFromColumn = *o3tl::doAccess<bool>(pValues[nProp]); break;
-                case 11: pValues[nProp] >>= bAskForMailMergeInPrint; break;
+                case 1 : m_bDefaultFontsInCurrDocOnly = *o3tl::doAccess<bool>(pValues[nProp]); break;
+                case 2 : m_bShowIndexPreview = *o3tl::doAccess<bool>(pValues[nProp]); break;
+                case 3 : m_bGrfToGalleryAsLnk = *o3tl::doAccess<bool>(pValues[nProp]); break;
+                case 4 : m_bNumAlignSize = *o3tl::doAccess<bool>(pValues[nProp]); break;
+                case 5 : m_bSinglePrintJob = *o3tl::doAccess<bool>(pValues[nProp]); break;
+                case 6 : m_nMailingFormats = static_cast<MailTextFormats>(*o3tl::doAccess<sal_Int32>(pValues[nProp])); break;
+                case 7 : pValues[nProp] >>= sTmp; m_sNameFromColumn = sTmp; break;
+                case 8 : pValues[nProp] >>= sTmp; m_sMailingPath = sTmp;  break;
+                case 9 : pValues[nProp] >>= sTmp; m_sMailName = sTmp;     break;
+                case 10: m_bIsNameFromColumn = *o3tl::doAccess<bool>(pValues[nProp]); break;
+                case 11: pValues[nProp] >>= m_bAskForMailMergeInPrint; break;
             }
         }
     }