sw: prefix members of SwExtTextInput, SwLineNumberInfo, SwWriter and ...

... SwgReaderOption

See tdf#94879 for motivation.

Change-Id: Ib44eaa1adbc731499d22b0bf538380b8bc0cc4eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88357
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins

3 files changed, 51 insertions, 51 deletions

diff --git a/sw/inc/extinput.hxx b/sw/inc/extinput.hxx
index fd510511e388..c2fe02adbbdf 100644
--- a/sw/inc/extinput.hxx
+++ b/sw/inc/extinput.hxx
@@ -26,21 +26,21 @@
 
 class SwExtTextInput final : public SwPaM
 {
-    std::vector<ExtTextInputAttr> aAttrs;
-    OUString sOverwriteText;
-    bool bInsText : 1;
-    bool bIsOverwriteCursor : 1;
-    LanguageType eInputLanguage;
+    std::vector<ExtTextInputAttr> m_aAttrs;
+    OUString m_sOverwriteText;
+    bool m_bInsText : 1;
+    bool m_bIsOverwriteCursor : 1;
+    LanguageType m_eInputLanguage;
 public:
     SwExtTextInput( const SwPaM& rPam, Ring* pRing );
     virtual ~SwExtTextInput() override;
 
     void SetInputData( const CommandExtTextInputData& rData );
-    const std::vector<ExtTextInputAttr>& GetAttrs() const { return aAttrs; }
-    void SetInsText( bool bFlag )       { bInsText = bFlag; }
-    bool IsOverwriteCursor() const      { return bIsOverwriteCursor; }
+    const std::vector<ExtTextInputAttr>& GetAttrs() const { return m_aAttrs; }
+    void SetInsText( bool bFlag )       { m_bInsText = bFlag; }
+    bool IsOverwriteCursor() const      { return m_bIsOverwriteCursor; }
     void SetOverwriteCursor( bool bFlag );
-    void SetLanguage(LanguageType eSet) { eInputLanguage = eSet;}
+    void SetLanguage(LanguageType eSet) { m_eInputLanguage = eSet;}
 
     SwExtTextInput* GetNext()             { return static_cast<SwExtTextInput *>(GetNextInRing()); }
     const SwExtTextInput* GetNext() const { return static_cast<SwExtTextInput const *>(GetNextInRing()); }
diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx
index 4846a1e55a0c..5bc245894777 100644
--- a/sw/inc/lineinfo.hxx
+++ b/sw/inc/lineinfo.hxx
@@ -37,17 +37,17 @@ enum LineNumberPosition
 class SW_DLLPUBLIC SwLineNumberInfo final : public SwClient /**< purpose of derivation from SwClient:
                                                          character style for displaying the numbers. */
 {
-    SvxNumberType       aType;                  ///< e.g. roman linenumbers
-    OUString            aDivider;               ///< String for additional interval (vert. lines user defined)
-    sal_uInt16              nPosFromLeft;       ///< Position for paint
-    sal_uInt16              nCountBy;           ///< Paint only for every n line
-    sal_uInt16              nDividerCountBy;    /**< Interval for display of an user defined
+    SvxNumberType       m_aType;                  ///< e.g. roman linenumbers
+    OUString            m_aDivider;               ///< String for additional interval (vert. lines user defined)
+    sal_uInt16              m_nPosFromLeft;       ///< Position for paint
+    sal_uInt16              m_nCountBy;           ///< Paint only for every n line
+    sal_uInt16              m_nDividerCountBy;    /**< Interval for display of an user defined
                                                        string every n lines */
-    LineNumberPosition  ePos;                   ///< Where should the display occur (number and divider)
-    bool                bPaintLineNumbers;      ///< Should anything be displayed?
-    bool                bCountBlankLines;       ///< Count empty lines?
-    bool                bCountInFlys;           ///< Count also within FlyFrames?
-    bool                bRestartEachPage;       /**< Restart counting at the first paragraph of each page
+    LineNumberPosition  m_ePos;                   ///< Where should the display occur (number and divider)
+    bool                m_bPaintLineNumbers;      ///< Should anything be displayed?
+    bool                m_bCountBlankLines;       ///< Count empty lines?
+    bool                m_bCountInFlys;           ///< Count also within FlyFrames?
+    bool                m_bRestartEachPage;       /**< Restart counting at the first paragraph of each page
                                                        (even on follows when paragraphs are split) */
     virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override;
 
@@ -60,34 +60,34 @@ public:
     SwCharFormat *GetCharFormat( IDocumentStylePoolAccess& rIDSPA ) const;
     void SetCharFormat( SwCharFormat* );
 
-    const SvxNumberType &GetNumType() const             { return aType; }
-    void                SetNumType( SvxNumberType aNew ){ aType = aNew; }
+    const SvxNumberType &GetNumType() const             { return m_aType; }
+    void                SetNumType( SvxNumberType aNew ){ m_aType = aNew; }
 
-    const OUString& GetDivider() const           { return aDivider; }
-    void SetDivider( const OUString &r )  { aDivider = r; }
-    sal_uInt16 GetDividerCountBy() const    { return nDividerCountBy; }
-    void SetDividerCountBy( sal_uInt16 n )  { nDividerCountBy = n; }
+    const OUString& GetDivider() const           { return m_aDivider; }
+    void SetDivider( const OUString &r )  { m_aDivider = r; }
+    sal_uInt16 GetDividerCountBy() const    { return m_nDividerCountBy; }
+    void SetDividerCountBy( sal_uInt16 n )  { m_nDividerCountBy = n; }
 
-    sal_uInt16 GetPosFromLeft() const       { return nPosFromLeft; }
-    void   SetPosFromLeft( sal_uInt16 n)    { nPosFromLeft = n;    }
+    sal_uInt16 GetPosFromLeft() const       { return m_nPosFromLeft; }
+    void   SetPosFromLeft( sal_uInt16 n)    { m_nPosFromLeft = n;    }
 
-    sal_uInt16 GetCountBy() const           { return nCountBy; }
-    void   SetCountBy( sal_uInt16 n)        { nCountBy = n;    }
+    sal_uInt16 GetCountBy() const           { return m_nCountBy; }
+    void   SetCountBy( sal_uInt16 n)        { m_nCountBy = n;    }
 
-    LineNumberPosition GetPos() const   { return ePos; }
-    void SetPos( LineNumberPosition eP ){ ePos = eP;   }
+    LineNumberPosition GetPos() const   { return m_ePos; }
+    void SetPos( LineNumberPosition eP ){ m_ePos = eP;   }
 
-    bool   IsPaintLineNumbers() const   { return bPaintLineNumbers; }
-    void   SetPaintLineNumbers( bool b ){ bPaintLineNumbers = b;    }
+    bool   IsPaintLineNumbers() const   { return m_bPaintLineNumbers; }
+    void   SetPaintLineNumbers( bool b ){ m_bPaintLineNumbers = b;    }
 
-    bool   IsCountBlankLines() const    { return bCountBlankLines;  }
-    void   SetCountBlankLines( bool b ) { bCountBlankLines = b;     }
+    bool   IsCountBlankLines() const    { return m_bCountBlankLines;  }
+    void   SetCountBlankLines( bool b ) { m_bCountBlankLines = b;     }
 
-    bool   IsCountInFlys() const        { return bCountInFlys;      }
-    void   SetCountInFlys( bool b )     { bCountInFlys = b;         }
+    bool   IsCountInFlys() const        { return m_bCountInFlys;      }
+    void   SetCountInFlys( bool b )     { m_bCountInFlys = b;         }
 
-    bool   IsRestartEachPage() const    { return bRestartEachPage;  }
-    void   SetRestartEachPage( bool b ) { bRestartEachPage = b;     }
+    bool   IsRestartEachPage() const    { return m_bRestartEachPage;  }
+    void   SetRestartEachPage( bool b ) { m_bRestartEachPage = b;     }
 
     bool   HasCharFormat() const { return GetRegisteredIn() != nullptr; }
 };
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 095dc77b6269..a55e38eebcc3 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -106,7 +106,7 @@ class Reader;
 
 class SwgReaderOption
 {
-    SwAsciiOptions aASCIIOpts;
+    SwAsciiOptions m_aASCIIOpts;
     bool m_bFrameFormats;
     bool m_bPageDescs;
     bool m_bTextFormats;
@@ -132,9 +132,9 @@ public:
     bool IsMerge() const { return m_bMerge; }
     void SetMerge( const bool bNew ) { m_bMerge = bNew; }
 
-    const SwAsciiOptions& GetASCIIOpts() const { return aASCIIOpts; }
-    void SetASCIIOpts( const SwAsciiOptions& rOpts ) { aASCIIOpts = rOpts; }
-    void ResetASCIIOpts() { aASCIIOpts.Reset(); }
+    const SwAsciiOptions& GetASCIIOpts() const { return m_aASCIIOpts; }
+    void SetASCIIOpts( const SwAsciiOptions& rOpts ) { m_aASCIIOpts = rOpts; }
+    void ResetASCIIOpts() { m_aASCIIOpts.Reset(); }
 
     css::uno::Reference<css::io::XInputStream>& GetInputStream() { return m_xInputStream; }
     void SetInputStream(css::uno::Reference<css::io::XInputStream>& xInputStream)
@@ -143,7 +143,7 @@ public:
     }
 
     SwgReaderOption()
-        { ResetAllFormatsOnly(); aASCIIOpts.Reset(); }
+        { ResetAllFormatsOnly(); m_aASCIIOpts.Reset(); }
 };
 
 // Calls reader with its options, document, cursor etc.
@@ -504,15 +504,15 @@ public:
 
 class SW_DLLPUBLIC SwWriter
 {
-    SvStream* pStrm;
-    css::uno::Reference < css::embed::XStorage > xStg;
-    SfxMedium* pMedium;
+    SvStream* m_pStrm;
+    css::uno::Reference < css::embed::XStorage > m_xStg;
+    SfxMedium* m_pMedium;
 
-    SwPaM* const pOutPam;
-    SwCursorShell *pShell;
-    SwDoc &rDoc;
+    SwPaM* const m_pOutPam;
+    SwCursorShell *m_pShell;
+    SwDoc &m_rDoc;
 
-    bool bWriteAll;
+    bool m_bWriteAll;
 
 public:
     ErrCode Write( WriterRef const & rxWriter, const OUString* = nullptr);