sw: prefix members of SwAnnotationShell, SwBaseShell, SwContent and ...

... SwDrawTextShell

See tdf#94879 for motivation.

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

9 files changed, 153 insertions, 153 deletions

diff --git a/sw/source/uibase/inc/annotsh.hxx b/sw/source/uibase/inc/annotsh.hxx
index d6b4c37de8b6..7c3a5fef9ea1 100644
--- a/sw/source/uibase/inc/annotsh.hxx
+++ b/sw/source/uibase/inc/annotsh.hxx
@@ -27,7 +27,7 @@
 class SwView;
 class SwAnnotationShell final : public SfxShell
 {
-    SwView&     rView;
+    SwView&     m_rView;
     RotateTransliteration m_aRotateCase;
 
 public:
diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx
index 6e924a62cde1..90ca9502468b 100644
--- a/sw/source/uibase/inc/basesh.hxx
+++ b/sw/source/uibase/inc/basesh.hxx
@@ -38,17 +38,17 @@ class SwCursorShell;
 struct DBTextStruct_Impl;
 class SW_DLLPUBLIC SwBaseShell: public SfxShell
 {
-    SwView      &rView;
+    SwView      &m_rView;
 
     // DragMode
     static FlyMode eFrameMode;
 
     // Bug 75078 - if in GetState the async call of GetGraphic returns
     //              synch, the set the state directly into the itemset
-    SfxItemSet*         pGetStateSet;
+    SfxItemSet*         m_pGetStateSet;
 
     // Update-Timer for graphic
-    std::set<sal_uInt16> aGrfUpdateSlots;
+    std::set<sal_uInt16> m_aGrfUpdateSlots;
 
     DECL_LINK( GraphicArrivedHdl, SwCursorShell&, void );
 
@@ -56,9 +56,9 @@ protected:
     SwWrtShell&         GetShell();
     SwWrtShell*         GetShellPtr();
 
-    SwView&      GetView()                       { return rView; }
-    void         SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; }
-    bool         AddGrfUpdateSlot( sal_uInt16 nSlot ){ return aGrfUpdateSlots.insert( nSlot ).second; }
+    SwView&      GetView()                       { return m_rView; }
+    void         SetGetStateSet( SfxItemSet* p ) { m_pGetStateSet = p; }
+    bool         AddGrfUpdateSlot( sal_uInt16 nSlot ){ return m_aGrfUpdateSlots.insert( nSlot ).second; }
 
     DECL_LINK(    InsertDBTextHdl, void*, void );
 
diff --git a/sw/source/uibase/inc/drwtxtsh.hxx b/sw/source/uibase/inc/drwtxtsh.hxx
index 6c04649c445c..3088809815f9 100644
--- a/sw/source/uibase/inc/drwtxtsh.hxx
+++ b/sw/source/uibase/inc/drwtxtsh.hxx
@@ -29,10 +29,10 @@ class SwWrtShell;
 
 class SwDrawTextShell final : public SfxShell
 {
-    SwView      &rView;
+    SwView      &m_rView;
     RotateTransliteration m_aRotateCase;
 
-    SdrView     *pSdrView;
+    SdrView     *m_pSdrView;
 
     void        SetAttrToMarked(const SfxItemSet& rAttr);
     void        InsertSymbol(SfxRequest& rReq);
@@ -46,7 +46,7 @@ private:
     static void InitInterface_Impl();
 
 public:
-    SwView     &GetView() { return rView; }
+    SwView     &GetView() { return m_rView; }
     SwWrtShell &GetShell();
 
                 SwDrawTextShell(SwView &rView);
diff --git a/sw/source/uibase/inc/swcont.hxx b/sw/source/uibase/inc/swcont.hxx
index 2e32944efb48..19d17ebe6598 100644
--- a/sw/source/uibase/inc/swcont.hxx
+++ b/sw/source/uibase/inc/swcont.hxx
@@ -72,19 +72,19 @@ class SwTypeNumber
 
 class SwContent : public SwTypeNumber
 {
-    const SwContentType*    pParent;
-    OUString                sContentName;
-    tools::Long                    nYPosition;
+    const SwContentType*    m_pParent;
+    OUString                m_sContentName;
+    tools::Long                    m_nYPosition;
         // some subclasses appear to use this for a tools/gen.hxx-style
         // geometric Y position, while e.g. SwOutlineContent wants to store
         // the index in its subtree
-    bool                    bInvisible;
+    bool                    m_bInvisible;
 public:
         SwContent(const SwContentType* pCnt, const OUString& rName, tools::Long nYPos );
 
     virtual bool            IsProtect() const;
-    const SwContentType*    GetParent() const {return pParent;}
-    const OUString&         GetName()   const {return sContentName;}
+    const SwContentType*    GetParent() const {return m_pParent;}
+    const OUString&         GetName()   const {return m_sContentName;}
     bool operator==(const SwContent& /*rCont*/) const
     {
         // they're never equal, otherwise they'd fall out of the array
@@ -93,13 +93,13 @@ public:
     bool operator<(const SwContent& rCont) const
     {
         // at first sort by position and then by name
-        if (nYPosition != rCont.nYPosition)
-            return nYPosition < rCont.nYPosition;
-        return vcl::NaturalSortCompare(sContentName, rCont.sContentName) < 0;
+        if (m_nYPosition != rCont.m_nYPosition)
+            return m_nYPosition < rCont.m_nYPosition;
+        return vcl::NaturalSortCompare(m_sContentName, rCont.m_sContentName) < 0;
     }
 
-    bool        IsInvisible() const {return bInvisible;}
-    void        SetInvisible(){ bInvisible = true;}
+    bool        IsInvisible() const {return m_bInvisible;}
+    void        SetInvisible(){ m_bInvisible = true;}
 };
 
 #endif
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 0b1ed84fe3cc..ec0cf296f81d 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -126,9 +126,9 @@ SfxItemPool* SwAnnotationShell::GetAnnotationPool(SwView const & rV)
 }
 
 SwAnnotationShell::SwAnnotationShell( SwView& r )
-    : rView(r)
+    : m_rView(r)
 {
-    SetPool(SwAnnotationShell::GetAnnotationPool(rView));
+    SetPool(SwAnnotationShell::GetAnnotationPool(m_rView));
     SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Annotation));
 }
 
@@ -138,7 +138,7 @@ SwAnnotationShell::~SwAnnotationShell()
 
 SfxUndoManager* SwAnnotationShell::GetUndoManager()
 {
-    SwPostItMgr* pPostItMgr = rView.GetPostItMgr();
+    SwPostItMgr* pPostItMgr = m_rView.GetPostItMgr();
     if ( !pPostItMgr ||
          !pPostItMgr->HasActiveSidebarWin() )
     {
@@ -151,7 +151,7 @@ SfxUndoManager* SwAnnotationShell::GetUndoManager()
 void SwAnnotationShell::Exec( SfxRequest &rReq )
 {
     //TODO: clean this up!!!!
-    SwPostItMgr* pPostItMgr = rView.GetPostItMgr();
+    SwPostItMgr* pPostItMgr = m_rView.GetPostItMgr();
     if ( !pPostItMgr || !pPostItMgr->HasActiveSidebarWin() )
         return;
 
@@ -427,12 +427,12 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
         }
         case FN_FORMAT_FOOTNOTE_DLG:
         {
-            rView.ExecFormatFootnote();
+            m_rView.ExecFormatFootnote();
             break;
         }
         case FN_NUMBERING_OUTLINE_DLG:
         {
-            rView.ExecNumberingOutline(GetPool());
+            m_rView.ExecNumberingOutline(GetPool());
             rReq.Done();
         }
         break;
@@ -443,7 +443,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
         break;
         case FN_WORDCOUNT_DIALOG:
         {
-            rView.UpdateWordCount(this, nSlot);
+            m_rView.UpdateWordCount(this, nSlot);
             break;
         }
         case SID_CHAR_DLG_EFFECT:
@@ -467,7 +467,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
                 aDlgAttr.Put( SvxKerningItem(0, RES_CHRATR_KERNING) );
 
                 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
-                ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(rView.GetFrameWeld(), rView, aDlgAttr, SwCharDlgMode::Ann));
+                ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(m_rView.GetFrameWeld(), m_rView, aDlgAttr, SwCharDlgMode::Ann));
                 if (nSlot == SID_CHAR_DLG_EFFECT)
                 {
                     pDlg->SetCurPageId("fonteffects");
@@ -515,7 +515,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
                 aDlgAttr.Put( SvxOrphansItem( 0, RES_PARATR_ORPHANS ) );
 
                 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
-                ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg(rView.GetFrameWeld(), rView, aDlgAttr, true));
+                ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg(m_rView.GetFrameWeld(), m_rView, aDlgAttr, true));
                 sal_uInt16 nRet = pDlg->Execute();
                 if(RET_OK == nRet)
                 {
@@ -532,7 +532,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
 
         case SID_AUTOSPELL_CHECK:
         {
-            rView.ExecuteSlot(rReq);
+            m_rView.ExecuteSlot(rReq);
             break;
         }
         case SID_ATTR_PARA_LEFT_TO_RIGHT:
@@ -581,9 +581,9 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
     if (tools::Rectangle() != aOutRect && aNewAttr.Count())
         pOLV->SetAttribs(aNewAttr);
 
-    rView.GetViewFrame()->GetBindings().InvalidateAll(false);
+    m_rView.GetViewFrame()->GetBindings().InvalidateAll(false);
     if ( pOLV->GetOutliner()->IsModified() )
-        rView.GetWrtShell().SetModified();
+        m_rView.GetWrtShell().SetModified();
 
 }
 
@@ -594,7 +594,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
     //SID_ATTR_PARA_ADJUST
     //SID_ATTR_PARA_ADJUST_BLOCK
 
-    SwPostItMgr* pPostItMgr = rView.GetPostItMgr();
+    SwPostItMgr* pPostItMgr = m_rView.GetPostItMgr();
     if ( !pPostItMgr || !pPostItMgr->HasActiveSidebarWin() )
         return;
 
@@ -780,7 +780,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
                 }
             case SID_AUTOSPELL_CHECK:
             {
-                const SfxPoolItem* pState = rView.GetSlotState(nWhich);
+                const SfxPoolItem* pState = m_rView.GetSlotState(nWhich);
                 if (pState)
                     rSet.Put(SfxBoolItem(nWhich, static_cast<const SfxBoolItem*>(pState)->GetValue()));
                 else
@@ -825,7 +825,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
             {
                 SvtCTLOptions aCTLOptions;
                 bool bEnabled = aCTLOptions.IsCTLFontEnabled();
-                rView.GetViewFrame()->GetBindings().SetVisibleState( nWhich, bEnabled );
+                m_rView.GetViewFrame()->GetBindings().SetVisibleState( nWhich, bEnabled );
                 if(!bEnabled)
                     rSet.DisableItem(nWhich);
             }
@@ -857,17 +857,17 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
 
 void SwAnnotationShell::ExecSearch(SfxRequest& rReq)
 {
-    rView.ExecSearch(rReq);
+    m_rView.ExecSearch(rReq);
 }
 
 void SwAnnotationShell::StateSearch(SfxItemSet &rSet)
 {
-    rView.StateSearch(rSet);
+    m_rView.StateSearch(rSet);
 }
 
 void SwAnnotationShell::ExecClpbrd(SfxRequest const &rReq)
 {
-    SwPostItMgr* pPostItMgr = rView.GetPostItMgr();
+    SwPostItMgr* pPostItMgr = m_rView.GetPostItMgr();
     if ( !pPostItMgr || !pPostItMgr->HasActiveSidebarWin() )
         return;
 
@@ -898,13 +898,13 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest const &rReq)
             if (pPostItMgr->GetActiveSidebarWin()->GetLayoutStatus()!=SwPostItHelper::DELETED)
             {
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-                ScopedVclPtr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog(rView.GetEditWin().GetFrameWeld()));
+                ScopedVclPtr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog(m_rView.GetEditWin().GetFrameWeld()));
 
                 pDlg->Insert( SotClipboardFormatId::STRING, OUString() );
                 pDlg->Insert( SotClipboardFormatId::RTF,    OUString() );
                 pDlg->Insert( SotClipboardFormatId::RICHTEXT,    OUString() );
 
-                TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( &rView.GetEditWin() ) );
+                TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( &m_rView.GetEditWin() ) );
 
                 SotClipboardFormatId nFormat = pDlg->GetFormat( aDataHelper.GetTransferable() );
 
@@ -943,12 +943,12 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest const &rReq)
 
 void SwAnnotationShell::StateClpbrd(SfxItemSet &rSet)
 {
-    SwPostItMgr* pPostItMgr = rView.GetPostItMgr();
+    SwPostItMgr* pPostItMgr = m_rView.GetPostItMgr();
     if ( !pPostItMgr || !pPostItMgr->HasActiveSidebarWin() )
         return;
     OutlinerView* pOLV = pPostItMgr->GetActiveSidebarWin()->GetOutlinerView();
 
-    TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( &rView.GetEditWin() ) );
+    TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( &m_rView.GetEditWin() ) );
     bool bPastePossible = ( aDataHelper.HasFormat( SotClipboardFormatId::STRING ) || aDataHelper.HasFormat( SotClipboardFormatId::RTF )
         || aDataHelper.HasFormat( SotClipboardFormatId::RICHTEXT ));
     bPastePossible = bPastePossible &&  (pPostItMgr->GetActiveSidebarWin()->GetLayoutStatus()!=SwPostItHelper::DELETED);
@@ -1029,7 +1029,7 @@ void SwAnnotationShell::StateStatusLine(SfxItemSet &rSet)
 
 void SwAnnotationShell::StateInsert(SfxItemSet &rSet)
 {
-    SwPostItMgr* pPostItMgr = rView.GetPostItMgr();
+    SwPostItMgr* pPostItMgr = m_rView.GetPostItMgr();
     if ( !pPostItMgr || !pPostItMgr->HasActiveSidebarWin() )
         return;
 
@@ -1064,7 +1064,7 @@ void SwAnnotationShell::StateInsert(SfxItemSet &rSet)
                         aHLinkItem.SetName(comphelper::string::stripEnd(sSel, ' '));
                     }
 
-                    sal_uInt16 nHtmlMode = ::GetHtmlMode(rView.GetDocShell());
+                    sal_uInt16 nHtmlMode = ::GetHtmlMode(m_rView.GetDocShell());
                     aHLinkItem.SetInsertMode(static_cast<SvxLinkInsertMode>(aHLinkItem.GetInsertMode() |
                         ((nHtmlMode & HTMLMODE_ON) != 0 ? HLINK_HTMLMODE : 0)));
 
@@ -1082,7 +1082,7 @@ void SwAnnotationShell::StateInsert(SfxItemSet &rSet)
 
 void SwAnnotationShell::NoteExec(SfxRequest const &rReq)
 {
-    SwPostItMgr* pPostItMgr = rView.GetPostItMgr();
+    SwPostItMgr* pPostItMgr = m_rView.GetPostItMgr();
     if ( !pPostItMgr )
         return;
 
@@ -1102,7 +1102,7 @@ void SwAnnotationShell::NoteExec(SfxRequest const &rReq)
             pPostItMgr->Delete();
             break;
         case FN_FORMAT_ALL_NOTES:
-            pPostItMgr->ExecuteFormatAllDialog(rView);
+            pPostItMgr->ExecuteFormatAllDialog(m_rView);
             break;
         case FN_DELETE_NOTE_AUTHOR:
         {
@@ -1131,7 +1131,7 @@ void SwAnnotationShell::NoteExec(SfxRequest const &rReq)
 
 void SwAnnotationShell::GetNoteState(SfxItemSet &rSet)
 {
-    SwPostItMgr* pPostItMgr = rView.GetPostItMgr();
+    SwPostItMgr* pPostItMgr = m_rView.GetPostItMgr();
     SfxWhichIter aIter(rSet);
     sal_uInt16 nWhich = aIter.FirstWhich();
     while(nWhich)
@@ -1238,13 +1238,13 @@ void SwAnnotationShell::GetNoteState(SfxItemSet &rSet)
 
 void SwAnnotationShell::ExecLingu(SfxRequest &rReq)
 {
-    SwPostItMgr* pPostItMgr = rView.GetPostItMgr();
+    SwPostItMgr* pPostItMgr = m_rView.GetPostItMgr();
     if ( !pPostItMgr || !pPostItMgr->HasActiveSidebarWin() )
         return;
 
     OutlinerView* pOLV = pPostItMgr->GetActiveSidebarWin()->GetOutlinerView();
     sal_uInt16 nSlot = rReq.GetSlot();
-    SwWrtShell &rSh = rView.GetWrtShell();
+    SwWrtShell &rSh = m_rView.GetWrtShell();
     bool bRestoreSelection = false;
     ESelection aOldSelection;
 
@@ -1258,7 +1258,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq)
                 pOLV->GetEditView().SelectCurrentWord();
             }
 
-            bRestoreSelection = SwLangHelper::SetLanguageStatus(pOLV,rReq,rView,rSh);
+            bRestoreSelection = SwLangHelper::SetLanguageStatus(pOLV,rReq,m_rView,rSh);
             break;
         }
         case SID_THES:
@@ -1358,7 +1358,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq)
 
 void SwAnnotationShell::GetLinguState(SfxItemSet &rSet)
 {
-    SwPostItMgr* pPostItMgr = rView.GetPostItMgr();
+    SwPostItMgr* pPostItMgr = m_rView.GetPostItMgr();
     if ( !pPostItMgr || !pPostItMgr->HasActiveSidebarWin() )
         return;
 
@@ -1394,7 +1394,7 @@ void SwAnnotationShell::GetLinguState(SfxItemSet &rSet)
             // disable "Thesaurus" if the language is not supported
             case SID_THESAURUS:
             {
-                const SfxPoolItem &rItem = rView.GetWrtShell().GetDoc()->GetDefault(
+                const SfxPoolItem &rItem = m_rView.GetWrtShell().GetDoc()->GetDefault(
                             GetWhichOfScript( RES_CHRATR_LANGUAGE,
                             SvtLanguageOptions::GetI18NScriptTypeOfLanguage( GetAppLanguage())) );
                 LanguageType nLang = static_cast<const SvxLanguageItem &>(
@@ -1410,11 +1410,11 @@ void SwAnnotationShell::GetLinguState(SfxItemSet &rSet)
             {
                 if (!SvtCJKOptions::IsAnyEnabled())
                 {
-                    rView.GetViewFrame()->GetBindings().SetVisibleState( nWhich, false );
+                    m_rView.GetViewFrame()->GetBindings().SetVisibleState( nWhich, false );
                     rSet.DisableItem(nWhich);
                 }
                 else
-                    rView.GetViewFrame()->GetBindings().SetVisibleState( nWhich, true );
+                    m_rView.GetViewFrame()->GetBindings().SetVisibleState( nWhich, true );
             }
             break;
         }
@@ -1428,7 +1428,7 @@ void SwAnnotationShell::GetLinguState(SfxItemSet &rSet)
 
 void SwAnnotationShell::ExecTransliteration(SfxRequest const &rReq)
 {
-    SwPostItMgr* pPostItMgr = rView.GetPostItMgr();
+    SwPostItMgr* pPostItMgr = m_rView.GetPostItMgr();
     if (!pPostItMgr || !pPostItMgr->HasActiveSidebarWin())
         return;
 
@@ -1482,7 +1482,7 @@ void SwAnnotationShell::ExecRotateTransliteration( SfxRequest const & rReq )
     if( rReq.GetSlot() != SID_TRANSLITERATE_ROTATE_CASE )
         return;
 
-    SwPostItMgr* pPostItMgr = rView.GetPostItMgr();
+    SwPostItMgr* pPostItMgr = m_rView.GetPostItMgr();
     if (!pPostItMgr || !pPostItMgr->HasActiveSidebarWin())
         return;
 
@@ -1498,11 +1498,11 @@ void SwAnnotationShell::ExecUndo(SfxRequest &rReq)
 {
     const SfxItemSet* pArgs = rReq.GetArgs();
     SfxUndoManager* pUndoManager = GetUndoManager();
-    SwWrtShell &rSh = rView.GetWrtShell();
+    SwWrtShell &rSh = m_rView.GetWrtShell();
     SwUndoId nUndoId(SwUndoId::EMPTY);
 
-    tools::Long aOldHeight = rView.GetPostItMgr()->HasActiveSidebarWin()
-                      ? rView.GetPostItMgr()->GetActiveSidebarWin()->GetPostItTextHeight()
+    tools::Long aOldHeight = m_rView.GetPostItMgr()->HasActiveSidebarWin()
+                      ? m_rView.GetPostItMgr()->GetActiveSidebarWin()->GetPostItTextHeight()
                       : 0;
 
     sal_uInt16 nId = rReq.GetSlot();
@@ -1575,15 +1575,15 @@ void SwAnnotationShell::ExecUndo(SfxRequest &rReq)
         }
     }
 
-    rView.GetViewFrame()->GetBindings().InvalidateAll(false);
+    m_rView.GetViewFrame()->GetBindings().InvalidateAll(false);
 
-    if (rView.GetPostItMgr()->HasActiveSidebarWin())
-        rView.GetPostItMgr()->GetActiveSidebarWin()->ResizeIfNecessary(aOldHeight,rView.GetPostItMgr()->GetActiveSidebarWin()->GetPostItTextHeight());
+    if (m_rView.GetPostItMgr()->HasActiveSidebarWin())
+        m_rView.GetPostItMgr()->GetActiveSidebarWin()->ResizeIfNecessary(aOldHeight,m_rView.GetPostItMgr()->GetActiveSidebarWin()->GetPostItTextHeight());
 }
 
 void SwAnnotationShell::StateUndo(SfxItemSet &rSet)
 {
-    SwPostItMgr* pPostItMgr = rView.GetPostItMgr();
+    SwPostItMgr* pPostItMgr = m_rView.GetPostItMgr();
     if ( !pPostItMgr || !pPostItMgr->HasActiveSidebarWin() )
         return;
 
@@ -1591,8 +1591,8 @@ void SwAnnotationShell::StateUndo(SfxItemSet &rSet)
     SwUndoId nUndoId(SwUndoId::EMPTY);
     sal_uInt16 nWhich = aIter.FirstWhich();
     SfxUndoManager* pUndoManager = GetUndoManager();
-    SfxViewFrame *pSfxViewFrame = rView.GetViewFrame();
-    SwWrtShell &rSh = rView.GetWrtShell();
+    SfxViewFrame *pSfxViewFrame = m_rView.GetViewFrame();
+    SwWrtShell &rSh = m_rView.GetWrtShell();
 
     while( nWhich )
     {
@@ -1707,7 +1707,7 @@ void SwAnnotationShell::StateDisableItems( SfxItemSet &rSet )
 
 void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
 {
-    SwPostItMgr* pPostItMgr = rView.GetPostItMgr();
+    SwPostItMgr* pPostItMgr = m_rView.GetPostItMgr();
     if ( !pPostItMgr || !pPostItMgr->HasActiveSidebarWin() )
         return;
 
@@ -1760,7 +1760,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
         SfxAllItemSet aAllSet( GetPool() );
         aAllSet.Put( SfxBoolItem( FN_PARAM_1, false ) );
 
-        SwViewOption aOpt(*rView.GetWrtShell().GetViewOptions());
+        SwViewOption aOpt(*m_rView.GetWrtShell().GetViewOptions());
         const OUString& sSymbolFont = aOpt.GetSymbolFont();
         if( !sSymbolFont.isEmpty() )
             aAllSet.Put( SfxStringItem( SID_FONT_NAME, sSymbolFont ) );
@@ -1768,8 +1768,8 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
             aAllSet.Put( SfxStringItem( SID_FONT_NAME, aSetDlgFont->GetFamilyName() ) );
 
         // If character is selected then it can be shown.
-        auto xFrame = rView.GetViewFrame()->GetFrame().GetFrameInterface();
-        ScopedVclPtr<SfxAbstractDialog> pDlg(pFact->CreateCharMapDialog(rView.GetFrameWeld(), aAllSet, xFrame));
+        auto xFrame = m_rView.GetViewFrame()->GetFrame().GetFrameInterface();
+        ScopedVclPtr<SfxAbstractDialog> pDlg(pFact->CreateCharMapDialog(m_rView.GetFrameWeld(), aAllSet, xFrame));
         pDlg->Execute();
         return;
     }
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 9db7e923bdd9..dd47986401f8 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -294,7 +294,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
     {
         case SID_CUT:
         case SID_COPY:
-            rView.GetEditWin().FlushInBuffer();
+            m_rView.GetEditWin().FlushInBuffer();
             if ( rSh.HasSelection() )
             {
                 rtl::Reference<SwTransferable> pTransfer = new SwTransferable( rSh );
@@ -339,7 +339,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
                 {
                     // Temporary variables, because the shell could already be
                     // destroyed after the paste.
-                    SwView* pView = &rView;
+                    SwView* pView = &m_rView;
 
                     RndStdIds nAnchorType = RndStdIds::FLY_AT_PARA;
                     const SfxUInt16Item* pAnchorType = rReq.GetArg<SfxUInt16Item>(FN_PARAM_1);
@@ -377,7 +377,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
                     {
                         // Temporary variables, because the shell could already be
                         // destroyed after the paste.
-                        SwView* pView = &rView;
+                        SwView* pView = &m_rView;
 
                         SwTransferable::PasteFormat( rSh, aDataHelper,
                                         static_cast<SotClipboardFormatId>(static_cast<const SfxUInt32Item*>(pFormat)->GetValue()) );
@@ -405,7 +405,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
                 {
                     // Temporary variables, because the shell could already be
                     // destroyed after the paste.
-                    SwView* pView = &rView;
+                    SwView* pView = &m_rView;
                     rReq.Ignore();
                     bIgnore = true;
                     if(SwTransferable::PasteUnformatted( rSh, aDataHelper ))
@@ -457,7 +457,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
                     {
                         // Temporary variables, because the shell could already be
                         // destroyed after the paste.
-                        SwView* pView = &rView;
+                        SwView* pView = &m_rView;
                         bool bRet = false;
                         SotClipboardFormatId nFormatId = pDlg->GetFormatOnly();
 
@@ -779,7 +779,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
             break;
         case FN_UPDATE_CHARTS:
             {
-                SwWait aWait( *rView.GetDocShell(), true );
+                SwWait aWait( *m_rView.GetDocShell(), true );
                 rSh.UpdateAllCharts();
             }
             break;
@@ -887,7 +887,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
             if ( (!rSh.IsSelFrameMode() || nSelType & SelectionType::Graphic) &&
                 nGalleryItemType == css::gallery::GalleryItemType::GRAPHIC )
             {
-                SwWait aWait( *rView.GetDocShell(), true );
+                SwWait aWait( *m_rView.GetDocShell(), true );
 
                 OUString aGrfName, aFltName;
                 const Graphic aGrf( pGalleryItem->GetGraphic() );
@@ -1010,7 +1010,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
             if( cDelim )
             {
                 //Shell change!
-                SwView& rSaveView = rView;
+                SwView& rSaveView = m_rView;
                 bool bInserted = false;
                 //recording:
                 SfxViewFrame* pViewFrame = GetView().GetViewFrame();
@@ -1425,12 +1425,12 @@ IMPL_LINK_NOARG(SwBaseShell, GraphicArrivedHdl, SwCursorShell&, void)
     if (CNT_GRF != rSh.SwEditShell::GetCntType())
         return;
     GraphicType const nGrfType(rSh.GetGraphicType());
-    if (GraphicType::NONE == nGrfType || aGrfUpdateSlots.empty())
+    if (GraphicType::NONE == nGrfType || m_aGrfUpdateSlots.empty())
         return;
 
     bool bProtect = FlyProtectFlags::NONE != rSh.IsSelObjProtected(FlyProtectFlags::Content|FlyProtectFlags::Parent);
     SfxViewFrame* pVFrame = GetView().GetViewFrame();
-    for( const auto nSlot : aGrfUpdateSlots )
+    for( const auto nSlot : m_aGrfUpdateSlots )
     {
         bool bSetState = false;
         bool bState = false;
@@ -1505,13 +1505,13 @@ IMPL_LINK_NOARG(SwBaseShell, GraphicArrivedHdl, SwCursorShell&, void)
         if( bSetState )
         {
             SfxBoolItem aBool( nSlot, bState );
-            if( pGetStateSet )
-                pGetStateSet->Put( aBool );
+            if( m_pGetStateSet )
+                m_pGetStateSet->Put( aBool );
             else
                 pVFrame->GetBindings().SetState( aBool );
         }
     }
-    aGrfUpdateSlots.clear();
+    m_aGrfUpdateSlots.clear();
 }
 
 void SwBaseShell::GetState( SfxItemSet &rSet )
@@ -1520,7 +1520,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
     SfxViewFrame* pVFrame = GetView().GetViewFrame();
     SfxWhichIter aIter( rSet );
     sal_uInt16 nWhich = aIter.FirstWhich();
-    pGetStateSet = &rSet;
+    m_pGetStateSet = &rSet;
     while ( nWhich )
     {
         switch ( nWhich )
@@ -1945,7 +1945,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
         }
         nWhich = aIter.NextWhich();
     }
-    pGetStateSet = nullptr;
+    m_pGetStateSet = nullptr;
 }
 
 // Disable the slots with this status method
@@ -2120,10 +2120,10 @@ void SwBaseShell::SetFrameMode(FlyMode eMode, SwWrtShell *pSh )
 
 SwBaseShell::SwBaseShell(SwView& rVw) :
     SfxShell( &rVw ),
-    rView(rVw),
-    pGetStateSet(nullptr)
+    m_rView(rVw),
+    m_pGetStateSet(nullptr)
 {
-    SwWrtShell& rWrtSh = rView.GetWrtShell();
+    SwWrtShell& rWrtSh = m_rView.GetWrtShell();
 
     SetPool(&rWrtSh.GetAttrPool());
     SetName("Base");
@@ -2132,12 +2132,12 @@ SwBaseShell::SwBaseShell(SwView& rVw) :
 
 SwBaseShell::~SwBaseShell()
 {
-    if( rView.GetCurShell() == this )
-        rView.ResetSubShell();
+    if( m_rView.GetCurShell() == this )
+        m_rView.ResetSubShell();
 
     Link<SwCursorShell&,void> aTmp( LINK( this, SwBaseShell, GraphicArrivedHdl));
-    if( aTmp == rView.GetWrtShell().GetGrfArrivedLnk() )
-        rView.GetWrtShell().SetGrfArrivedLnk( Link<SwCursorShell&,void>() );
+    if( aTmp == m_rView.GetWrtShell().GetGrfArrivedLnk() )
+        m_rView.GetWrtShell().SetGrfArrivedLnk( Link<SwCursorShell&,void>() );
 }
 
 void SwBaseShell::ExecTextCtrl( SfxRequest& rReq )
@@ -2772,12 +2772,12 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
 
 SwWrtShell& SwBaseShell::GetShell()
 {
-    return rView.GetWrtShell();
+    return m_rView.GetWrtShell();
 }
 
 SwWrtShell* SwBaseShell::GetShellPtr()
 {
-    return rView.GetWrtShellPtr();
+    return m_rView.GetWrtShellPtr();
 }
 
 static void EndUndo(SwWrtShell& rSh)
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index 6e3a432825e6..1d0a8ee58ccc 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -123,7 +123,7 @@ namespace
 void SwDrawTextShell::Execute( SfxRequest &rReq )
 {
     SwWrtShell &rSh = GetShell();
-    OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
+    OutlinerView* pOLV = m_pSdrView->GetTextEditOutlinerView();
     SfxItemSet aEditAttr(pOLV->GetAttribs());
     SfxItemSet aNewAttr(*aEditAttr.GetPool(), aEditAttr.GetRanges());
 
@@ -469,7 +469,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
         {
 //!! JP 16.03.2001: why??           pSdrView = rSh.GetDrawView();
 //!! JP 16.03.2001: why??           pOutliner = pSdrView->GetTextEditOutliner();
-            SdrOutliner * pOutliner = pSdrView->GetTextEditOutliner();
+            SdrOutliner * pOutliner = m_pSdrView->GetTextEditOutliner();
             EEControlBits nCtrl = pOutliner->GetControlWord();
 
             bool bSet = static_cast<const SfxBoolItem&>(rReq.GetArgs()->Get(
@@ -480,7 +480,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
                 nCtrl &= ~EEControlBits::ONLINESPELLING;
             pOutliner->SetControlWord(nCtrl);
 
-            rView.ExecuteSlot(rReq);
+            m_rView.ExecuteSlot(rReq);
         }
         break;
         case SID_HYPERLINK_SETLINK:
@@ -554,11 +554,11 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
         case SID_TEXTDIRECTION_TOP_TO_BOTTOM:
             // Shell switch!
             {
-                SdrObject* pTmpObj = pSdrView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj();
-                SdrPageView* pTmpPV = pSdrView->GetSdrPageView();
-                SdrView* pTmpView = pSdrView;
+                SdrObject* pTmpObj = m_pSdrView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj();
+                SdrPageView* pTmpPV = m_pSdrView->GetSdrPageView();
+                SdrView* pTmpView = m_pSdrView;
 
-                pSdrView->SdrEndTextEdit(true);
+                m_pSdrView->SdrEndTextEdit(true);
 
                 SfxItemSetFixed<SDRATTR_TEXTDIRECTION,
                             SDRATTR_TEXTDIRECTION>  aAttr( *aNewAttr.GetPool() );
@@ -577,11 +577,11 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
         case SID_ATTR_PARA_LEFT_TO_RIGHT:
         case SID_ATTR_PARA_RIGHT_TO_LEFT:
         {
-            SdrObject* pTmpObj = pSdrView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj();
-            SdrPageView* pTmpPV = pSdrView->GetSdrPageView();
-            SdrView* pTmpView = pSdrView;
+            SdrObject* pTmpObj = m_pSdrView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj();
+            SdrPageView* pTmpPV = m_pSdrView->GetSdrPageView();
+            SdrView* pTmpView = m_pSdrView;
 
-            pSdrView->SdrEndTextEdit(true);
+            m_pSdrView->SdrEndTextEdit(true);
             bool bLeftToRight = nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT;
 
             const SfxPoolItem* pPoolItem;
@@ -656,7 +656,7 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet)
     if (!IsTextEdit()) // Otherwise sometimes crash!
         return;
 
-    OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
+    OutlinerView* pOLV = m_pSdrView->GetTextEditOutlinerView();
     SfxWhichIter aIter(rSet);
     sal_uInt16 nWhich = aIter.FirstWhich();
 
@@ -873,7 +873,7 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet)
                 }
                 else
                 {
-                    SdrOutliner* pOutliner = pSdrView->GetTextEditOutliner();
+                    SdrOutliner* pOutliner = m_pSdrView->GetTextEditOutliner();
                     if (pOutliner)
                         bFlag = pOutliner->IsVertical()
                                 == (SID_TEXTDIRECTION_TOP_TO_BOTTOM == nSlotId);
@@ -902,7 +902,7 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet)
                 }
                 else
                 {
-                    SdrOutliner* pOutliner = pSdrView->GetTextEditOutliner();
+                    SdrOutliner* pOutliner = m_pSdrView->GetTextEditOutliner();
                     if (pOutliner && pOutliner->IsVertical())
                     {
                         rSet.DisableItem(nWhich);
@@ -976,7 +976,7 @@ void SwDrawTextShell::GetDrawTextCtrlState(SfxItemSet& rSet)
     if (!IsTextEdit())  // Otherwise crash!
         return;
 
-    OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
+    OutlinerView* pOLV = m_pSdrView->GetTextEditOutlinerView();
     SfxItemSet aEditAttr(pOLV->GetAttribs());
 
     SfxWhichIter aIter(rSet);
@@ -1016,7 +1016,7 @@ void SwDrawTextShell::GetDrawTextCtrlState(SfxItemSet& rSet)
             case SID_ATTR_CHAR_STRIKEOUT: nEEWhich = EE_CHAR_STRIKEOUT;break;
             case SID_AUTOSPELL_CHECK:
             {
-                const SfxPoolItem* pState = rView.GetSlotState(nWhich);
+                const SfxPoolItem* pState = m_rView.GetSlotState(nWhich);
                 if (pState)
                     rSet.Put(SfxBoolItem(nWhich, static_cast<const SfxBoolItem*>(pState)->GetValue()));
                 else
@@ -1065,7 +1065,7 @@ void SwDrawTextShell::ExecClpbrd(SfxRequest const &rReq)
     if (!IsTextEdit())  // Otherwise crash!
         return;
 
-    OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
+    OutlinerView* pOLV = m_pSdrView->GetTextEditOutlinerView();
 
     ESelection aSel(pOLV->GetSelection());
     const bool bCopy = (aSel.nStartPara != aSel.nEndPara) || (aSel.nStartPos != aSel.nEndPos);
@@ -1145,7 +1145,7 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet)
     if (!IsTextEdit())  // Otherwise crash!
         return;
 
-    OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
+    OutlinerView* pOLV = m_pSdrView->GetTextEditOutlinerView();
     ESelection aSel(pOLV->GetSelection());
     const bool bCopy = (aSel.nStartPara != aSel.nEndPara) ||
         (aSel.nStartPos != aSel.nEndPos);
@@ -1205,7 +1205,7 @@ void SwDrawTextShell::StateInsert(SfxItemSet &rSet)
     if (!IsTextEdit())  // Otherwise crash!
         return;
 
-    OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
+    OutlinerView* pOLV = m_pSdrView->GetTextEditOutlinerView();
     SfxWhichIter aIter(rSet);
     sal_uInt16 nWhich = aIter.FirstWhich();
 
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 7495cf5a7c37..3996277fc855 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -90,12 +90,12 @@ void SwDrawTextShell::InitInterface_Impl()
 void SwDrawTextShell::Init()
 {
     SwWrtShell &rSh = GetShell();
-    pSdrView = rSh.GetDrawView();
-    SdrOutliner * pOutliner = pSdrView->GetTextEditOutliner();
+    m_pSdrView = rSh.GetDrawView();
+    SdrOutliner * pOutliner = m_pSdrView->GetTextEditOutliner();
     //#97471# mouse click _and_ key input at the same time
     if( !pOutliner )
         return ;
-    OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
+    OutlinerView* pOLV = m_pSdrView->GetTextEditOutlinerView();
     EEControlBits nCtrl = pOutliner->GetControlWord();
     nCtrl |= EEControlBits::AUTOCORRECT;
 
@@ -117,7 +117,7 @@ void SwDrawTextShell::Init()
 
 SwDrawTextShell::SwDrawTextShell(SwView &rV) :
     SfxShell(&rV),
-    rView(rV)
+    m_rView(rV)
 {
     SwWrtShell &rSh = GetShell();
     SetPool(rSh.GetAttrPool().GetSecondaryPool());
@@ -132,12 +132,12 @@ SwDrawTextShell::SwDrawTextShell(SwView &rV) :
 SwDrawTextShell::~SwDrawTextShell()
 {
     if ( GetView().GetCurShell() == this )
-        rView.ResetSubShell();
+        m_rView.ResetSubShell();
 }
 
 SwWrtShell& SwDrawTextShell::GetShell()
 {
-    return rView.GetWrtShell();
+    return m_rView.GetWrtShell();
 }
 
 // Disable slots with this status method
@@ -156,7 +156,7 @@ void SwDrawTextShell::StateDisableItems( SfxItemSet &rSet )
 
 void SwDrawTextShell::SetAttrToMarked(const SfxItemSet& rAttr)
 {
-    OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
+    OutlinerView* pOLV = m_pSdrView->GetTextEditOutlinerView();
     tools::Rectangle aOutRect = pOLV->GetOutputArea();
 
     if (tools::Rectangle() != aOutRect)
@@ -167,7 +167,7 @@ void SwDrawTextShell::SetAttrToMarked(const SfxItemSet& rAttr)
 
 bool SwDrawTextShell::IsTextEdit() const
 {
-    return pSdrView->IsTextEdit();
+    return m_pSdrView->IsTextEdit();
 }
 
 void SwDrawTextShell::ExecFontWork(SfxRequest const & rReq)
@@ -264,7 +264,7 @@ void SwDrawTextShell::GetFormTextState(SfxItemSet& rSet)
 void SwDrawTextShell::ExecDrawLingu(SfxRequest const &rReq)
 {
     SwWrtShell &rSh = GetShell();
-    OutlinerView* pOutlinerView = pSdrView->GetTextEditOutlinerView();
+    OutlinerView* pOutlinerView = m_pSdrView->GetTextEditOutlinerView();
     if( !rSh.GetDrawView()->GetMarkedObjectList().GetMarkCount() )
         return;
 
@@ -354,8 +354,8 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest const &rReq)
 void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
 {
     SwWrtShell &rSh = GetShell();
-    pSdrView = rSh.GetDrawView();
-    OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
+    m_pSdrView = rSh.GetDrawView();
+    OutlinerView* pOLV = m_pSdrView->GetTextEditOutlinerView();
 
     switch (rReq.GetSlot())
     {
@@ -404,7 +404,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
 
         case SID_SELECTALL:
         {
-            SdrOutliner * pOutliner = pSdrView->GetTextEditOutliner();
+            SdrOutliner * pOutliner = m_pSdrView->GetTextEditOutliner();
             if(pOutliner)
             {
                 sal_Int32 nParaCount = pOutliner->GetParagraphCount();
@@ -423,7 +423,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
         break;
 
         case FN_ESCAPE:
-            if (pSdrView->IsTextEdit())
+            if (m_pSdrView->IsTextEdit())
             {
                 // Shell switch!
                 rSh.EndTextEdit();
@@ -435,19 +435,19 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
             break;
         case FN_DRAWTEXT_ATTR_DLG:
             {
-                SfxItemSet aNewAttr( pSdrView->GetModel()->GetItemPool() );
-                pSdrView->GetAttributes( aNewAttr );
+                SfxItemSet aNewAttr( m_pSdrView->GetModel()->GetItemPool() );
+                m_pSdrView->GetAttributes( aNewAttr );
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateTextTabDialog(
                             GetView().GetFrameWeld(),
-                            &aNewAttr, pSdrView ));
+                            &aNewAttr, m_pSdrView ));
                 sal_uInt16 nResult = pDlg->Execute();
 
                 if (nResult == RET_OK)
                 {
-                    if (pSdrView->AreObjectsMarked())
+                    if (m_pSdrView->AreObjectsMarked())
                     {
-                        pSdrView->SetAttributes(*pDlg->GetOutputItemSet());
+                        m_pSdrView->SetAttributes(*pDlg->GetOutputItemSet());
                         rReq.Done(*(pDlg->GetOutputItemSet()));
                     }
                 }
@@ -458,7 +458,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
         case SID_TABLE_VERT_BOTTOM:
             {
                 sal_uInt16 nSId = rReq.GetSlot();
-                if (pSdrView->AreObjectsMarked())
+                if (m_pSdrView->AreObjectsMarked())
                 {
                     SdrTextVertAdjust eTVA = SDRTEXTVERTADJUST_TOP;
                     if (nSId == SID_TABLE_VERT_CENTER)
@@ -466,10 +466,10 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
                     else if (nSId == SID_TABLE_VERT_BOTTOM)
                         eTVA = SDRTEXTVERTADJUST_BOTTOM;
 
-                    SfxItemSet aNewAttr( pSdrView->GetModel()->GetItemPool() );
-                    pSdrView->GetAttributes( aNewAttr );
+                    SfxItemSet aNewAttr( m_pSdrView->GetModel()->GetItemPool() );
+                    m_pSdrView->GetAttributes( aNewAttr );
                     aNewAttr.Put(SdrTextVertAdjustItem(eTVA));
-                    pSdrView->SetAttributes(aNewAttr);
+                    m_pSdrView->SetAttributes(aNewAttr);
                     rReq.Done();
                 }
 
@@ -597,7 +597,7 @@ void SwDrawTextShell::StateUndo(SfxItemSet &rSet)
 
 void SwDrawTextShell::ExecTransliteration( SfxRequest const & rReq )
 {
-    if (!pSdrView)
+    if (!m_pSdrView)
         return;
 
     using namespace i18n;
@@ -642,7 +642,7 @@ void SwDrawTextShell::ExecTransliteration( SfxRequest const & rReq )
 
     if( nMode != TransliterationFlags::NONE )
     {
-        OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
+        OutlinerView* pOLV = m_pSdrView->GetTextEditOutlinerView();
 
         if (!pOLV)
             return;
@@ -655,10 +655,10 @@ void SwDrawTextShell::ExecRotateTransliteration( SfxRequest const & rReq )
 {
     if( rReq.GetSlot() == SID_TRANSLITERATE_ROTATE_CASE )
     {
-        if (!pSdrView)
+        if (!m_pSdrView)
             return;
 
-        OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
+        OutlinerView* pOLV = m_pSdrView->GetTextEditOutlinerView();
 
         if (!pOLV)
             return;
@@ -671,7 +671,7 @@ void SwDrawTextShell::ExecRotateTransliteration( SfxRequest const & rReq )
 
 void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
 {
-    OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
+    OutlinerView* pOLV = m_pSdrView->GetTextEditOutlinerView();
     if(!pOLV)
         return;
     const SfxItemSet *pArgs = rReq.GetArgs();
@@ -714,7 +714,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
         SfxAllItemSet aAllSet( GetPool() );
         aAllSet.Put( SfxBoolItem( FN_PARAM_1, false ) );
 
-        SwViewOption aOpt(*rView.GetWrtShell().GetViewOptions());
+        SwViewOption aOpt(*m_rView.GetWrtShell().GetViewOptions());
         const OUString& sSymbolFont = aOpt.GetSymbolFont();
         if( !sSymbolFont.isEmpty() )
             aAllSet.Put( SfxStringItem( SID_FONT_NAME, sSymbolFont ) );
@@ -723,15 +723,15 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
 
         // If character is selected, it can be shown
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-        auto xFrame = rView.GetViewFrame()->GetFrame().GetFrameInterface();
-        ScopedVclPtr<SfxAbstractDialog> pDlg(pFact->CreateCharMapDialog(rView.GetFrameWeld(), aAllSet, xFrame));
+        auto xFrame = m_rView.GetViewFrame()->GetFrame().GetFrameInterface();
+        ScopedVclPtr<SfxAbstractDialog> pDlg(pFact->CreateCharMapDialog(m_rView.GetFrameWeld(), aAllSet, xFrame));
         pDlg->Execute();
         return;
     }
 
     // do not flicker
     pOLV->HideCursor();
-    SdrOutliner * pOutliner = pSdrView->GetTextEditOutliner();
+    SdrOutliner * pOutliner = m_pSdrView->GetTextEditOutliner();
     pOutliner->SetUpdateLayout(false);
 
     SfxItemSet aOldSet( pOLV->GetAttribs() );
@@ -787,8 +787,8 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
 SfxUndoManager* SwDrawTextShell::GetUndoManager()
 {
     SwWrtShell &rSh = GetShell();
-    pSdrView = rSh.GetDrawView();
-    SdrOutliner * pOutliner = pSdrView->GetTextEditOutliner();
+    m_pSdrView = rSh.GetDrawView();
+    SdrOutliner * pOutliner = m_pSdrView->GetTextEditOutliner();
     return &pOutliner->GetUndoManager();
 }
 
@@ -798,10 +798,10 @@ void SwDrawTextShell::GetStatePropPanelAttr(SfxItemSet &rSet)
     sal_uInt16 nWhich = aIter.FirstWhich();
 
     SwWrtShell &rSh = GetShell();
-    pSdrView = rSh.GetDrawView();
+    m_pSdrView = rSh.GetDrawView();
 
-    SfxItemSet aAttrs( pSdrView->GetModel()->GetItemPool() );
-    pSdrView->GetAttributes( aAttrs );
+    SfxItemSet aAttrs( m_pSdrView->GetModel()->GetItemPool() );
+    m_pSdrView->GetAttributes( aAttrs );
 
     while ( nWhich )
     {
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 831aae7ba76c..5bfd2ac956bd 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -208,10 +208,10 @@ namespace
 
 SwContent::SwContent(const SwContentType* pCnt, const OUString& rName, tools::Long nYPos) :
     SwTypeNumber(CTYPE_CNT),
-    pParent(pCnt),
-    sContentName(rName),
-    nYPosition(nYPos),
-    bInvisible(false)
+    m_pParent(pCnt),
+    m_sContentName(rName),
+    m_nYPosition(nYPos),
+    m_bInvisible(false)
 {
 }