sw: prefix members of SwFmt

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

27 files changed, 263 insertions, 263 deletions

diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index 458c4ca27435..f11765e58c5e 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -105,11 +105,11 @@ inline const SwTblBoxValue          &SwAttrSet::GetTblBoxValue(bool bInP) const
     {   return static_cast<const SwTblBoxValue&>(Get( RES_BOXATR_VALUE, bInP)); }
 
 inline const SwTblBoxNumFormat      &SwFmt::GetTblBoxNumFmt(bool bInP) const
-    {   return aSet.GetTblBoxNumFmt(bInP); }
+    {   return m_aSet.GetTblBoxNumFmt(bInP); }
 inline const SwTblBoxFormula        &SwFmt::GetTblBoxFormula(bool bInP) const
-    {   return aSet.GetTblBoxFormula(bInP); }
+    {   return m_aSet.GetTblBoxFormula(bInP); }
 inline const SwTblBoxValue          &SwFmt::GetTblBoxValue(bool bInP) const
-    {   return aSet.GetTblBoxValue(bInP); }
+    {   return m_aSet.GetTblBoxValue(bInP); }
 
 #endif
 
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index 6e24a988ce68..1fa539091d57 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.hxx
@@ -135,69 +135,69 @@ inline const SvxShadowItem       &SwAttrSet::GetCharShadow( bool bInP ) const
 // implementation of the character attribute methods of SwFmt
 
 inline const SvxPostureItem          &SwFmt::GetPosture(bool bInP) const
-    {   return aSet.GetPosture(bInP); }
+    {   return m_aSet.GetPosture(bInP); }
 inline const SvxWeightItem           &SwFmt::GetWeight(bool bInP) const
-    {   return aSet.GetWeight(bInP); }
+    {   return m_aSet.GetWeight(bInP); }
 inline const SvxShadowedItem         &SwFmt::GetShadowed(bool bInP) const
-    {   return aSet.GetShadowed(bInP); }
+    {   return m_aSet.GetShadowed(bInP); }
 inline const SvxAutoKernItem         &SwFmt::GetAutoKern(bool bInP) const
-    {   return aSet.GetAutoKern(bInP); }
+    {   return m_aSet.GetAutoKern(bInP); }
 inline const SvxWordLineModeItem     &SwFmt::GetWordLineMode(bool bInP) const
-    {   return aSet.GetWordLineMode(bInP); }
+    {   return m_aSet.GetWordLineMode(bInP); }
 inline const SvxContourItem          &SwFmt::GetContour(bool bInP) const
-    {   return aSet.GetContour(bInP); }
+    {   return m_aSet.GetContour(bInP); }
 inline const SvxKerningItem          &SwFmt::GetKerning(bool bInP) const
-    {   return aSet.GetKerning(bInP); }
+    {   return m_aSet.GetKerning(bInP); }
 inline const SvxUnderlineItem        &SwFmt::GetUnderline(bool bInP) const
-    {   return aSet.GetUnderline(bInP); }
+    {   return m_aSet.GetUnderline(bInP); }
 inline const SvxOverlineItem         &SwFmt::GetOverline(bool bInP) const
-    {   return aSet.GetOverline(bInP); }
+    {   return m_aSet.GetOverline(bInP); }
 inline const SvxCrossedOutItem       &SwFmt::GetCrossedOut(bool bInP) const
-    {   return aSet.GetCrossedOut(bInP); }
+    {   return m_aSet.GetCrossedOut(bInP); }
 inline const SvxFontHeightItem             &SwFmt::GetSize(bool bInP) const
-    {   return aSet.GetSize(bInP); }
+    {   return m_aSet.GetSize(bInP); }
 inline const SvxPropSizeItem         &SwFmt::GetPropSize(bool bInP) const
-    {   return aSet.GetPropSize(bInP); }
+    {   return m_aSet.GetPropSize(bInP); }
 inline const SvxFontItem             &SwFmt::GetFont(bool bInP) const
-    {   return aSet.GetFont(bInP); }
+    {   return m_aSet.GetFont(bInP); }
 inline const SvxFontItem         &SwFmt::GetCJKFont(bool bInP) const
-    {   return aSet.GetCJKFont(bInP); }
+    {   return m_aSet.GetCJKFont(bInP); }
 inline const SvxFontItem         &SwFmt::GetCTLFont(bool bInP) const
-    {   return aSet.GetCTLFont(bInP); }
+    {   return m_aSet.GetCTLFont(bInP); }
 inline const SvxColorItem            &SwFmt::GetColor(bool bInP) const
-    {   return aSet.GetColor(bInP); }
+    {   return m_aSet.GetColor(bInP); }
     inline const SvxCharSetColorItem    &SwFmt::GetCharSetColor(bool bInP) const
-    {   return aSet.GetCharSetColor(bInP); }
+    {   return m_aSet.GetCharSetColor(bInP); }
 inline const SvxLanguageItem         &SwFmt::GetLanguage(bool bInP) const
-    {   return aSet.GetLanguage(bInP); }
+    {   return m_aSet.GetLanguage(bInP); }
 inline const SvxEscapementItem       &SwFmt::GetEscapement(bool bInP) const
-    {   return aSet.GetEscapement(bInP); }
+    {   return m_aSet.GetEscapement(bInP); }
 inline const SvxCaseMapItem          &SwFmt::GetCaseMap(bool bInP) const
-    {   return aSet.GetCaseMap(bInP); }
+    {   return m_aSet.GetCaseMap(bInP); }
 inline const SvxNoHyphenItem        &SwFmt::GetNoHyphenHere(bool bInP) const
-    {   return aSet.GetNoHyphenHere(bInP); }
+    {   return m_aSet.GetNoHyphenHere(bInP); }
 inline const SvxBlinkItem           &SwFmt::GetBlink(bool bInP) const
-    {   return aSet.GetBlink(bInP); }
+    {   return m_aSet.GetBlink(bInP); }
 inline const SvxBrushItem           &SwFmt::GetChrBackground(bool bInP) const
-    {   return aSet.GetChrBackground(bInP); }
+    {   return m_aSet.GetChrBackground(bInP); }
 inline const SvxBrushItem &SwFmt::GetChrHighlight(bool bInP) const
-    {   return aSet.GetChrHighlight(bInP); }
+    {   return m_aSet.GetChrHighlight(bInP); }
 inline const SvxEmphasisMarkItem   &SwFmt::GetEmphasisMark( bool bInP ) const
-    {   return aSet.GetEmphasisMark(bInP); }
+    {   return m_aSet.GetEmphasisMark(bInP); }
 inline const SvxTwoLinesItem       &SwFmt::Get2Lines( bool bInP ) const
-    {   return aSet.Get2Lines(bInP); }
+    {   return m_aSet.Get2Lines(bInP); }
 inline const SvxCharScaleWidthItem &SwFmt::GetCharScaleW( bool bInP ) const
-    {   return aSet.GetCharScaleW(bInP); }
+    {   return m_aSet.GetCharScaleW(bInP); }
 inline const SvxCharRotateItem     &SwFmt::GetCharRotate( bool bInP ) const
-    {   return aSet.GetCharRotate(bInP); }
+    {   return m_aSet.GetCharRotate(bInP); }
 inline const SvxCharReliefItem     &SwFmt::GetCharRelief( bool bInP ) const
-    {   return aSet.GetCharRelief(bInP); }
+    {   return m_aSet.GetCharRelief(bInP); }
 inline const SvxCharHiddenItem      &SwFmt::GetCharHidden( bool bInP ) const
-    {   return aSet.GetCharHidden(bInP); }
+    {   return m_aSet.GetCharHidden(bInP); }
 inline const SvxBoxItem     &SwFmt::GetCharBorder( bool bInP ) const
-    {   return aSet.GetCharBorder(bInP); }
+    {   return m_aSet.GetCharBorder(bInP); }
 inline const SvxShadowItem  &SwFmt::GetCharShadow( bool bInP ) const
-    {   return aSet.GetCharShadow(bInP); }
+    {   return m_aSet.GetCharShadow(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index e5f24ca324b2..38bedd19415f 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -79,7 +79,7 @@ inline const SwFmtAnchor &SwAttrSet::GetAnchor(bool bInP) const
     { return static_cast<const SwFmtAnchor&>(Get(RES_ANCHOR, bInP)); }
 
  inline const SwFmtAnchor &SwFmt::GetAnchor(bool bInP) const
-     { return aSet.GetAnchor(bInP); }
+     { return m_aSet.GetAnchor(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx
index a2f80eee33d8..e7371a468fe4 100644
--- a/sw/inc/fmtclbl.hxx
+++ b/sw/inc/fmtclbl.hxx
@@ -40,7 +40,7 @@ inline const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(bool bInP) co
     { return static_cast<const SwFmtNoBalancedColumns&>(Get( RES_COLUMNBALANCE, bInP )); }
 
 inline const SwFmtNoBalancedColumns &SwFmt::GetBalancedColumns(bool bInP) const
-    { return aSet.GetBalancedColumns( bInP ); }
+    { return m_aSet.GetBalancedColumns( bInP ); }
 
 #endif
 
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index 94e0a74d4184..267d54190e63 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -170,7 +170,7 @@ inline const SwFmtCol &SwAttrSet::GetCol(bool bInP) const
     { return static_cast<const SwFmtCol&>(Get( RES_COL,bInP)); }
 
 inline const SwFmtCol &SwFmt::GetCol(bool bInP) const
-    { return aSet.GetCol(bInP); }
+    { return m_aSet.GetCol(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index 14d916dd3154..9c908b18893b 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -68,7 +68,7 @@ inline const SwFmtChain &SwAttrSet::GetChain(bool bInP) const
     { return static_cast<const SwFmtChain&>(Get( RES_CHAIN,bInP)); }
 
 inline const SwFmtChain &SwFmt::GetChain(bool bInP) const
-    { return aSet.GetChain(bInP); }
+    { return m_aSet.GetChain(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index c81bbc704b58..b11c160a3f02 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -52,7 +52,7 @@ inline const SwFmtCntnt &SwAttrSet::GetCntnt(bool bInP) const
     { return static_cast<const SwFmtCntnt&>(Get( RES_CNTNT,bInP)); }
 
 inline const SwFmtCntnt &SwFmt::GetCntnt(bool bInP) const
-    { return aSet.GetCntnt(bInP); }
+    { return m_aSet.GetCntnt(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx
index fef34d6dc26c..6c4045ca1994 100644
--- a/sw/inc/fmteiro.hxx
+++ b/sw/inc/fmteiro.hxx
@@ -46,7 +46,7 @@ inline const SwFmtEditInReadonly &SwAttrSet::GetEditInReadonly(bool bInP) const
     { return static_cast<const SwFmtEditInReadonly&>(Get( RES_EDIT_IN_READONLY,bInP)); }
 
 inline const SwFmtEditInReadonly &SwFmt::GetEditInReadonly(bool bInP) const
-    { return aSet.GetEditInReadonly(bInP); }
+    { return m_aSet.GetEditInReadonly(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index 24f68138b229..7152b7f0f764 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -49,7 +49,7 @@ inline const SwFmtFollowTextFlow &SwAttrSet::GetFollowTextFlow(bool bInP) const
     { return static_cast<const SwFmtFollowTextFlow&>(Get( RES_FOLLOW_TEXT_FLOW, bInP )); }
 
 inline const SwFmtFollowTextFlow &SwFmt::GetFollowTextFlow(bool bInP) const
-    { return aSet.GetFollowTextFlow( bInP ); }
+    { return m_aSet.GetFollowTextFlow( bInP ); }
 
 #endif
 
diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx
index 8c79327d9b88..4c9fd044afa0 100644
--- a/sw/inc/fmtfordr.hxx
+++ b/sw/inc/fmtfordr.hxx
@@ -56,7 +56,7 @@ inline const SwFmtFillOrder &SwAttrSet::GetFillOrder(bool bInP) const
     { return static_cast<const SwFmtFillOrder&>(Get( RES_FILL_ORDER,bInP)); }
 
 inline const SwFmtFillOrder &SwFmt::GetFillOrder(bool bInP) const
-    { return aSet.GetFillOrder(bInP); }
+    { return m_aSet.GetFillOrder(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index 4b11a279c1de..c448feee7701 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -105,7 +105,7 @@ inline const SwFmtFrmSize &SwAttrSet::GetFrmSize(bool bInP) const
     { return static_cast<const SwFmtFrmSize&>(Get( RES_FRM_SIZE,bInP)); }
 
 inline const SwFmtFrmSize &SwFmt::GetFrmSize(bool bInP) const
-    { return aSet.GetFrmSize(bInP); }
+    { return m_aSet.GetFrmSize(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index f2590d139597..48ec7c6b286a 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -112,9 +112,9 @@ inline const SwFmtEndAtTxtEnd &SwAttrSet::GetEndAtTxtEnd(bool bInP) const
     { return static_cast<const SwFmtEndAtTxtEnd&>(Get( RES_END_AT_TXTEND, bInP)); }
 
 inline const SwFmtFtnAtTxtEnd &SwFmt::GetFtnAtTxtEnd(bool bInP) const
-    { return aSet.GetFtnAtTxtEnd(bInP); }
+    { return m_aSet.GetFtnAtTxtEnd(bInP); }
 inline const SwFmtEndAtTxtEnd &SwFmt::GetEndAtTxtEnd(bool bInP) const
-    { return aSet.GetEndAtTxtEnd(bInP); }
+    { return m_aSet.GetEndAtTxtEnd(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index 5e0870c297dd..84caf2e15c27 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -100,9 +100,9 @@ inline const SwFmtFooter &SwAttrSet::GetFooter(bool bInP) const
     { return static_cast<const SwFmtFooter&>(Get( RES_FOOTER,bInP)); }
 
 inline const SwFmtHeader &SwFmt::GetHeader(bool bInP) const
-    { return aSet.GetHeader(bInP); }
+    { return m_aSet.GetHeader(bInP); }
 inline const SwFmtFooter &SwFmt::GetFooter(bool bInP) const
-    { return aSet.GetFooter(bInP); }
+    { return m_aSet.GetFooter(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx
index 3abe26f429b9..1a1f94104795 100644
--- a/sw/inc/fmtlsplt.hxx
+++ b/sw/inc/fmtlsplt.hxx
@@ -44,7 +44,7 @@ inline const SwFmtLayoutSplit &SwAttrSet::GetLayoutSplit(bool bInP) const
     { return static_cast<const SwFmtLayoutSplit&>(Get( RES_LAYOUT_SPLIT,bInP)); }
 
 inline const SwFmtLayoutSplit &SwFmt::GetLayoutSplit(bool bInP) const
-    { return aSet.GetLayoutSplit(bInP); }
+    { return m_aSet.GetLayoutSplit(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index df33db016824..cde5b958d595 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -125,9 +125,9 @@ inline const SwFmtHoriOrient &SwAttrSet::GetHoriOrient(bool bInP) const
     { return static_cast<const SwFmtHoriOrient&>(Get( RES_HORI_ORIENT,bInP)); }
 
 inline const SwFmtVertOrient &SwFmt::GetVertOrient(bool bInP) const
-    { return aSet.GetVertOrient(bInP); }
+    { return m_aSet.GetVertOrient(bInP); }
 inline const SwFmtHoriOrient &SwFmt::GetHoriOrient(bool bInP) const
-    { return aSet.GetHoriOrient(bInP); }
+    { return m_aSet.GetHoriOrient(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index fd95501917ba..f4d6de755c09 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -88,7 +88,7 @@ inline const SwFmtPageDesc &SwAttrSet::GetPageDesc(bool bInP) const
     { return static_cast<const SwFmtPageDesc&>(Get( RES_PAGEDESC,bInP)); }
 
 inline const SwFmtPageDesc &SwFmt::GetPageDesc(bool bInP) const
-    { return aSet.GetPageDesc(bInP); }
+    { return m_aSet.GetPageDesc(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx
index c9905276d1c7..5ac88cca87e0 100644
--- a/sw/inc/fmtrowsplt.hxx
+++ b/sw/inc/fmtrowsplt.hxx
@@ -44,7 +44,7 @@ inline const SwFmtRowSplit &SwAttrSet::GetRowSplit(bool bInP) const
     { return static_cast<const SwFmtRowSplit&>(Get( RES_ROW_SPLIT,bInP)); }
 
 inline const SwFmtRowSplit &SwFmt::GetRowSplit(bool bInP) const
-    { return aSet.GetRowSplit(bInP); }
+    { return m_aSet.GetRowSplit(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index e69da8528618..23009806fb35 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -75,7 +75,7 @@ inline const SwFmtSurround &SwAttrSet::GetSurround(bool bInP) const
     { return static_cast<const SwFmtSurround&>(Get( RES_SURROUND,bInP)); }
 
 inline const SwFmtSurround &SwFmt::GetSurround(bool bInP) const
-    { return aSet.GetSurround(bInP); }
+    { return m_aSet.GetSurround(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index f7bbdffef38d..766b59d4f8f2 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -77,7 +77,7 @@ inline const SwFmtURL &SwAttrSet::GetURL(bool bInP) const
     { return static_cast<const SwFmtURL&>(Get( RES_URL,bInP)); }
 
 inline const SwFmtURL &SwFmt::GetURL(bool bInP) const
-    { return aSet.GetURL(bInP); }
+    { return m_aSet.GetURL(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx
index 2b4e3e418211..ff6dc2315e20 100644
--- a/sw/inc/fmtwrapinfluenceonobjpos.hxx
+++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx
@@ -64,7 +64,7 @@ inline const SwFmtWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(boo
     { return static_cast<const SwFmtWrapInfluenceOnObjPos&>(Get( RES_WRAP_INFLUENCE_ON_OBJPOS,bInP)); }
 
  inline const SwFmtWrapInfluenceOnObjPos& SwFmt::GetWrapInfluenceOnObjPos(bool bInP) const
-    { return aSet.GetWrapInfluenceOnObjPos(bInP); }
+    { return m_aSet.GetWrapInfluenceOnObjPos(bInP); }
 
 #endif
 
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 2ac64cfd4a0e..63bb3bb13472 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -43,22 +43,22 @@ namespace drawinglayer { namespace attribute {
 /// Base class for various Writer styles.
 class SW_DLLPUBLIC SwFmt : public SwModify
 {
-    OUString aFmtName;
-    SwAttrSet aSet;
+    OUString m_aFmtName;
+    SwAttrSet m_aSet;
 
-    sal_uInt16 nWhichId;
-    sal_uInt16 nPoolFmtId;        /**< Id for "automatically" created formats.
+    sal_uInt16 m_nWhichId;
+    sal_uInt16 m_nPoolFmtId;        /**< Id for "automatically" created formats.
                                        (is not hard attribution!!!) */
-    sal_uInt16 nPoolHelpId;       ///< HelpId for this Pool-style.
-    sal_uInt8 nPoolHlpFileId;     ///< FilePos to Doc to these style helps.
-    bool   bWritten : 1;      ///< TRUE: already written.
-    bool   bAutoFmt : 1;      /**< FALSE: it is a template.
+    sal_uInt16 m_nPoolHelpId;       ///< HelpId for this Pool-style.
+    sal_uInt8 m_nPoolHlpFileId;     ///< FilePos to Doc to these style helps.
+    bool   m_bWritten : 1;      ///< TRUE: already written.
+    bool   m_bAutoFmt : 1;      /**< FALSE: it is a template.
                                        default is true! */
-    bool   bFmtInDTOR : 1;    /**< TRUE: Format becomes deleted. In order to be able
+    bool   m_bFmtInDTOR : 1;    /**< TRUE: Format becomes deleted. In order to be able
                                        to recognize this in FmtChg-message!! */
-    bool   bAutoUpdateFmt : 1;/**< TRUE: Set attributes of a whole paragraph
+    bool   m_bAutoUpdateFmt : 1;/**< TRUE: Set attributes of a whole paragraph
                                        at format (UI-side!). */
-    bool bHidden : 1;
+    bool m_bHidden : 1;
     std::shared_ptr<SfxGrabBagItem> m_pGrabBagItem; ///< Style InteropGrabBag.
 
 protected:
@@ -76,7 +76,7 @@ public:
     SwFmt &operator=(const SwFmt&);
 
     /// for Querying of Writer-functions.
-    sal_uInt16 Which() const { return nWhichId; }
+    sal_uInt16 Which() const { return m_nWhichId; }
 
     /// Query format information.
     virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
@@ -111,18 +111,18 @@ public:
     inline SwFmt* DerivedFrom() const { return const_cast<SwFmt*>(static_cast<const SwFmt*>(GetRegisteredIn())); }
     inline bool IsDefault() const { return DerivedFrom() == 0; }
 
-    inline OUString GetName() const   { return aFmtName; }
+    inline OUString GetName() const   { return m_aFmtName; }
     void SetName( const OUString& rNewName, bool bBroadcast=false );
     inline void SetName( const sal_Char* pNewName,
                          bool bBroadcast=false);
 
     /// For querying the attribute array.
-    inline const SwAttrSet& GetAttrSet() const { return aSet; }
+    inline const SwAttrSet& GetAttrSet() const { return m_aSet; }
 
     /** Das Doc wird jetzt am SwAttrPool gesetzt. Dadurch hat man es immer
        im Zugriff. */
-    const SwDoc *GetDoc() const         { return aSet.GetDoc(); }
-          SwDoc *GetDoc()               { return aSet.GetDoc(); }
+    const SwDoc *GetDoc() const         { return m_aSet.GetDoc(); }
+          SwDoc *GetDoc()               { return m_aSet.GetDoc(); }
 
     /// Provides access to the document settings interface.
     const IDocumentSettingAccess* getIDocumentSettingAccess() const;
@@ -145,38 +145,38 @@ public:
     IDocumentChartDataProviderAccess* getIDocumentChartDataProviderAccess();
 
     /// Get and set Pool style IDs.
-    sal_uInt16 GetPoolFmtId() const { return nPoolFmtId; }
-    void SetPoolFmtId( sal_uInt16 nId ) { nPoolFmtId = nId; }
+    sal_uInt16 GetPoolFmtId() const { return m_nPoolFmtId; }
+    void SetPoolFmtId( sal_uInt16 nId ) { m_nPoolFmtId = nId; }
 
     /// Get and set Help-IDs for document templates.
-    sal_uInt16 GetPoolHelpId() const { return nPoolHelpId; }
-    void SetPoolHelpId( sal_uInt16 nId ) { nPoolHelpId = nId; }
-    sal_uInt8 GetPoolHlpFileId() const { return nPoolHlpFileId; }
-    void SetPoolHlpFileId( sal_uInt8 nId ) { nPoolHlpFileId = nId; }
+    sal_uInt16 GetPoolHelpId() const { return m_nPoolHelpId; }
+    void SetPoolHelpId( sal_uInt16 nId ) { m_nPoolHelpId = nId; }
+    sal_uInt8 GetPoolHlpFileId() const { return m_nPoolHlpFileId; }
+    void SetPoolHlpFileId( sal_uInt8 nId ) { m_nPoolHlpFileId = nId; }
 
     /// Get attribute-description. Returns passed string.
     void GetPresentation( SfxItemPresentation ePres,
         SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText ) const
-        { aSet.GetPresentation( ePres, eCoreMetric, ePresMetric, rText ); }
+        { m_aSet.GetPresentation( ePres, eCoreMetric, ePresMetric, rText ); }
 
     /// Format-ID for reading/writing:
-    void   ResetWritten()    { bWritten = false; }
+    void   ResetWritten()    { m_bWritten = false; }
 
     /// Query / set AutoFmt-flag.
-    bool IsAuto() const                 { return bAutoFmt; }
-    void SetAuto( bool bNew = false )   { bAutoFmt = bNew; }
+    bool IsAuto() const                 { return m_bAutoFmt; }
+    void SetAuto( bool bNew = false )   { m_bAutoFmt = bNew; }
 
-    bool IsHidden() const                 { return bHidden; }
-    void SetHidden( bool bValue = false ) { bHidden = bValue; }
+    bool IsHidden() const                 { return m_bHidden; }
+    void SetHidden( bool bValue = false ) { m_bHidden = bValue; }
 
     void GetGrabBagItem(com::sun::star::uno::Any& rVal) const;
     void SetGrabBagItem(const com::sun::star::uno::Any& rVal);
 
     /// Query / set bAutoUpdateFmt-flag.
-    bool IsAutoUpdateFmt() const                { return bAutoUpdateFmt; }
-    void SetAutoUpdateFmt( bool bNew = true )   { bAutoUpdateFmt = bNew; }
+    bool IsAutoUpdateFmt() const                { return m_bAutoUpdateFmt; }
+    void SetAutoUpdateFmt( bool bNew = true )   { m_bAutoUpdateFmt = bNew; }
 
-    bool IsFmtInDTOR() const { return bFmtInDTOR; }
+    bool IsFmtInDTOR() const { return m_bFmtInDTOR; }
 
     /** GetMethods: Bool indicates whether to search only in Set (FALSE)
      or also in Parents.
diff --git a/sw/inc/frmatr.hxx b/sw/inc/frmatr.hxx
index ae826122cbb2..4a68855a734b 100644
--- a/sw/inc/frmatr.hxx
+++ b/sw/inc/frmatr.hxx
@@ -70,31 +70,31 @@ inline const SdrTextVertAdjustItem &SwAttrSet::GetTextVertAdjust(bool bInP) cons
 
 // Implementation of FrameAttribute methods of SwFmt.
 inline const SvxPaperBinItem &SwFmt::GetPaperBin(bool bInP) const
-    { return aSet.GetPaperBin(bInP); }
+    { return m_aSet.GetPaperBin(bInP); }
 inline const SvxLRSpaceItem &SwFmt::GetLRSpace(bool bInP) const
-    { return aSet.GetLRSpace(bInP); }
+    { return m_aSet.GetLRSpace(bInP); }
 inline const SvxULSpaceItem &SwFmt::GetULSpace(bool bInP) const
-    { return aSet.GetULSpace(bInP); }
+    { return m_aSet.GetULSpace(bInP); }
 inline const SvxPrintItem &SwFmt::GetPrint(bool bInP) const
-    { return aSet.GetPrint(bInP); }
+    { return m_aSet.GetPrint(bInP); }
 inline const SvxOpaqueItem &SwFmt::GetOpaque(bool bInP) const
-    { return aSet.GetOpaque(bInP); }
+    { return m_aSet.GetOpaque(bInP); }
 inline const SvxProtectItem &SwFmt::GetProtect(bool bInP) const
-    { return aSet.GetProtect(bInP); }
+    { return m_aSet.GetProtect(bInP); }
 inline const SvxBoxItem &SwFmt::GetBox(bool bInP) const
-    { return aSet.GetBox(bInP); }
+    { return m_aSet.GetBox(bInP); }
 inline const SvxFmtKeepItem &SwFmt::GetKeep(bool bInP) const
-    { return aSet.GetKeep(bInP); }
+    { return m_aSet.GetKeep(bInP); }
 inline const SvxShadowItem &SwFmt::GetShadow(bool bInP) const
-    { return aSet.GetShadow(bInP); }
+    { return m_aSet.GetShadow(bInP); }
 inline const SvxFmtBreakItem &SwFmt::GetBreak(bool bInP) const
-    { return aSet.GetBreak(bInP); }
+    { return m_aSet.GetBreak(bInP); }
 inline const SvxMacroItem &SwFmt::GetMacro(bool bInP) const
-    { return aSet.GetMacro(bInP); }
+    { return m_aSet.GetMacro(bInP); }
 inline const SvxFrameDirectionItem  &SwFmt::GetFrmDir(bool bInP) const
-    { return aSet.GetFrmDir(bInP); }
+    { return m_aSet.GetFrmDir(bInP); }
 inline const SdrTextVertAdjustItem &SwFmt::GetTextVertAdjust(bool bInP) const
-    { return aSet.GetTextVertAdjust(bInP); }
+    { return m_aSet.GetTextVertAdjust(bInP); }
 
 #endif // INCLUDED_SW_INC_FRMATR_HXX
 
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index 8ae55092cfa4..2f09cb190435 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -316,29 +316,29 @@ inline const SwDrawModeGrf      &SwAttrSet::GetDrawModeGrf(bool bInP) const
 
 // Implementation of graphics attributes methods of SwFmt
 inline const SwMirrorGrf &SwFmt::GetMirrorGrf(bool bInP) const
-    { return aSet.GetMirrorGrf(bInP); }
+    { return m_aSet.GetMirrorGrf(bInP); }
 inline const SwCropGrf   &SwFmt::GetCropGrf(bool bInP) const
-    { return aSet.GetCropGrf(bInP); }
+    { return m_aSet.GetCropGrf(bInP); }
 inline const SwRotationGrf &SwFmt::GetRotationGrf(bool bInP) const
-    { return aSet.GetRotationGrf(bInP); }
+    { return m_aSet.GetRotationGrf(bInP); }
 inline const SwLuminanceGrf &SwFmt::GetLuminanceGrf(bool bInP) const
-    { return aSet.GetLuminanceGrf( bInP); }
+    { return m_aSet.GetLuminanceGrf( bInP); }
 inline const SwContrastGrf &SwFmt::GetContrastGrf(bool bInP) const
-    { return aSet.GetContrastGrf( bInP); }
+    { return m_aSet.GetContrastGrf( bInP); }
 inline const SwChannelRGrf &SwFmt::GetChannelRGrf(bool bInP) const
-    { return aSet.GetChannelRGrf( bInP); }
+    { return m_aSet.GetChannelRGrf( bInP); }
 inline const SwChannelGGrf &SwFmt::GetChannelGGrf(bool bInP) const
-    { return aSet.GetChannelGGrf( bInP); }
+    { return m_aSet.GetChannelGGrf( bInP); }
 inline const SwChannelBGrf &SwFmt::GetChannelBGrf(bool bInP) const
-    { return aSet.GetChannelBGrf( bInP); }
+    { return m_aSet.GetChannelBGrf( bInP); }
 inline const SwGammaGrf &SwFmt::GetGammaGrf(bool bInP) const
-    { return aSet.GetGammaGrf( bInP); }
+    { return m_aSet.GetGammaGrf( bInP); }
 inline const SwInvertGrf &SwFmt::GetInvertGrf(bool bInP) const
-    { return aSet.GetInvertGrf( bInP); }
+    { return m_aSet.GetInvertGrf( bInP); }
 inline const SwTransparencyGrf &SwFmt::GetTransparencyGrf(bool bInP) const
-    { return aSet.GetTransparencyGrf( bInP); }
+    { return m_aSet.GetTransparencyGrf( bInP); }
 inline const SwDrawModeGrf &SwFmt::GetDrawModeGrf(bool bInP) const
-    { return aSet.GetDrawModeGrf(bInP); }
+    { return m_aSet.GetDrawModeGrf(bInP); }
 
 #endif // INCLUDED_SW_INC_GRFATR_HXX
 
diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx
index 94547d3ce8d8..fe1a417d6d95 100644
--- a/sw/inc/hfspacingitem.hxx
+++ b/sw/inc/hfspacingitem.hxx
@@ -44,7 +44,7 @@ inline const SwHeaderAndFooterEatSpacingItem &SwAttrSet::GetHeaderAndFooterEatSp
     { return static_cast<const SwHeaderAndFooterEatSpacingItem&>(Get( RES_HEADER_FOOTER_EAT_SPACING,bInP)); }
 
 inline const SwHeaderAndFooterEatSpacingItem &SwFmt::GetHeaderAndFooterEatSpacing(bool bInP) const
-    { return aSet.GetHeaderAndFooterEatSpacing(bInP); }
+    { return m_aSet.GetHeaderAndFooterEatSpacing(bInP); }
 
 #endif
 
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index f606af9c672b..6fbe6c99415d 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -238,37 +238,37 @@ inline const SwParaConnectBorderItem &SwAttrSet::GetParaConnectBorder(bool bInP)
 
 // Implementation of paragraph-attributes methods of SwFmt
 inline const SvxLineSpacingItem &SwFmt::GetLineSpacing(bool bInP) const
-    {   return aSet.GetLineSpacing(bInP); }
+    {   return m_aSet.GetLineSpacing(bInP); }
 inline const SvxAdjustItem &SwFmt::GetAdjust(bool bInP) const
-    {   return aSet.GetAdjust(bInP); }
+    {   return m_aSet.GetAdjust(bInP); }
 inline const SvxFmtSplitItem &SwFmt::GetSplit(bool bInP) const
-    {   return aSet.GetSplit(bInP); }
+    {   return m_aSet.GetSplit(bInP); }
 inline const SwRegisterItem &SwFmt::GetRegister(bool bInP) const
-    {   return aSet.GetRegister(bInP); }
+    {   return m_aSet.GetRegister(bInP); }
 inline const SvxWidowsItem &SwFmt::GetWidows(bool bInP) const
-    {   return aSet.GetWidows(bInP); }
+    {   return m_aSet.GetWidows(bInP); }
 inline const SvxOrphansItem &SwFmt::GetOrphans(bool bInP) const
-    {   return aSet.GetOrphans(bInP); }
+    {   return m_aSet.GetOrphans(bInP); }
 inline const SvxTabStopItem &SwFmt::GetTabStops(bool bInP) const
-    {   return aSet.GetTabStops(bInP); }
+    {   return m_aSet.GetTabStops(bInP); }
 inline const SvxHyphenZoneItem &SwFmt::GetHyphenZone(bool bInP) const
-    {   return aSet.GetHyphenZone(bInP); }
+    {   return m_aSet.GetHyphenZone(bInP); }
 inline const SwFmtDrop &SwFmt::GetDrop(bool bInP) const
-    {   return aSet.GetDrop(bInP); }
+    {   return m_aSet.GetDrop(bInP); }
 inline const SwNumRuleItem &SwFmt::GetNumRule(bool bInP) const
-    {   return aSet.GetNumRule(bInP); }
+    {   return m_aSet.GetNumRule(bInP); }
 inline const SvxScriptSpaceItem& SwFmt::GetScriptSpace(bool bInP) const
-    {   return aSet.GetScriptSpace(bInP) ; }
+    {   return m_aSet.GetScriptSpace(bInP) ; }
 inline const SvxHangingPunctuationItem &SwFmt::GetHangingPunctuation(bool bInP) const
-    {   return aSet.GetHangingPunctuation(bInP) ; }
+    {   return m_aSet.GetHangingPunctuation(bInP) ; }
 inline const SvxForbiddenRuleItem &SwFmt::GetForbiddenRule(bool bInP) const
-    {   return static_cast<const SvxForbiddenRuleItem&>(aSet.Get(RES_PARATR_FORBIDDEN_RULES, bInP)); }
+    {   return static_cast<const SvxForbiddenRuleItem&>(m_aSet.Get(RES_PARATR_FORBIDDEN_RULES, bInP)); }
 inline const SvxParaVertAlignItem &SwFmt::GetParaVertAlign(bool bInP) const
-    {   return static_cast<const SvxParaVertAlignItem&>(aSet.Get( RES_PARATR_VERTALIGN, bInP )); }
+    {   return static_cast<const SvxParaVertAlignItem&>(m_aSet.Get( RES_PARATR_VERTALIGN, bInP )); }
 inline const SvxParaGridItem &SwFmt::GetParaGrid(bool bInP) const
-    {   return static_cast<const SvxParaGridItem&>(aSet.Get( RES_PARATR_SNAPTOGRID, bInP )); }
+    {   return static_cast<const SvxParaGridItem&>(m_aSet.Get( RES_PARATR_SNAPTOGRID, bInP )); }
 inline const SwParaConnectBorderItem &SwFmt::GetParaConnectBorder(bool bInP) const
-    {   return static_cast<const SwParaConnectBorderItem&>(aSet.Get( RES_PARATR_CONNECT_BORDER, bInP )); }
+    {   return static_cast<const SwParaConnectBorderItem&>(m_aSet.Get( RES_PARATR_CONNECT_BORDER, bInP )); }
 
 #endif
 
diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx
index 2972d3546740..8e67ce5b032f 100644
--- a/sw/inc/tgrditem.hxx
+++ b/sw/inc/tgrditem.hxx
@@ -109,7 +109,7 @@ public:
 inline const SwTextGridItem &SwAttrSet::GetTextGrid(bool bInP) const
     {   return static_cast<const SwTextGridItem&>(Get( RES_TEXTGRID, bInP )); }
 inline const SwTextGridItem &SwFmt::GetTextGrid(bool bInP) const
-    {   return static_cast<const SwTextGridItem&>(aSet.Get( RES_TEXTGRID, bInP )); }
+    {   return static_cast<const SwTextGridItem&>(m_aSet.Get( RES_TEXTGRID, bInP )); }
 
 #endif
 
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 3e32dfef9713..9344426e9b4b 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -44,66 +44,66 @@ SwFmt::SwFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
               const sal_uInt16* pWhichRanges, SwFmt *pDrvdFrm,
               sal_uInt16 nFmtWhich )
     : SwModify( pDrvdFrm ),
-    aFmtName( OUString::createFromAscii(pFmtNm) ),
-    aSet( rPool, pWhichRanges ),
-    nWhichId( nFmtWhich ),
-    nPoolFmtId( USHRT_MAX ),
-    nPoolHelpId( USHRT_MAX ),
-    nPoolHlpFileId( UCHAR_MAX )
+    m_aFmtName( OUString::createFromAscii(pFmtNm) ),
+    m_aSet( rPool, pWhichRanges ),
+    m_nWhichId( nFmtWhich ),
+    m_nPoolFmtId( USHRT_MAX ),
+    m_nPoolHelpId( USHRT_MAX ),
+    m_nPoolHlpFileId( UCHAR_MAX )
 {
-    bAutoUpdateFmt = false; // LAYER_IMPL
-    bAutoFmt = true;
-    bWritten = bFmtInDTOR = bHidden = false;
+    m_bAutoUpdateFmt = false; // LAYER_IMPL
+    m_bAutoFmt = true;
+    m_bWritten = m_bFmtInDTOR = m_bHidden = false;
 
     if( pDrvdFrm )
-        aSet.SetParent( &pDrvdFrm->aSet );
+        m_aSet.SetParent( &pDrvdFrm->m_aSet );
 }
 
 SwFmt::SwFmt( SwAttrPool& rPool, const OUString& rFmtNm,
               const sal_uInt16* pWhichRanges, SwFmt* pDrvdFrm,
               sal_uInt16 nFmtWhich )
     : SwModify( pDrvdFrm ),
-    aFmtName( rFmtNm ),
-    aSet( rPool, pWhichRanges ),
-    nWhichId( nFmtWhich ),
-    nPoolFmtId( USHRT_MAX ),
-    nPoolHelpId( USHRT_MAX ),
-    nPoolHlpFileId( UCHAR_MAX )
+    m_aFmtName( rFmtNm ),
+    m_aSet( rPool, pWhichRanges ),
+    m_nWhichId( nFmtWhich ),
+    m_nPoolFmtId( USHRT_MAX ),
+    m_nPoolHelpId( USHRT_MAX ),
+    m_nPoolHlpFileId( UCHAR_MAX )
 {
-    bAutoUpdateFmt = false; // LAYER_IMPL
-    bAutoFmt = true;
-    bWritten = bFmtInDTOR = bHidden = false;
+    m_bAutoUpdateFmt = false; // LAYER_IMPL
+    m_bAutoFmt = true;
+    m_bWritten = m_bFmtInDTOR = m_bHidden = false;
 
     if( pDrvdFrm )
-        aSet.SetParent( &pDrvdFrm->aSet );
+        m_aSet.SetParent( &pDrvdFrm->m_aSet );
 }
 
 SwFmt::SwFmt( const SwFmt& rFmt )
     : SwModify( rFmt.DerivedFrom() ),
-    aFmtName( rFmt.aFmtName ),
-    aSet( rFmt.aSet ),
-    nWhichId( rFmt.nWhichId ),
-    nPoolFmtId( rFmt.GetPoolFmtId() ),
-    nPoolHelpId( rFmt.GetPoolHelpId() ),
-    nPoolHlpFileId( rFmt.GetPoolHlpFileId() )
+    m_aFmtName( rFmt.m_aFmtName ),
+    m_aSet( rFmt.m_aSet ),
+    m_nWhichId( rFmt.m_nWhichId ),
+    m_nPoolFmtId( rFmt.GetPoolFmtId() ),
+    m_nPoolHelpId( rFmt.GetPoolHelpId() ),
+    m_nPoolHlpFileId( rFmt.GetPoolHlpFileId() )
 {
-    bWritten = bFmtInDTOR = false; // LAYER_IMPL
-    bAutoFmt = rFmt.bAutoFmt;
-    bHidden = rFmt.bHidden;
-    bAutoUpdateFmt = rFmt.bAutoUpdateFmt;
+    m_bWritten = m_bFmtInDTOR = false; // LAYER_IMPL
+    m_bAutoFmt = rFmt.m_bAutoFmt;
+    m_bHidden = rFmt.m_bHidden;
+    m_bAutoUpdateFmt = rFmt.m_bAutoUpdateFmt;
 
     if( rFmt.DerivedFrom() )
-        aSet.SetParent( &rFmt.DerivedFrom()->aSet );
+        m_aSet.SetParent( &rFmt.DerivedFrom()->m_aSet );
     // a few special treatments for attributes
-    aSet.SetModifyAtAttr( this );
+    m_aSet.SetModifyAtAttr( this );
 }
 
 SwFmt &SwFmt::operator=(const SwFmt& rFmt)
 {
-    nWhichId = rFmt.nWhichId;
-    nPoolFmtId = rFmt.GetPoolFmtId();
-    nPoolHelpId = rFmt.GetPoolHelpId();
-    nPoolHlpFileId = rFmt.GetPoolHlpFileId();
+    m_nWhichId = rFmt.m_nWhichId;
+    m_nPoolFmtId = rFmt.GetPoolFmtId();
+    m_nPoolHelpId = rFmt.GetPoolHelpId();
+    m_nPoolHlpFileId = rFmt.GetPoolHlpFileId();
 
     if ( IsInCache() )
     {
@@ -113,19 +113,19 @@ SwFmt &SwFmt::operator=(const SwFmt& rFmt)
     SetInSwFntCache( false );
 
     // copy only array with attributes delta
-    SwAttrSet aOld( *aSet.GetPool(), aSet.GetRanges() ),
-              aNew( *aSet.GetPool(), aSet.GetRanges() );
-    aSet.Intersect_BC( rFmt.aSet, &aOld, &aNew );
-    (void)aSet.Put_BC( rFmt.aSet, &aOld, &aNew );
+    SwAttrSet aOld( *m_aSet.GetPool(), m_aSet.GetRanges() ),
+              aNew( *m_aSet.GetPool(), m_aSet.GetRanges() );
+    m_aSet.Intersect_BC( rFmt.m_aSet, &aOld, &aNew );
+    (void)m_aSet.Put_BC( rFmt.m_aSet, &aOld, &aNew );
 
     // a few special treatments for attributes
-    aSet.SetModifyAtAttr( this );
+    m_aSet.SetModifyAtAttr( this );
 
     // create PoolItem attribute for Modify
     if( aOld.Count() )
     {
-        SwAttrSetChg aChgOld( aSet, aOld );
-        SwAttrSetChg aChgNew( aSet, aNew );
+        SwAttrSetChg aChgOld( m_aSet, aOld );
+        SwAttrSetChg aChgNew( m_aSet, aNew );
         ModifyNotification( &aChgOld, &aChgNew ); // send all modified ones
     }
 
@@ -136,16 +136,16 @@ SwFmt &SwFmt::operator=(const SwFmt& rFmt)
         if( rFmt.GetRegisteredIn() )
         {
             const_cast<SwFmt&>(rFmt).GetRegisteredInNonConst()->Add(this);
-            aSet.SetParent( &rFmt.aSet );
+            m_aSet.SetParent( &rFmt.m_aSet );
         }
         else
         {
-            aSet.SetParent( 0 );
+            m_aSet.SetParent( 0 );
         }
     }
-    bAutoFmt = rFmt.bAutoFmt;
-    bHidden = rFmt.bHidden;
-    bAutoUpdateFmt = rFmt.bAutoUpdateFmt;
+    m_bAutoFmt = rFmt.m_bAutoFmt;
+    m_bHidden = rFmt.m_bHidden;
+    m_bAutoUpdateFmt = rFmt.m_bAutoUpdateFmt;
     return *this;
 }
 
@@ -154,14 +154,14 @@ void SwFmt::SetName( const OUString& rNewName, bool bBroadcast )
     OSL_ENSURE( !IsDefault(), "SetName: Defaultformat" );
     if( bBroadcast )
     {
-        SwStringMsgPoolItem aOld( RES_NAME_CHANGED, aFmtName );
+        SwStringMsgPoolItem aOld( RES_NAME_CHANGED, m_aFmtName );
         SwStringMsgPoolItem aNew( RES_NAME_CHANGED, rNewName );
-        aFmtName = rNewName;
+        m_aFmtName = rNewName;
         ModifyNotification( &aOld, &aNew );
     }
     else
     {
-        aFmtName = rNewName;
+        m_aFmtName = rNewName;
     }
 }
 
@@ -187,35 +187,35 @@ void SwFmt::CopyAttrs( const SwFmt& rFmt, bool bReplace )
     SetInSwFntCache( false );
 
     // special treatments for some attributes
-    SwAttrSet* pChgSet = const_cast<SwAttrSet*>(&rFmt.aSet);
+    SwAttrSet* pChgSet = const_cast<SwAttrSet*>(&rFmt.m_aSet);
 
     if( !bReplace )     // refresh only those that are not set?
     {
-        if( pChgSet == &rFmt.aSet )
-            pChgSet = new SwAttrSet( rFmt.aSet );
-        pChgSet->Differentiate( aSet );
+        if( pChgSet == &rFmt.m_aSet )
+            pChgSet = new SwAttrSet( rFmt.m_aSet );
+        pChgSet->Differentiate( m_aSet );
     }
 
     // copy only array with attributes delta
-    if( pChgSet->GetPool() != aSet.GetPool() )
+    if( pChgSet->GetPool() != m_aSet.GetPool() )
         pChgSet->CopyToModify( *this );
     else
     {
-        SwAttrSet aOld( *aSet.GetPool(), aSet.GetRanges() ),
-                  aNew( *aSet.GetPool(), aSet.GetRanges() );
+        SwAttrSet aOld( *m_aSet.GetPool(), m_aSet.GetRanges() ),
+                  aNew( *m_aSet.GetPool(), m_aSet.GetRanges() );
 
-        if ( aSet.Put_BC( *pChgSet, &aOld, &aNew ) )
+        if ( m_aSet.Put_BC( *pChgSet, &aOld, &aNew ) )
         {
             // a few special treatments for attributes
-            aSet.SetModifyAtAttr( this );
+            m_aSet.SetModifyAtAttr( this );
 
-            SwAttrSetChg aChgOld( aSet, aOld );
-            SwAttrSetChg aChgNew( aSet, aNew );
+            SwAttrSetChg aChgOld( m_aSet, aOld );
+            SwAttrSetChg aChgNew( m_aSet, aNew );
             ModifyNotification( &aChgOld, &aChgNew ); // send all modified ones
         }
     }
 
-    if( pChgSet != &rFmt.aSet ) // was a Set created?
+    if( pChgSet != &rFmt.m_aSet ) // was a Set created?
         delete pChgSet;
 }
 
@@ -227,7 +227,7 @@ SwFmt::~SwFmt()
     {
         OSL_ENSURE( DerivedFrom(), "SwFmt::~SwFmt: Def dependents!" );
 
-        bFmtInDTOR = true;
+        m_bFmtInDTOR = true;
 
         SwFmt* pParentFmt = DerivedFrom();
         if( !pParentFmt )
@@ -274,26 +274,26 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
                 {
                     // if parent so register in new parent
                     pFmt->DerivedFrom()->Add( this );
-                    aSet.SetParent( &DerivedFrom()->aSet );
+                    m_aSet.SetParent( &DerivedFrom()->m_aSet );
                 }
                 else
                 {
                     // otherwise de-register at least from dying one
                     DerivedFrom()->Remove( this );
-                    aSet.SetParent( 0 );
+                    m_aSet.SetParent( 0 );
                 }
             }
         }
         break;
     case RES_ATTRSET_CHG:
-        if (pOldValue && pNewValue && static_cast<const SwAttrSetChg*>(pOldValue)->GetTheChgdSet() != &aSet)
+        if (pOldValue && pNewValue && static_cast<const SwAttrSetChg*>(pOldValue)->GetTheChgdSet() != &m_aSet)
         {
             // pass only those that are not set
             SwAttrSetChg aOld( *static_cast<const SwAttrSetChg*>(pOldValue) );
             SwAttrSetChg aNew( *static_cast<const SwAttrSetChg*>(pNewValue) );
 
-            aOld.GetChgSet()->Differentiate( aSet );
-            aNew.GetChgSet()->Differentiate( aSet );
+            aOld.GetChgSet()->Differentiate( m_aSet );
+            aNew.GetChgSet()->Differentiate( m_aSet );
 
             if( aNew.Count() )
                 NotifyClients( &aOld, &aNew );
@@ -310,7 +310,7 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
             static_cast<const SwFmtChg*>(pNewValue)->pChangedFmt == GetRegisteredIn() )
         {
             // attach Set to new parent
-            aSet.SetParent( DerivedFrom() ? &DerivedFrom()->aSet : 0 );
+            m_aSet.SetParent( DerivedFrom() ? &DerivedFrom()->m_aSet : 0 );
         }
         break;
     case RES_RESET_FMTWRITTEN:
@@ -329,7 +329,7 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
     default:
         {
             // attribute is defined in this format
-            if( SfxItemState::SET == aSet.GetItemState( nWhich, false ))
+            if( SfxItemState::SET == m_aSet.GetItemState( nWhich, false ))
             {
                 // DropCaps might come into this block
                 OSL_ENSURE( RES_PARATR_DROP == nWhich, "Modify was sent without sender" );
@@ -382,7 +382,7 @@ bool SwFmt::SetDerivedFrom(SwFmt *pDerFrom)
     SetInSwFntCache( false );
 
     pDerFrom->Add( this );
-    aSet.SetParent( &pDerFrom->aSet );
+    m_aSet.SetParent( &pDerFrom->m_aSet );
 
     SwFmtChg aOldFmt( this );
     SwFmtChg aNewFmt( this );
@@ -407,12 +407,12 @@ const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich, bool bInParents ) const
         // fill the local static SvxBrushItem from the current ItemSet so that
         // the fill attributes [XATTR_FILL_FIRST .. XATTR_FILL_LAST] are used
         // as good as possible to create a fallback representation and return that
-        aSvxBrushItem = getSvxBrushItemFromSourceSet(aSet, RES_BACKGROUND, bInParents);
+        aSvxBrushItem = getSvxBrushItemFromSourceSet(m_aSet, RES_BACKGROUND, bInParents);
 
         return aSvxBrushItem;
     }
 
-    return aSet.Get( nWhich, bInParents );
+    return m_aSet.Get( nWhich, bInParents );
 }
 
 SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, bool bSrchInParent, const SfxPoolItem **ppItem ) const
@@ -432,7 +432,7 @@ SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, bool bSrchInParent, const S
 
             static SvxBrushItem aSvxBrushItem(RES_BACKGROUND);
 
-            aSvxBrushItem = getSvxBrushItemFromSourceSet(aSet, RES_BACKGROUND, bSrchInParent);
+            aSvxBrushItem = getSvxBrushItemFromSourceSet(m_aSet, RES_BACKGROUND, bSrchInParent);
             if( ppItem )
                 *ppItem = &aSvxBrushItem;
 
@@ -447,7 +447,7 @@ SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, bool bSrchInParent, const S
         return SfxItemState::DEFAULT;
     }
 
-    return aSet.GetItemState( nWhich, bSrchInParent, ppItem );
+    return m_aSet.GetItemState( nWhich, bSrchInParent, ppItem );
 }
 
 SfxItemState SwFmt::GetBackgroundState(SvxBrushItem &rItem, bool bSrchInParent) const
@@ -463,7 +463,7 @@ SfxItemState SwFmt::GetBackgroundState(SvxBrushItem &rItem, bool bSrchInParent)
             // if yes, fill the local SvxBrushItem using the new fill attributes
             // as good as possible to have an instance for the pointer to point
             // to and return as state that it is set
-            rItem = getSvxBrushItemFromSourceSet(aSet, RES_BACKGROUND, bSrchInParent);
+            rItem = getSvxBrushItemFromSourceSet(m_aSet, RES_BACKGROUND, bSrchInParent);
             return SfxItemState::SET;
         }
 
@@ -472,7 +472,7 @@ SfxItemState SwFmt::GetBackgroundState(SvxBrushItem &rItem, bool bSrchInParent)
     }
 
     const SfxPoolItem* pItem = 0;
-    SfxItemState eRet = aSet.GetItemState(RES_BACKGROUND, bSrchInParent, &pItem);
+    SfxItemState eRet = m_aSet.GetItemState(RES_BACKGROUND, bSrchInParent, &pItem);
     if (pItem)
         rItem = *static_cast<const SvxBrushItem*>(pItem);
     return eRet;
@@ -493,7 +493,7 @@ bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
     {
         //UUUU FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
         SAL_INFO("sw.core", "Do no longer use SvxBrushItem, instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST] FillAttributes (simple fallback is in place and used)");
-        SfxItemSet aTempSet(*aSet.GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST, 0, 0);
+        SfxItemSet aTempSet(*m_aSet.GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST, 0, 0);
         const SvxBrushItem& rSource = static_cast< const SvxBrushItem& >(rAttr);
 
         // fill a local ItemSet with the attributes corresponding as good as possible
@@ -503,23 +503,23 @@ bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
 
         if(IsModifyLocked())
         {
-            if( ( bRet = aSet.Put( aTempSet ) ) )
+            if( ( bRet = m_aSet.Put( aTempSet ) ) )
             {
-                aSet.SetModifyAtAttr( this );
+                m_aSet.SetModifyAtAttr( this );
             }
         }
         else
         {
-            SwAttrSet aOld(*aSet.GetPool(), aSet.GetRanges()), aNew(*aSet.GetPool(), aSet.GetRanges());
+            SwAttrSet aOld(*m_aSet.GetPool(), m_aSet.GetRanges()), aNew(*m_aSet.GetPool(), m_aSet.GetRanges());
 
-            bRet = aSet.Put_BC(aTempSet, &aOld, &aNew);
+            bRet = m_aSet.Put_BC(aTempSet, &aOld, &aNew);
 
             if(bRet)
             {
-                aSet.SetModifyAtAttr(this);
+                m_aSet.SetModifyAtAttr(this);
 
-                SwAttrSetChg aChgOld(aSet, aOld);
-                SwAttrSetChg aChgNew(aSet, aNew);
+                SwAttrSetChg aChgOld(m_aSet, aOld);
+                SwAttrSetChg aChgNew(m_aSet, aNew);
 
                 ModifyNotification(&aChgOld, &aChgNew);
             }
@@ -536,8 +536,8 @@ bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
           (RES_GRFFMTCOLL == nFmtWhich  ||
            RES_TXTFMTCOLL == nFmtWhich ) ) )
     {
-        if( ( bRet = (0 != aSet.Put( rAttr ))) )
-            aSet.SetModifyAtAttr( this );
+        if( ( bRet = (0 != m_aSet.Put( rAttr ))) )
+            m_aSet.SetModifyAtAttr( this );
         // #i71574#
         if ( nFmtWhich == RES_TXTFMTCOLL && rAttr.Which() == RES_PARATR_NUMRULE )
         {
@@ -547,17 +547,17 @@ bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
     else
     {
         // copy only array with attributes delta
-        SwAttrSet aOld( *aSet.GetPool(), aSet.GetRanges() ),
-                  aNew( *aSet.GetPool(), aSet.GetRanges() );
+        SwAttrSet aOld( *m_aSet.GetPool(), m_aSet.GetRanges() ),
+                  aNew( *m_aSet.GetPool(), m_aSet.GetRanges() );
 
-        bRet = aSet.Put_BC( rAttr, &aOld, &aNew );
+        bRet = m_aSet.Put_BC( rAttr, &aOld, &aNew );
         if( bRet )
         {
             // some special treatments for attributes
-            aSet.SetModifyAtAttr( this );
+            m_aSet.SetModifyAtAttr( this );
 
-            SwAttrSetChg aChgOld( aSet, aOld );
-            SwAttrSetChg aChgNew( aSet, aNew );
+            SwAttrSetChg aChgOld( m_aSet, aOld );
+            SwAttrSetChg aChgNew( m_aSet, aNew );
             ModifyNotification( &aChgOld, &aChgNew ); // send all modified ones
         }
     }
@@ -607,23 +607,23 @@ bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
 
             if(IsModifyLocked())
             {
-                if( ( bRet = aSet.Put( aTempSet ) ) )
+                if( ( bRet = m_aSet.Put( aTempSet ) ) )
                 {
-                    aSet.SetModifyAtAttr( this );
+                    m_aSet.SetModifyAtAttr( this );
                 }
             }
             else
             {
-                SwAttrSet aOld(*aSet.GetPool(), aSet.GetRanges()), aNew(*aSet.GetPool(), aSet.GetRanges());
+                SwAttrSet aOld(*m_aSet.GetPool(), m_aSet.GetRanges()), aNew(*m_aSet.GetPool(), m_aSet.GetRanges());
 
-                bRet = aSet.Put_BC(aTempSet, &aOld, &aNew);
+                bRet = m_aSet.Put_BC(aTempSet, &aOld, &aNew);
 
                 if(bRet)
                 {
-                    aSet.SetModifyAtAttr(this);
+                    m_aSet.SetModifyAtAttr(this);
 
-                    SwAttrSetChg aChgOld(aSet, aOld);
-                    SwAttrSetChg aChgNew(aSet, aNew);
+                    SwAttrSetChg aChgOld(m_aSet, aOld);
+                    SwAttrSetChg aChgNew(m_aSet, aNew);
 
                     ModifyNotification(&aChgOld, &aChgNew);
                 }
@@ -641,8 +641,8 @@ bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
            ( RES_GRFFMTCOLL == nFmtWhich ||
              RES_TXTFMTCOLL == nFmtWhich ) ) )
     {
-        if( ( bRet = aSet.Put( aTempSet )) )
-            aSet.SetModifyAtAttr( this );
+        if( ( bRet = m_aSet.Put( aTempSet )) )
+            m_aSet.SetModifyAtAttr( this );
         // #i71574#
         if ( nFmtWhich == RES_TXTFMTCOLL )
         {
@@ -651,15 +651,15 @@ bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
     }
     else
     {
-        SwAttrSet aOld( *aSet.GetPool(), aSet.GetRanges() ),
-                  aNew( *aSet.GetPool(), aSet.GetRanges() );
-        bRet = aSet.Put_BC( aTempSet, &aOld, &aNew );
+        SwAttrSet aOld( *m_aSet.GetPool(), m_aSet.GetRanges() ),
+                  aNew( *m_aSet.GetPool(), m_aSet.GetRanges() );
+        bRet = m_aSet.Put_BC( aTempSet, &aOld, &aNew );
         if( bRet )
         {
             // some special treatments for attributes
-            aSet.SetModifyAtAttr( this );
-            SwAttrSetChg aChgOld( aSet, aOld );
-            SwAttrSetChg aChgNew( aSet, aNew );
+            m_aSet.SetModifyAtAttr( this );
+            SwAttrSetChg aChgOld( m_aSet, aOld );
+            SwAttrSetChg aChgNew( m_aSet, aNew );
             ModifyNotification( &aChgOld, &aChgNew ); // send all modified ones
         }
     }
@@ -669,7 +669,7 @@ bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
 // remove Hint using nWhich from array with delta
 bool SwFmt::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
 {
-    if( !aSet.Count() )
+    if( !m_aSet.Count() )
         return false;
 
     if( !nWhich2 || nWhich2 < nWhich1 )
@@ -684,16 +684,16 @@ bool SwFmt::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
     // if Modify is locked then no modifications will be sent
     if( IsModifyLocked() )
         return 0 != (( nWhich2 == nWhich1 )
-                     ? aSet.ClearItem( nWhich1 )
-                     : aSet.ClearItem_BC( nWhich1, nWhich2 ));
+                     ? m_aSet.ClearItem( nWhich1 )
+                     : m_aSet.ClearItem_BC( nWhich1, nWhich2 ));
 
-    SwAttrSet aOld( *aSet.GetPool(), aSet.GetRanges() ),
-              aNew( *aSet.GetPool(), aSet.GetRanges() );
-    bool bRet = 0 != aSet.ClearItem_BC( nWhich1, nWhich2, &aOld, &aNew );
+    SwAttrSet aOld( *m_aSet.GetPool(), m_aSet.GetRanges() ),
+              aNew( *m_aSet.GetPool(), m_aSet.GetRanges() );
+    bool bRet = 0 != m_aSet.ClearItem_BC( nWhich1, nWhich2, &aOld, &aNew );
     if( bRet )
     {
-        SwAttrSetChg aChgOld( aSet, aOld );
-        SwAttrSetChg aChgNew( aSet, aNew );
+        SwAttrSetChg aChgOld( m_aSet, aOld );
+        SwAttrSetChg aChgNew( m_aSet, aNew );
         ModifyNotification( &aChgOld, &aChgNew ); // send all modified ones
     }
     return bRet;
@@ -702,7 +702,7 @@ bool SwFmt::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
 // #i73790#
 sal_uInt16 SwFmt::ResetAllFmtAttr()
 {
-    if( !aSet.Count() )
+    if( !m_aSet.Count() )
         return 0;
 
     if ( IsInCache() )
@@ -714,15 +714,15 @@ sal_uInt16 SwFmt::ResetAllFmtAttr()
 
     // if Modify is locked then no modifications will be sent
     if( IsModifyLocked() )
-        return aSet.ClearItem( 0 );
+        return m_aSet.ClearItem( 0 );
 
-    SwAttrSet aOld( *aSet.GetPool(), aSet.GetRanges() ),
-              aNew( *aSet.GetPool(), aSet.GetRanges() );
-    bool bRet = 0 != aSet.ClearItem_BC( 0, &aOld, &aNew );
+    SwAttrSet aOld( *m_aSet.GetPool(), m_aSet.GetRanges() ),
+              aNew( *m_aSet.GetPool(), m_aSet.GetRanges() );
+    bool bRet = 0 != m_aSet.ClearItem_BC( 0, &aOld, &aNew );
     if( bRet )
     {
-        SwAttrSetChg aChgOld( aSet, aOld );
-        SwAttrSetChg aChgNew( aSet, aNew );
+        SwAttrSetChg aChgOld( m_aSet, aOld );
+        SwAttrSetChg aChgNew( m_aSet, aNew );
         ModifyNotification( &aChgOld, &aChgNew ); // send all modified ones
     }
     return aNew.Count();
@@ -735,7 +735,7 @@ bool SwFmt::GetInfo( SfxPoolItem& rInfo ) const
 
 void SwFmt::DelDiffs( const SfxItemSet& rSet )
 {
-    if( !aSet.Count() )
+    if( !m_aSet.Count() )
         return;
 
     if ( IsInCache() )
@@ -748,17 +748,17 @@ void SwFmt::DelDiffs( const SfxItemSet& rSet )
     // if Modify is locked then no modifications will be sent
     if( IsModifyLocked() )
     {
-        aSet.Intersect( rSet );
+        m_aSet.Intersect( rSet );
         return;
     }
 
-    SwAttrSet aOld( *aSet.GetPool(), aSet.GetRanges() ),
-              aNew( *aSet.GetPool(), aSet.GetRanges() );
-    bool bRet = 0 != aSet.Intersect_BC( rSet, &aOld, &aNew );
+    SwAttrSet aOld( *m_aSet.GetPool(), m_aSet.GetRanges() ),
+              aNew( *m_aSet.GetPool(), m_aSet.GetRanges() );
+    bool bRet = 0 != m_aSet.Intersect_BC( rSet, &aOld, &aNew );
     if( bRet )
     {
-        SwAttrSetChg aChgOld( aSet, aOld );
-        SwAttrSetChg aChgNew( aSet, aNew );
+        SwAttrSetChg aChgOld( m_aSet, aOld );
+        SwAttrSetChg aChgNew( m_aSet, aNew );
         ModifyNotification( &aChgOld, &aChgNew ); // send all modified ones
     }
 }
@@ -818,10 +818,10 @@ SvxBrushItem SwFmt::makeBackgroundBrushItem(bool bInP) const
         // fill the local static SvxBrushItem from the current ItemSet so that
         // the fill attributes [XATTR_FILL_FIRST .. XATTR_FILL_LAST] are used
         // as good as possible to create a fallback representation and return that
-        return getSvxBrushItemFromSourceSet(aSet, RES_BACKGROUND, bInP);
+        return getSvxBrushItemFromSourceSet(m_aSet, RES_BACKGROUND, bInP);
     }
 
-    return aSet.GetBackground(bInP);
+    return m_aSet.GetBackground(bInP);
 }
 
 //UUUU