sw: prefix members of SwContentTree

Change-Id: Ia45ad08339ab7e6b2532d85f7a271156f29d1947

2 files changed, 362 insertions, 362 deletions

diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index 0f6085c4d701..a46ec993d541 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -54,52 +54,52 @@ class SwContentTree
     : public SvTreeListBox
     , public SfxListener
 {
-    ImageList           aEntryImages;
-    OUString            sSpace;
-    AutoTimer           aUpdTimer;
-
-    o3tl::enumarray<ContentTypeId,SwContentType*>  aActiveContentArr;
-    o3tl::enumarray<ContentTypeId,SwContentType*>  aHiddenContentArr;
-    OUString            aContextStrings[CONTEXT_COUNT + 1];
-    OUString            sRemoveIdx;
-    OUString            sUpdateIdx;
-    OUString            sUnprotTable;
-    OUString            sRename;
-    OUString            sReadonlyIdx;
-    OUString            sInvisible;
-    OUString            sPostItShow;
-    OUString            sPostItHide;
-    OUString            sPostItDelete;
-
-    SwWrtShell*         pHiddenShell;   // dropped Doc
-    SwWrtShell*         pActiveShell;   // the active or a const. open view
-    SwNavigationConfig* pConfig;
+    ImageList           m_aEntryImages;
+    OUString            m_sSpace;
+    AutoTimer           m_aUpdTimer;
+
+    o3tl::enumarray<ContentTypeId,SwContentType*>  m_aActiveContentArr;
+    o3tl::enumarray<ContentTypeId,SwContentType*>  m_aHiddenContentArr;
+    OUString            m_aContextStrings[CONTEXT_COUNT + 1];
+    OUString            m_sRemoveIdx;
+    OUString            m_sUpdateIdx;
+    OUString            m_sUnprotTable;
+    OUString            m_sRename;
+    OUString            m_sReadonlyIdx;
+    OUString            m_sInvisible;
+    OUString            m_sPostItShow;
+    OUString            m_sPostItHide;
+    OUString            m_sPostItDelete;
+
+    SwWrtShell*         m_pHiddenShell;   // dropped Doc
+    SwWrtShell*         m_pActiveShell;   // the active or a const. open view
+    SwNavigationConfig* m_pConfig;
 
     std::map< void*, bool > mOutLineNodeMap;
 
-    sal_Int32           nActiveBlock;
-    sal_Int32           nHiddenBlock;
-    ContentTypeId       nRootType;
-    ContentTypeId       nLastSelType;
-    sal_uInt8           nOutlineLevel;
-
-    bool                bIsActive           :1;
-    bool                bIsConstant         :1;
-    bool                bIsHidden           :1;
-    bool                bDocChgdInDragging  :1;
-    bool                bIsInternalDrag     :1;
-    bool                bIsRoot             :1;
-    bool                bIsIdleClear        :1;
-    bool                bIsLastReadOnly     :1;
-    bool                bIsOutlineMoveable  :1;
-    bool                bViewHasChanged     :1;
-    bool                bIsImageListInitialized : 1;
+    sal_Int32           m_nActiveBlock;
+    sal_Int32           m_nHiddenBlock;
+    ContentTypeId       m_nRootType;
+    ContentTypeId       m_nLastSelType;
+    sal_uInt8           m_nOutlineLevel;
+
+    bool                m_bIsActive           :1;
+    bool                m_bIsConstant         :1;
+    bool                m_bIsHidden           :1;
+    bool                m_bDocChgdInDragging  :1;
+    bool                m_bIsInternalDrag     :1;
+    bool                m_bIsRoot             :1;
+    bool                m_bIsIdleClear        :1;
+    bool                m_bIsLastReadOnly     :1;
+    bool                m_bIsOutlineMoveable  :1;
+    bool                m_bViewHasChanged     :1;
+    bool                m_bIsImageListInitialized : 1;
     bool                m_bActiveDocModified :1;
 
     static bool         bIsInDrag;
 
-    bool                bIsKeySpace;
-    Rectangle           oldRectangle;
+    bool                m_bIsKeySpace;
+    Rectangle           m_aOldRectangle;
 
     void                FindActiveTypeAndRemoveUserData();
 
@@ -166,13 +166,13 @@ public:
     void            SetConstantShell(SwWrtShell* pSh);
 
     SwWrtShell*     GetWrtShell()
-                        {return bIsActive||bIsConstant ?
-                                    pActiveShell :
-                                        pHiddenShell;}
+                        {return m_bIsActive||m_bIsConstant ?
+                                    m_pActiveShell :
+                                        m_pHiddenShell;}
 
     static bool     IsInDrag() {return bIsInDrag;}
 
-    sal_uInt8       GetOutlineLevel()const {return nOutlineLevel;}
+    sal_uInt8       GetOutlineLevel()const {return m_nOutlineLevel;}
     void            SetOutlineLevel(sal_uInt8 nSet);
 
     virtual bool    Expand( SvTreeListEntry* pParent ) override;
@@ -184,12 +184,12 @@ public:
     void            ShowTree();
     void            HideTree();
 
-    bool            IsConstantView() {return bIsConstant;}
-    bool            IsActiveView()   {return bIsActive;}
-    bool            IsHiddenView()   {return bIsHidden;}
+    bool            IsConstantView() {return m_bIsConstant;}
+    bool            IsActiveView()   {return m_bIsActive;}
+    bool            IsHiddenView()   {return m_bIsHidden;}
 
-    const SwWrtShell*   GetActiveWrtShell() {return pActiveShell;}
-    SwWrtShell*         GetHiddenWrtShell() {return pHiddenShell;}
+    const SwWrtShell*   GetActiveWrtShell() {return m_pActiveShell;}
+    SwWrtShell*         GetHiddenWrtShell() {return m_pHiddenShell;}
 
     DECL_LINK_TYPED( ContentDoubleClickHdl, SvTreeListBox*, bool );
     DECL_LINK_TYPED( TimerUpdate, Timer *, void );
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 338198eb9e5b..0fe792d43083 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -782,37 +782,37 @@ void    SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
 
 SwContentTree::SwContentTree(vcl::Window* pParent, const ResId& rResId)
     : SvTreeListBox(pParent, rResId)
-    , sSpace(OUString("                    "))
-    , sRemoveIdx(SW_RES(STR_REMOVE_INDEX))
-    , sUpdateIdx(SW_RES(STR_UPDATE))
-    , sUnprotTable(SW_RES(STR_REMOVE_TBL_PROTECTION))
-    , sRename(SW_RES(STR_RENAME))
-    , sReadonlyIdx(SW_RES(STR_READONLY_IDX))
-    , sInvisible(SW_RES(STR_INVISIBLE))
-    , sPostItShow(SW_RES(STR_POSTIT_SHOW))
-    , sPostItHide(SW_RES(STR_POSTIT_HIDE))
-    , sPostItDelete(SW_RES(STR_POSTIT_DELETE))
-    , pHiddenShell(0)
-    , pActiveShell(0)
-    , pConfig(SW_MOD()->GetNavigationConfig())
-    , nActiveBlock(0)
-    , nHiddenBlock(0)
-    , nRootType(ContentTypeId::UNKNOWN)
-    , nLastSelType(ContentTypeId::UNKNOWN)
-    , nOutlineLevel(MAXLEVEL)
-    , bIsActive(true)
-    , bIsConstant(false)
-    , bIsHidden(false)
-    , bDocChgdInDragging(false)
-    , bIsInternalDrag(false)
-    , bIsRoot(false)
-    , bIsIdleClear(false)
-    , bIsLastReadOnly(false)
-    , bIsOutlineMoveable(true)
-    , bViewHasChanged(false)
-    , bIsImageListInitialized(false)
+    , m_sSpace(OUString("                    "))
+    , m_sRemoveIdx(SW_RES(STR_REMOVE_INDEX))
+    , m_sUpdateIdx(SW_RES(STR_UPDATE))
+    , m_sUnprotTable(SW_RES(STR_REMOVE_TBL_PROTECTION))
+    , m_sRename(SW_RES(STR_RENAME))
+    , m_sReadonlyIdx(SW_RES(STR_READONLY_IDX))
+    , m_sInvisible(SW_RES(STR_INVISIBLE))
+    , m_sPostItShow(SW_RES(STR_POSTIT_SHOW))
+    , m_sPostItHide(SW_RES(STR_POSTIT_HIDE))
+    , m_sPostItDelete(SW_RES(STR_POSTIT_DELETE))
+    , m_pHiddenShell(0)
+    , m_pActiveShell(0)
+    , m_pConfig(SW_MOD()->GetNavigationConfig())
+    , m_nActiveBlock(0)
+    , m_nHiddenBlock(0)
+    , m_nRootType(ContentTypeId::UNKNOWN)
+    , m_nLastSelType(ContentTypeId::UNKNOWN)
+    , m_nOutlineLevel(MAXLEVEL)
+    , m_bIsActive(true)
+    , m_bIsConstant(false)
+    , m_bIsHidden(false)
+    , m_bDocChgdInDragging(false)
+    , m_bIsInternalDrag(false)
+    , m_bIsRoot(false)
+    , m_bIsIdleClear(false)
+    , m_bIsLastReadOnly(false)
+    , m_bIsOutlineMoveable(true)
+    , m_bViewHasChanged(false)
+    , m_bIsImageListInitialized(false)
     , m_bActiveDocModified(false)
-    , bIsKeySpace(false)
+    , m_bIsKeySpace(false)
 {
     SetHelpId(HID_NAVIGATOR_TREELIST);
 
@@ -821,16 +821,16 @@ SwContentTree::SwContentTree(vcl::Window* pParent, const ResId& rResId)
     SetDragDropMode(DragDropMode::APP_COPY);
     for (ContentTypeId i : o3tl::enumrange<ContentTypeId>())
     {
-        aActiveContentArr[i]    = 0;
-        aHiddenContentArr[i]    = 0;
+        m_aActiveContentArr[i]    = 0;
+        m_aHiddenContentArr[i]    = 0;
     }
     for (int i = 0; i < CONTEXT_COUNT; ++i)
     {
-        aContextStrings[i] = SW_RESSTR(i+STR_CONTEXT_FIRST);
+        m_aContextStrings[i] = SW_RESSTR(i+STR_CONTEXT_FIRST);
     }
-    nActiveBlock = pConfig->GetActiveBlock();
-    aUpdTimer.SetTimeoutHdl(LINK(this, SwContentTree, TimerUpdate));
-    aUpdTimer.SetTimeout(1000);
+    m_nActiveBlock = m_pConfig->GetActiveBlock();
+    m_aUpdTimer.SetTimeoutHdl(LINK(this, SwContentTree, TimerUpdate));
+    m_aUpdTimer.SetTimeout(1000);
     Clear();
     EnableContextMenuHandling();
     SetStyle( GetStyle() | WB_QUICK_SEARCH );
@@ -845,7 +845,7 @@ void SwContentTree::dispose()
 {
     Clear(); // If applicable erase content types previously.
     bIsInDrag = false;
-    aUpdTimer.Stop();
+    m_aUpdTimer.Stop();
     SetActiveShell(0);
     SvTreeListBox::dispose();
 }
@@ -866,10 +866,10 @@ OUString SwContentTree::GetEntryAltText( SvTreeListEntry* pEntry ) const
     {
         case ContentTypeId::DRAWOBJECT:
             {
-                SdrView* pDrawView = pActiveShell->GetDrawView();
+                SdrView* pDrawView = m_pActiveShell->GetDrawView();
                 if (pDrawView)
                 {
-                    SwDrawModel* pDrawModel = pActiveShell->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel();
+                    SwDrawModel* pDrawModel = m_pActiveShell->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel();
                     SdrPage* pPage = pDrawModel->GetPage(0);
                     const size_t nCount = pPage->GetObjCount();
                     for( size_t i=0; i<nCount; ++i )
@@ -916,9 +916,9 @@ OUString SwContentTree::GetEntryAltText( SvTreeListEntry* pEntry ) const
             break;
         case ContentTypeId::GRAPHIC   :
             {
-                if( pActiveShell && pActiveShell->GetDoc() )
+                if( m_pActiveShell && m_pActiveShell->GetDoc() )
                 {
-                    const SwFlyFrameFormat* pFrameFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName());
+                    const SwFlyFrameFormat* pFrameFormat = m_pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName());
                     if( pFrameFormat )
                     {
 //                        SwNodeIndex aIdx( *(pFrameFormat->GetContent().GetContentIdx()), 1 );
@@ -934,7 +934,7 @@ OUString SwContentTree::GetEntryAltText( SvTreeListEntry* pEntry ) const
         case ContentTypeId::FRAME     :
             {
                 //Can't find the GetAlternateText function. Need to verify again.
-                const SwFlyFrameFormat* pFlyFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName());
+                const SwFlyFrameFormat* pFlyFormat = m_pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName());
                 if( pFlyFormat )
                     return pFlyFormat->/*GetAlternateText*/GetName();
             }
@@ -959,10 +959,10 @@ OUString SwContentTree::GetEntryLongDescription( SvTreeListEntry* pEntry ) const
     {
         case ContentTypeId::DRAWOBJECT:
             {
-                SdrView* pDrawView = pActiveShell->GetDrawView();
+                SdrView* pDrawView = m_pActiveShell->GetDrawView();
                 if (pDrawView)
                 {
-                    SwDrawModel* pDrawModel = pActiveShell->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel();
+                    SwDrawModel* pDrawModel = m_pActiveShell->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel();
                     SdrPage* pPage = pDrawModel->GetPage(0);
                     const size_t nCount = pPage->GetObjCount();
                     for( size_t i=0; i<nCount; ++i )
@@ -1012,7 +1012,7 @@ OUString SwContentTree::GetEntryLongDescription( SvTreeListEntry* pEntry ) const
         case ContentTypeId::FRAME     :
             {
                 //Can't find the function "GetLongDescription". Need to verify again.
-                const SwFlyFrameFormat* pFlyFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName());
+                const SwFlyFrameFormat* pFlyFormat = m_pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName());
                 if( pFlyFormat )
                     return pFlyFormat->GetDescription();
             }
@@ -1026,7 +1026,7 @@ OUString SwContentTree::GetEntryLongDescription( SvTreeListEntry* pEntry ) const
 
 void SwContentTree::StartDrag( sal_Int8 nAction, const Point& rPosPixel )
 {
-    if( !bIsRoot || nRootType != ContentTypeId::OUTLINE )
+    if( !m_bIsRoot || m_nRootType != ContentTypeId::OUTLINE )
     {
         ReleaseMouse();
 
@@ -1049,9 +1049,9 @@ void SwContentTree::DragFinished( sal_Int8 nAction )
 {
     // To prevent the removing of the selected entry in external drag and drop
     // the drag action mustn't be MOVE.
-    SvTreeListBox::DragFinished( bIsInternalDrag ? nAction : DND_ACTION_COPY );
+    SvTreeListBox::DragFinished( m_bIsInternalDrag ? nAction : DND_ACTION_COPY );
     SwContentTree::SetInDrag(false);
-    bIsInternalDrag = false;
+    m_bIsInternalDrag = false;
 }
 
 // QueryDrop will be executed in the navigator
@@ -1059,9 +1059,9 @@ void SwContentTree::DragFinished( sal_Int8 nAction )
 sal_Int8 SwContentTree::AcceptDrop( const AcceptDropEvent& rEvt )
 {
     sal_Int8 nRet = DND_ACTION_NONE;
-    if( bIsRoot )
+    if( m_bIsRoot )
     {
-        if( bIsOutlineMoveable )
+        if( m_bIsOutlineMoveable )
             nRet = SvTreeListBox::AcceptDrop( rEvt );
     }
     else if( !bIsInDrag )
@@ -1088,7 +1088,7 @@ static void* lcl_GetOutlineKey( SwContentTree* pTree, SwOutlineContent* pContent
 sal_Int8 SwContentTree::ExecuteDrop( const ExecuteDropEvent& rEvt )
 {
     SvTreeListEntry* pEntry = pTargetEntry;
-    if( pEntry && ( nRootType == ContentTypeId::OUTLINE ) && lcl_IsContent( pEntry ) )
+    if( pEntry && ( m_nRootType == ContentTypeId::OUTLINE ) && lcl_IsContent( pEntry ) )
     {
         SwOutlineContent* pOutlineContent = static_cast<SwOutlineContent*>(pEntry->GetUserData());
         if( pOutlineContent )
@@ -1109,7 +1109,7 @@ sal_Int8 SwContentTree::ExecuteDrop( const ExecuteDropEvent& rEvt )
             }
         }
     }
-    if( bIsRoot )
+    if( m_bIsRoot )
         return SvTreeListBox::ExecuteDrop( rEvt );
     return bIsInDrag ? DND_ACTION_NONE : GetParentWindow()->ExecuteDrop(rEvt);
 }
@@ -1128,10 +1128,10 @@ std::unique_ptr<PopupMenu> SwContentTree::CreateContextMenu()
     {
         pSubPop1->InsertItem( i + 100, OUString::number(i));
     }
-    pSubPop1->CheckItem(100 + nOutlineLevel);
+    pSubPop1->CheckItem(100 + m_nOutlineLevel);
     for(int i=0; i < 3; ++i)
     {
-        pSubPop2->InsertItem( i + 201, aContextStrings[
+        pSubPop2->InsertItem( i + 201, m_aContextStrings[
                 STR_HYPERLINK - STR_CONTEXT_FIRST + i]);
     }
     pSubPop2->CheckItem( 201 +
@@ -1146,42 +1146,42 @@ std::unique_ptr<PopupMenu> SwContentTree::CreateContextMenu()
         if(pView == pActiveView)
         {
             sInsert += "(";
-            sInsert += aContextStrings[ STR_ACTIVE - STR_CONTEXT_FIRST];
+            sInsert += m_aContextStrings[ STR_ACTIVE - STR_CONTEXT_FIRST];
             sInsert += ")";
         }
         pSubPop3->InsertItem(nId, sInsert);
-        if(bIsConstant && pActiveShell == &pView->GetWrtShell())
+        if(m_bIsConstant && m_pActiveShell == &pView->GetWrtShell())
             pSubPop3->CheckItem(nId);
         pView = SwModule::GetNextView(pView);
         nId++;
     }
-    pSubPop3->InsertItem(nId++, aContextStrings[STR_ACTIVE_VIEW - STR_CONTEXT_FIRST]);
-    if(pHiddenShell)
+    pSubPop3->InsertItem(nId++, m_aContextStrings[STR_ACTIVE_VIEW - STR_CONTEXT_FIRST]);
+    if(m_pHiddenShell)
     {
-        OUString sHiddenEntry = pHiddenShell->GetView().GetDocShell()->GetTitle();
+        OUString sHiddenEntry = m_pHiddenShell->GetView().GetDocShell()->GetTitle();
         sHiddenEntry += " ( ";
-        sHiddenEntry += aContextStrings[ STR_HIDDEN - STR_CONTEXT_FIRST];
+        sHiddenEntry += m_aContextStrings[ STR_HIDDEN - STR_CONTEXT_FIRST];
         sHiddenEntry += " )";
         pSubPop3->InsertItem(nId, sHiddenEntry);
     }
 
-    if(bIsActive)
+    if(m_bIsActive)
         pSubPop3->CheckItem( --nId );
-    else if(bIsHidden)
+    else if(m_bIsHidden)
         pSubPop3->CheckItem( nId );
 
-    pPop->InsertItem( 1, aContextStrings[STR_OUTLINE_LEVEL - STR_CONTEXT_FIRST]);
-    pPop->InsertItem(2, aContextStrings[STR_DRAGMODE - STR_CONTEXT_FIRST]);
-    pPop->InsertItem(3, aContextStrings[STR_DISPLAY - STR_CONTEXT_FIRST]);
+    pPop->InsertItem( 1, m_aContextStrings[STR_OUTLINE_LEVEL - STR_CONTEXT_FIRST]);
+    pPop->InsertItem(2, m_aContextStrings[STR_DRAGMODE - STR_CONTEXT_FIRST]);
+    pPop->InsertItem(3, m_aContextStrings[STR_DISPLAY - STR_CONTEXT_FIRST]);
     // Now edit
     SvTreeListEntry* pEntry = 0;
     // Edit only if the shown content is coming from the current view.
-    if((bIsActive || pActiveShell == pActiveView->GetWrtShellPtr())
+    if((m_bIsActive || m_pActiveShell == pActiveView->GetWrtShellPtr())
             && 0 != (pEntry = FirstSelected()) && lcl_IsContent(pEntry))
     {
         const SwContentType* pContType = static_cast<SwContent*>(pEntry->GetUserData())->GetParent();
         const ContentTypeId nContentType = pContType->GetType();
-        bool bReadonly = pActiveShell->GetView().GetDocShell()->IsReadOnly();
+        bool bReadonly = m_pActiveShell->GetView().GetDocShell()->IsReadOnly();
         bool bVisible = !static_cast<SwContent*>(pEntry->GetUserData())->IsInvisible();
         bool bProtected = static_cast<SwContent*>(pEntry->GetUserData())->IsProtect();
         bool bEditable = pContType->IsEditable() &&
@@ -1203,52 +1203,52 @@ std::unique_ptr<PopupMenu> SwContentTree::CreateContextMenu()
             if(ContentTypeId::INDEX == nContentType)
             {
                 bSubPop4 = true;
-                pSubPop4->InsertItem(401, sRemoveIdx);
-                pSubPop4->InsertItem(402, sUpdateIdx);
+                pSubPop4->InsertItem(401, m_sRemoveIdx);
+                pSubPop4->InsertItem(402, m_sUpdateIdx);
 
                 const SwTOXBase* pBase = static_cast<SwTOXBaseContent*>(pEntry->GetUserData())->GetTOXBase();
                 if(!pBase->IsTOXBaseInReadonly())
-                    pSubPop4->InsertItem(403, aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
-                pSubPop4->InsertItem(405, sReadonlyIdx);
+                    pSubPop4->InsertItem(403, m_aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
+                pSubPop4->InsertItem(405, m_sReadonlyIdx);
 
                 pSubPop4->CheckItem( 405, SwEditShell::IsTOXBaseReadonly(*pBase));
-                pSubPop4->InsertItem(501, aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
+                pSubPop4->InsertItem(501, m_aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
             }
             else if(ContentTypeId::TABLE == nContentType && !bReadonly)
             {
                 bSubPop4 = true;
-                pSubPop4->InsertItem(403, aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
-                pSubPop4->InsertItem(404, sUnprotTable);
+                pSubPop4->InsertItem(403, m_aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
+                pSubPop4->InsertItem(404, m_sUnprotTable);
                 bool bFull = false;
                 OUString sTableName = static_cast<SwContent*>(pEntry->GetUserData())->GetName();
-                bool bProt = pActiveShell->HasTableAnyProtection( &sTableName, &bFull );
+                bool bProt = m_pActiveShell->HasTableAnyProtection( &sTableName, &bFull );
                 pSubPop4->EnableItem(403, !bFull );
                 pSubPop4->EnableItem(404, bProt );
-                pSubPop4->InsertItem(501, aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
+                pSubPop4->InsertItem(501, m_aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
             }
             else if(bEditable || bDeletable)
             {
 
                 if(bEditable && bDeletable)
                 {
-                    pSubPop4->InsertItem(403, aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
-                    pSubPop4->InsertItem(501, aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
+                    pSubPop4->InsertItem(403, m_aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
+                    pSubPop4->InsertItem(501, m_aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
                     bSubPop4 = true;
                 }
                 else if(bEditable)
-                    pPop->InsertItem(403, aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
+                    pPop->InsertItem(403, m_aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
                 else if(bDeletable)
                 {
-                    pSubPop4->InsertItem(501, aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
+                    pSubPop4->InsertItem(501, m_aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
                 }
             }
             //Rename object
             if(bRenamable)
             {
                 if(bSubPop4)
-                    pSubPop4->InsertItem(502, sRename);
+                    pSubPop4->InsertItem(502, m_sRename);
                 else
-                    pPop->InsertItem(502, sRename);
+                    pPop->InsertItem(502, m_sRename);
             }
 
             if(bSubPop4)
@@ -1261,11 +1261,11 @@ std::unique_ptr<PopupMenu> SwContentTree::CreateContextMenu()
     else if( pEntry )
     {
         SwContentType* pType = static_cast<SwContentType*>(pEntry->GetUserData());
-        if ( (pType->GetType() == ContentTypeId::POSTIT) &&  (!pActiveShell->GetView().GetDocShell()->IsReadOnly()) && ( pType->GetMemberCount() > 0) )
+        if ( (pType->GetType() == ContentTypeId::POSTIT) &&  (!m_pActiveShell->GetView().GetDocShell()->IsReadOnly()) && ( pType->GetMemberCount() > 0) )
         {
-            pSubPop4->InsertItem(600, sPostItShow );
-            pSubPop4->InsertItem(601, sPostItHide );
-            pSubPop4->InsertItem(602, sPostItDelete );
+            pSubPop4->InsertItem(600, m_sPostItShow );
+            pSubPop4->InsertItem(601, m_sPostItHide );
+            pSubPop4->InsertItem(602, m_sPostItDelete );
             pPop->InsertItem(4, pType->GetSingleName());
             pPop->SetPopupMenu(4, pSubPop4);
         }
@@ -1296,7 +1296,7 @@ sal_IntPtr SwContentTree::GetTabPos( SvTreeListEntry* pEntry, SvLBoxTab* pTab)
                 nLevel = nLevel + static_cast<SwRegionContent*>(pCnt)->GetRegionLevel();
         }
     }
-    return nLevel * 10 + (bIsRoot ? 0 : 5) + pTab->GetPos();  //determined empirically
+    return nLevel * 10 + (m_bIsRoot ? 0 : 5) + pTab->GetPos();  //determined empirically
 }
 
 // Content will be integrated into the Box only on demand.
@@ -1324,7 +1324,7 @@ void  SwContentTree::RequestingChildren( SvTreeListEntry* pParent )
                         const auto nLevel = static_cast<const SwOutlineContent*>(pCnt)->GetOutlineLevel();
                         OUString sEntry = pCnt->GetName();
                         if(sEntry.isEmpty())
-                            sEntry = sSpace;
+                            sEntry = m_sSpace;
                         if(!pChild || (nLevel == 0))
                             pChild = InsertEntry(sEntry, pParent, false, TREELIST_APPEND,const_cast<SwContent *>(pCnt));
                         else
@@ -1360,7 +1360,7 @@ void  SwContentTree::RequestingChildren( SvTreeListEntry* pParent )
                     {
                         OUString sEntry = pCnt->GetName();
                         if (sEntry.isEmpty())
-                            sEntry = sSpace;
+                            sEntry = m_sSpace;
                         pChild = InsertEntry(sEntry, pParent, false, TREELIST_APPEND, const_cast<SwContent *>(pCnt));
                     }
                     if (pChild)
@@ -1371,7 +1371,7 @@ void  SwContentTree::RequestingChildren( SvTreeListEntry* pParent )
                         SdrObject * pObj = GetDrawingObjectsByContent(pCnt);
                         if(pObj)
                         {
-                            SdrView* pDrawView = pActiveShell->GetDrawView();
+                            SdrView* pDrawView = m_pActiveShell->GetDrawView();
                             SdrPageView* pPV = pDrawView->/*GetPageViewPvNum*/GetSdrPageView(/*0*/);
                             if( pPV )
                             {
@@ -1398,10 +1398,10 @@ SdrObject* SwContentTree::GetDrawingObjectsByContent(const SwContent *pCnt)
     {
         case ContentTypeId::DRAWOBJECT:
         {
-            SdrView* pDrawView = pActiveShell->GetDrawView();
+            SdrView* pDrawView = m_pActiveShell->GetDrawView();
             if (pDrawView)
             {
-                SwDrawModel* pDrawModel = pActiveShell->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel();
+                SwDrawModel* pDrawModel = m_pActiveShell->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel();
                 SdrPage* pPage = pDrawModel->GetPage(0);
                 const size_t nCount = pPage->GetObjCount();
 
@@ -1427,20 +1427,20 @@ SdrObject* SwContentTree::GetDrawingObjectsByContent(const SwContent *pCnt)
 
 bool  SwContentTree::Expand( SvTreeListEntry* pParent )
 {
-    if(!bIsRoot || (static_cast<SwContentType*>(pParent->GetUserData())->GetType() == ContentTypeId::OUTLINE) ||
-            (nRootType == ContentTypeId::OUTLINE))
+    if(!m_bIsRoot || (static_cast<SwContentType*>(pParent->GetUserData())->GetType() == ContentTypeId::OUTLINE) ||
+            (m_nRootType == ContentTypeId::OUTLINE))
     {
         if(lcl_IsContentType(pParent))
         {
             SwContentType* pCntType = static_cast<SwContentType*>(pParent->GetUserData());
             const sal_Int32 nOr = 1 << (int)pCntType->GetType(); //linear -> Bitposition
-            if(bIsActive || bIsConstant)
+            if(m_bIsActive || m_bIsConstant)
             {
-                nActiveBlock |= nOr;
-                pConfig->SetActiveBlock(nActiveBlock);
+                m_nActiveBlock |= nOr;
+                m_pConfig->SetActiveBlock(m_nActiveBlock);
             }
             else
-                nHiddenBlock |= nOr;
+                m_nHiddenBlock |= nOr;
             if((pCntType->GetType() == ContentTypeId::OUTLINE))
             {
                 std::map< void*, bool > mCurrOutLineNodeMap;
@@ -1484,22 +1484,22 @@ bool  SwContentTree::Expand( SvTreeListEntry* pParent )
 
 bool  SwContentTree::Collapse( SvTreeListEntry* pParent )
 {
-    if(!bIsRoot || (static_cast<SwContentType*>(pParent->GetUserData())->GetType() == ContentTypeId::OUTLINE) ||
-            (nRootType == ContentTypeId::OUTLINE))
+    if(!m_bIsRoot || (static_cast<SwContentType*>(pParent->GetUserData())->GetType() == ContentTypeId::OUTLINE) ||
+            (m_nRootType == ContentTypeId::OUTLINE))
     {
         if(lcl_IsContentType(pParent))
         {
-            if(bIsRoot)
+            if(m_bIsRoot)
                 return false;
             SwContentType* pCntType = static_cast<SwContentType*>(pParent->GetUserData());
             const sal_Int32 nAnd = ~(1 << (int)pCntType->GetType());
-            if(bIsActive || bIsConstant)
+            if(m_bIsActive || m_bIsConstant)
             {
-                nActiveBlock &= nAnd;
-                pConfig->SetActiveBlock(nActiveBlock);
+                m_nActiveBlock &= nAnd;
+                m_pConfig->SetActiveBlock(m_nActiveBlock);
             }
             else
-                nHiddenBlock &= nAnd;
+                m_nHiddenBlock &= nAnd;
         }
         else if( lcl_IsContent(pParent) )
         {
@@ -1524,18 +1524,18 @@ IMPL_LINK_NOARG_TYPED(SwContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool
     {
         if(lcl_IsContentType(pEntry) && !pEntry->HasChildren())
             RequestingChildren(pEntry);
-        else if(!lcl_IsContentType(pEntry) && (bIsActive || bIsConstant))
+        else if(!lcl_IsContentType(pEntry) && (m_bIsActive || m_bIsConstant))
         {
-            if(bIsConstant)
+            if(m_bIsConstant)
             {
-                pActiveShell->GetView().GetViewFrame()->GetWindow().ToTop();
+                m_pActiveShell->GetView().GetViewFrame()->GetWindow().ToTop();
             }
             //Jump to content type:
             SwContent* pCnt = static_cast<SwContent*>(pEntry->GetUserData());
             OSL_ENSURE( pCnt, "no UserData");
             GotoContent(pCnt);
             if(pCnt->GetParent()->GetType() == ContentTypeId::FRAME)
-                pActiveShell->EnterStdMode();
+                m_pActiveShell->EnterStdMode();
         }
     }
     return false;
@@ -1545,22 +1545,22 @@ IMPL_LINK_NOARG_TYPED(SwContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool
 
 void SwContentTree::Display( bool bActive )
 {
-    if(!bIsImageListInitialized)
+    if(!m_bIsImageListInitialized)
     {
-        aEntryImages = ImageList(SW_RES(IMG_NAVI_ENTRYBMP));
+        m_aEntryImages = ImageList(SW_RES(IMG_NAVI_ENTRYBMP));
 
         if ( GetDPIScaleFactor() > 1 )
         {
-            for (short i = 0; i < aEntryImages.GetImageCount(); i++)
+            for (short i = 0; i < m_aEntryImages.GetImageCount(); i++)
             {
-                OUString rImageName = aEntryImages.GetImageName(i);
-                BitmapEx b = aEntryImages.GetImage(rImageName).GetBitmapEx();
+                OUString rImageName = m_aEntryImages.GetImageName(i);
+                BitmapEx b = m_aEntryImages.GetImage(rImageName).GetBitmapEx();
                 //Use Lanczos because it looks better with circles / diagonals
                 b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor(), BmpScaleFlag::Lanczos);
-                aEntryImages.ReplaceImage(rImageName, Image(b));
+                m_aEntryImages.ReplaceImage(rImageName, Image(b));
             }
         }
-        bIsImageListInitialized = true;
+        m_bIsImageListInitialized = true;
     }
     // First read the selected entry to select it later again if necessary
     // -> the user data here are no longer valid!
@@ -1588,14 +1588,14 @@ void SwContentTree::Display( bool bActive )
     }
     Clear();
     SetUpdateMode( false );
-    if(bActive && !bIsConstant && !bIsActive)
-        bIsActive = bActive;
-    bIsHidden = !bActive;
+    if(bActive && !m_bIsConstant && !m_bIsActive)
+        m_bIsActive = bActive;
+    m_bIsHidden = !bActive;
     SwWrtShell* pShell = GetWrtShell();
     const bool bReadOnly = !pShell || pShell->GetView().GetDocShell()->IsReadOnly();
-    if(bReadOnly != bIsLastReadOnly)
+    if(bReadOnly != m_bIsLastReadOnly)
     {
-        bIsLastReadOnly = bReadOnly;
+        m_bIsLastReadOnly = bReadOnly;
         bool bDisable =  pShell == 0 || bReadOnly;
         SwNavigationPI* pNavi = GetParentWindow();
         pNavi->aContentToolBox->EnableItem(FN_ITEM_UP , !bDisable);
@@ -1607,31 +1607,31 @@ void SwContentTree::Display( bool bActive )
     if(pShell)
     {
         SvTreeListEntry* pSelEntry = 0;
-        if(nRootType == ContentTypeId::UNKNOWN)
+        if(m_nRootType == ContentTypeId::UNKNOWN)
         {
             for( ContentTypeId nCntType : o3tl::enumrange<ContentTypeId>() )
             {
                 SwContentType** ppContentT = bActive ?
-                                &aActiveContentArr[nCntType] :
-                                    &aHiddenContentArr[nCntType];
+                                &m_aActiveContentArr[nCntType] :
+                                    &m_aHiddenContentArr[nCntType];
                 if(!*ppContentT)
-                    (*ppContentT) = new SwContentType(pShell, nCntType, nOutlineLevel );
+                    (*ppContentT) = new SwContentType(pShell, nCntType, m_nOutlineLevel );
 
                 OUString sEntry = (*ppContentT)->GetName();
                 SvTreeListEntry* pEntry;
-                const Image& rImage = aEntryImages.GetImage(SID_SW_START + (int)nCntType);
+                const Image& rImage = m_aEntryImages.GetImage(SID_SW_START + (int)nCntType);
                 bool bChOnDemand = 0 != (*ppContentT)->GetMemberCount();
                 pEntry = InsertEntry(sEntry, rImage, rImage,
                                 0, bChOnDemand, TREELIST_APPEND, (*ppContentT));
-                if(nCntType == nLastSelType)
+                if(nCntType == m_nLastSelType)
                     pSelEntry = pEntry;
-                sal_Int32 nExpandOptions = bIsActive || bIsConstant ?
-                                            nActiveBlock :
-                                                nHiddenBlock;
+                sal_Int32 nExpandOptions = m_bIsActive || m_bIsConstant ?
+                                            m_nActiveBlock :
+                                                m_nHiddenBlock;
                 if(nExpandOptions & (1 << (int)nCntType))
                 {
                     Expand(pEntry);
-                    if(nEntryRelPos && nCntType == nLastSelType)
+                    if(nEntryRelPos && nCntType == m_nLastSelType)
                     {
                         // Now maybe select a additional child
                         SvTreeListEntry* pChild = pEntry;
@@ -1666,16 +1666,16 @@ void SwContentTree::Display( bool bActive )
         else
         {
             SwContentType** ppRootContentT = bActive ?
-                                &aActiveContentArr[nRootType] :
-                                    &aHiddenContentArr[nRootType];
+                                &m_aActiveContentArr[m_nRootType] :
+                                    &m_aHiddenContentArr[m_nRootType];
             if(!(*ppRootContentT))
-                (*ppRootContentT) = new SwContentType(pShell, nRootType, nOutlineLevel );
-            const Image& rImage = aEntryImages.GetImage(20000 + (int)nRootType);
+                (*ppRootContentT) = new SwContentType(pShell, m_nRootType, m_nOutlineLevel );
+            const Image& rImage = m_aEntryImages.GetImage(20000 + (int)m_nRootType);
             SvTreeListEntry* pParent = InsertEntry(
                     (*ppRootContentT)->GetName(), rImage, rImage,
                         0, false, TREELIST_APPEND, *ppRootContentT);
 
-            if(nRootType != ContentTypeId::OUTLINE)
+            if(m_nRootType != ContentTypeId::OUTLINE)
             {
                 for(size_t i = 0; i < (*ppRootContentT)->GetMemberCount(); ++i)
                 {
@@ -1684,7 +1684,7 @@ void SwContentTree::Display( bool bActive )
                     {
                         OUString sEntry = pCnt->GetName();
                         if(sEntry.isEmpty())
-                            sEntry = sSpace;
+                            sEntry = m_sSpace;
                         InsertEntry( sEntry, pParent,
                             false, TREELIST_APPEND, const_cast<SwContent *>(pCnt));
                     }
@@ -1693,7 +1693,7 @@ void SwContentTree::Display( bool bActive )
             else
                 RequestingChildren(pParent);
             Expand(pParent);
-            if( nRootType == ContentTypeId::OUTLINE && bIsActive )
+            if( m_nRootType == ContentTypeId::OUTLINE && m_bIsActive )
             {
                 // find out where the cursor is
                 const sal_uInt16 nActPos = pShell->GetOutlinePos(MAXLEVEL);
@@ -1803,7 +1803,7 @@ bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
                 }
                 sEntry += pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineText(nPos, false);
                 sOutlineText = pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineText(nPos);
-                bIsOutlineMoveable = static_cast<SwOutlineContent*>(pCnt)->IsMoveable();
+                m_bIsOutlineMoveable = static_cast<SwOutlineContent*>(pCnt)->IsMoveable();
                 bOutline = true;
             }
         }
@@ -1845,9 +1845,9 @@ bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
                 // without a filename into its own document.
                 bRet = true;
             }
-            else if(bIsConstant &&
+            else if(m_bIsConstant &&
                     ( !::GetActiveView() ||
-                        pActiveShell != ::GetActiveView()->GetWrtShellPtr()))
+                        m_pActiveShell != ::GetActiveView()->GetWrtShellPtr()))
             {
                 // Urls of inactive views cannot dragged without
                 // file names, also.
@@ -1898,7 +1898,7 @@ bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
 
 bool SwContentTree::ToggleToRoot()
 {
-    if(!bIsRoot)
+    if(!m_bIsRoot)
     {
         SvTreeListEntry* pEntry = GetCurEntry();
         const SwContentType* pCntType;
@@ -1908,27 +1908,27 @@ bool SwContentTree::ToggleToRoot()
                 pCntType = static_cast<SwContentType*>(pEntry->GetUserData());
             else
                 pCntType = static_cast<SwContent*>(pEntry->GetUserData())->GetParent();
-            nRootType = pCntType->GetType();
-            bIsRoot = true;
-            Display(bIsActive || bIsConstant);
+            m_nRootType = pCntType->GetType();
+            m_bIsRoot = true;
+            Display(m_bIsActive || m_bIsConstant);
         }
     }
     else
     {
-        nRootType = ContentTypeId::UNKNOWN;
-        bIsRoot = false;
+        m_nRootType = ContentTypeId::UNKNOWN;
+        m_bIsRoot = false;
         FindActiveTypeAndRemoveUserData();
-        Display(bIsActive || bIsConstant);
-        if( bIsKeySpace )
+        Display(m_bIsActive || m_bIsConstant);
+        if( m_bIsKeySpace )
         {
             HideFocus();
-            ShowFocus( oldRectangle);
-            bIsKeySpace = false;
+            ShowFocus( m_aOldRectangle);
+            m_bIsKeySpace = false;
         }
     }
-    pConfig->SetRootType( nRootType );
-    GetParentWindow()->aContentToolBox->CheckItem(FN_SHOW_ROOT, bIsRoot);
-    return bIsRoot;
+    m_pConfig->SetRootType( m_nRootType );
+    GetParentWindow()->aContentToolBox->CheckItem(FN_SHOW_ROOT, m_bIsRoot);
+    return m_bIsRoot;
 }
 
 // Check if the displayed content is valid.
@@ -1950,15 +1950,15 @@ bool SwContentTree::HasContentChanged()
     bool bRepaint = false;
     bool bInvalidate = false;
 
-    if(!bIsActive && ! bIsConstant)
+    if(!m_bIsActive && ! m_bIsConstant)
     {
         for(ContentTypeId i : o3tl::enumrange<ContentTypeId>())
         {
-            if(aActiveContentArr[i])
-                aActiveContentArr[i]->Invalidate();
+            if(m_aActiveContentArr[i])
+                m_aActiveContentArr[i]->Invalidate();
         }
     }
-    else if(bIsRoot)
+    else if(m_bIsRoot)
     {
         bool bOutline = false;
         SvTreeListEntry* pEntry = First();
@@ -1967,8 +1967,8 @@ bool SwContentTree::HasContentChanged()
         else
         {
             const ContentTypeId nType = static_cast<SwContentType*>(pEntry->GetUserData())->GetType();
-            bOutline = nRootType == ContentTypeId::OUTLINE;
-            SwContentType* pArrType = aActiveContentArr[nType];
+            bOutline = m_nRootType == ContentTypeId::OUTLINE;
+            SwContentType* pArrType = m_aActiveContentArr[nType];
             if(!pArrType)
                 bRepaint = true;
             else
@@ -2004,7 +2004,7 @@ bool SwContentTree::HasContentChanged()
                             pEntry->SetUserData(const_cast<SwContent *>(pCnt));
                             OUString sEntryText = GetEntryText(pEntry);
                             if( sEntryText != pCnt->GetName() &&
-                                !(sEntryText == sSpace && pCnt->GetName().isEmpty()))
+                                !(sEntryText == m_sSpace && pCnt->GetName().isEmpty()))
                                 bRepaint = true;
                         }
                     }
@@ -2041,7 +2041,7 @@ bool SwContentTree::HasContentChanged()
             SwContentType* pTreeType = static_cast<SwContentType*>(pEntry->GetUserData());
             const size_t nTreeCount = pTreeType->GetMemberCount();
             const ContentTypeId nType = pTreeType->GetType();
-            SwContentType* pArrType = aActiveContentArr[nType];
+            SwContentType* pArrType = m_aActiveContentArr[nType];
             if(!pArrType)
                 bRepaint = true;
             else
@@ -2073,7 +2073,7 @@ bool SwContentTree::HasContentChanged()
                             pEntry->SetUserData(const_cast<SwContent *>(pCnt));
                             OUString sEntryText = GetEntryText(pEntry);
                             if( sEntryText != pCnt->GetName() &&
-                                !(sEntryText == sSpace && pCnt->GetName().isEmpty()))
+                                !(sEntryText == m_sSpace && pCnt->GetName().isEmpty()))
                                 bRepaint = true;
                         }
                     }
@@ -2104,7 +2104,7 @@ bool SwContentTree::HasContentChanged()
                             pChild->SetUserData(const_cast<SwContent *>(pCnt));
                             OUString sEntryText = GetEntryText(pChild);
                             if( sEntryText != pCnt->GetName() &&
-                                !(sEntryText == sSpace && pCnt->GetName().isEmpty()))
+                                !(sEntryText == m_sSpace && pCnt->GetName().isEmpty()))
                                 bRemoveChildren = true;
                             pChild = Next(pChild);
                         }
@@ -2160,7 +2160,7 @@ void SwContentTree::FindActiveTypeAndRemoveUserData()
         while(0 != (pParent = GetParent(pEntry)))
             pEntry = pParent;
         if(pEntry->GetUserData() && lcl_IsContentType(pEntry))
-            nLastSelType = static_cast<SwContentType*>(pEntry->GetUserData())->GetType();
+            m_nLastSelType = static_cast<SwContentType*>(pEntry->GetUserData())->GetType();
     }
     pEntry = First();
     while(pEntry)
@@ -2175,15 +2175,15 @@ void SwContentTree::FindActiveTypeAndRemoveUserData()
 
 void SwContentTree::SetHiddenShell(SwWrtShell* pSh)
 {
-    pHiddenShell = pSh;
-    bIsHidden = true;
-    bIsActive = bIsConstant = false;
+    m_pHiddenShell = pSh;
+    m_bIsHidden = true;
+    m_bIsActive = m_bIsConstant = false;
     FindActiveTypeAndRemoveUserData();
     for(ContentTypeId i : o3tl::enumrange<ContentTypeId>())
     {
-        DELETEZ(aHiddenContentArr[i]);
+        DELETEZ(m_aHiddenContentArr[i]);
     }
-    Display(bIsActive);
+    Display(m_bIsActive);
 
     GetParentWindow()->UpdateListBox();
 }
@@ -2192,36 +2192,36 @@ void SwContentTree::SetHiddenShell(SwWrtShell* pSh)
 
 void SwContentTree::SetActiveShell(SwWrtShell* pSh)
 {
-    if(bIsInternalDrag)
-        bDocChgdInDragging = true;
-    bool bClear = pActiveShell != pSh;
-    if(bIsActive && bClear)
+    if(m_bIsInternalDrag)
+        m_bDocChgdInDragging = true;
+    bool bClear = m_pActiveShell != pSh;
+    if(m_bIsActive && bClear)
     {
-        if (pActiveShell)
-            EndListening(*pActiveShell->GetView().GetDocShell());
-        pActiveShell = pSh;
+        if (m_pActiveShell)
+            EndListening(*m_pActiveShell->GetView().GetDocShell());
+        m_pActiveShell = pSh;
         FindActiveTypeAndRemoveUserData();
         Clear();
     }
-    else if(bIsConstant)
+    else if(m_bIsConstant)
     {
-        if (pActiveShell)
-            EndListening(*pActiveShell->GetView().GetDocShell());
-        pActiveShell = pSh;
-        bIsActive = true;
-        bIsConstant = false;
+        if (m_pActiveShell)
+            EndListening(*m_pActiveShell->GetView().GetDocShell());
+        m_pActiveShell = pSh;
+        m_bIsActive = true;
+        m_bIsConstant = false;
         bClear = true;
     }
     // Only if it is the active view, the array will be deleted and
     // the screen filled new.
-    if(bIsActive && bClear)
+    if(m_bIsActive && bClear)
     {
-        if (pActiveShell)
-            StartListening(*pActiveShell->GetView().GetDocShell());
+        if (m_pActiveShell)
+            StartListening(*m_pActiveShell->GetView().GetDocShell());
         FindActiveTypeAndRemoveUserData();
         for(ContentTypeId i : o3tl::enumrange<ContentTypeId>())
         {
-            DELETEZ(aActiveContentArr[i]);
+            DELETEZ(m_aActiveContentArr[i]);
         }
         Display(true);
     }
@@ -2231,16 +2231,16 @@ void SwContentTree::SetActiveShell(SwWrtShell* pSh)
 
 void SwContentTree::SetConstantShell(SwWrtShell* pSh)
 {
-    if (pActiveShell)
-        EndListening(*pActiveShell->GetView().GetDocShell());
-    pActiveShell = pSh;
-    bIsActive       = false;
-    bIsConstant     = true;
-    StartListening(*pActiveShell->GetView().GetDocShell());
+    if (m_pActiveShell)
+        EndListening(*m_pActiveShell->GetView().GetDocShell());
+    m_pActiveShell = pSh;
+    m_bIsActive       = false;
+    m_bIsConstant     = true;
+    StartListening(*m_pActiveShell->GetView().GetDocShell());
     FindActiveTypeAndRemoveUserData();
     for(ContentTypeId i : o3tl::enumrange<ContentTypeId>())
     {
-        DELETEZ(aActiveContentArr[i]);
+        DELETEZ(m_aActiveContentArr[i]);
     }
     Display(true);
 }
@@ -2259,9 +2259,9 @@ void SwContentTree::Notify(SfxBroadcaster & rBC, SfxHint const& rHint)
     SfxViewEventHint const*const pVEHint(
             dynamic_cast<SfxViewEventHint const*>(&rHint));
     SwXTextView* pDyingShell = NULL;
-    if (pActiveShell && pVEHint && pVEHint->GetEventName() == "OnViewClosed")
+    if (m_pActiveShell && pVEHint && pVEHint->GetEventName() == "OnViewClosed")
         pDyingShell = dynamic_cast<SwXTextView*>(pVEHint->GetController().get());
-    if (pDyingShell && pDyingShell->GetView() == &pActiveShell->GetView())
+    if (pDyingShell && pDyingShell->GetView() == &m_pActiveShell->GetView())
     {
         SetActiveShell(0); // our view is dying, clear our pointers to it
     }
@@ -2285,16 +2285,16 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, bool bModifier)
         case FN_ITEM_LEFT:
         case FN_ITEM_RIGHT:
         if( !GetWrtShell()->GetView().GetDocShell()->IsReadOnly() &&
-                (bIsActive ||
-                    (bIsConstant && pActiveShell == GetParentWindow()->GetCreateView()->GetWrtShellPtr())))
+                (m_bIsActive ||
+                    (m_bIsConstant && m_pActiveShell == GetParentWindow()->GetCreateView()->GetWrtShellPtr())))
         {
             SwWrtShell* pShell = GetWrtShell();
-            sal_Int8 nActOutlineLevel = nOutlineLevel;
+            sal_Int8 nActOutlineLevel = m_nOutlineLevel;
             sal_uInt16 nActPos = pShell->GetOutlinePos(nActOutlineLevel);
             SvTreeListEntry* pFirstEntry = FirstSelected();
             if (pFirstEntry && lcl_IsContent(pFirstEntry))
             {
-                if ( (bIsRoot && nRootType == ContentTypeId::OUTLINE) ||
+                if ( (m_bIsRoot && m_nRootType == ContentTypeId::OUTLINE) ||
                     static_cast<SwContent*>(pFirstEntry->GetUserData())->GetParent()->GetType()
                                                 ==  ContentTypeId::OUTLINE)
                 {
@@ -2400,10 +2400,10 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, bool bModifier)
                 pShell->ClearMark();
                 pShell->Pop(false); // Cursor is now back at the current superscription.
                 pShell->EndAllAction();
-                if(aActiveContentArr[ContentTypeId::OUTLINE])
-                    aActiveContentArr[ContentTypeId::OUTLINE]->Invalidate();
+                if(m_aActiveContentArr[ContentTypeId::OUTLINE])
+                    m_aActiveContentArr[ContentTypeId::OUTLINE]->Invalidate();
                 Display(true);
-                if(!bIsRoot)
+                if(!m_bIsRoot)
                 {
                     const sal_uInt16 nCurrPos = pShell->GetOutlinePos(MAXLEVEL);
                     SvTreeListEntry* pFirst = First();
@@ -2424,7 +2424,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, bool bModifier)
 
 void    SwContentTree::ShowTree()
 {
-    aUpdTimer.Start();
+    m_aUpdTimer.Start();
     SvTreeListBox::Show();
 }
 
@@ -2432,7 +2432,7 @@ void    SwContentTree::ShowTree()
 
 void    SwContentTree::HideTree()
 {
-    aUpdTimer.Stop();
+    m_aUpdTimer.Stop();
     SvTreeListBox::Hide();
 }
 
@@ -2446,41 +2446,41 @@ IMPL_LINK_NOARG_TYPED(SwContentTree, TimerUpdate, Timer *, void)
     // No update while drag and drop.
     // Query view because the Navigator is cleared too late.
     SwView* pView = GetParentWindow()->GetCreateView();
-    if( (!HasFocus() || bViewHasChanged) &&
-         !bIsInDrag && !bIsInternalDrag && pView &&
+    if( (!HasFocus() || m_bViewHasChanged) &&
+         !bIsInDrag && !m_bIsInternalDrag && pView &&
          pView->GetWrtShellPtr() && !pView->GetWrtShellPtr()->ActionPend() )
     {
-        bViewHasChanged = false;
-        bIsIdleClear = false;
+        m_bViewHasChanged = false;
+        m_bIsIdleClear = false;
         SwWrtShell* pActShell = pView->GetWrtShellPtr();
-        if( bIsConstant && !lcl_FindShell( pActiveShell ) )
+        if( m_bIsConstant && !lcl_FindShell( m_pActiveShell ) )
         {
             SetActiveShell(pActShell);
             GetParentWindow()->UpdateListBox();
         }
 
-        if(bIsActive && pActShell != GetWrtShell())
+        if(m_bIsActive && pActShell != GetWrtShell())
         {
             SetActiveShell(pActShell);
         }
-        else if( (bIsActive || (bIsConstant && pActShell == GetWrtShell())) &&
+        else if( (m_bIsActive || (m_bIsConstant && pActShell == GetWrtShell())) &&
                     HasContentChanged())
         {
-            if (!bIsActive || m_bActiveDocModified)
+            if (!m_bIsActive || m_bActiveDocModified)
             {   // don't burn cpu and redraw and flicker if not modified
                 FindActiveTypeAndRemoveUserData();
                 Display(true);
             }
         }
     }
-    else if(!pView && bIsActive && !bIsIdleClear)
+    else if(!pView && m_bIsActive && !m_bIsIdleClear)
     {
-        if(pActiveShell)
+        if(m_pActiveShell)
         {
             SetActiveShell(0);
         }
         Clear();
-        bIsIdleClear = true;
+        m_bIsIdleClear = true;
     }
 }
 
@@ -2489,17 +2489,17 @@ DragDropMode SwContentTree::NotifyStartDrag(
                 SvTreeListEntry* pEntry )
 {
     DragDropMode eMode = (DragDropMode)0;
-    if( bIsActive && nRootType == ContentTypeId::OUTLINE &&
+    if( m_bIsActive && m_nRootType == ContentTypeId::OUTLINE &&
         GetModel()->GetAbsPos( pEntry ) > 0
         && !GetWrtShell()->GetView().GetDocShell()->IsReadOnly())
         eMode = GetDragDropMode();
-    else if(!bIsActive && GetWrtShell()->GetView().GetDocShell()->HasName())
+    else if(!m_bIsActive && GetWrtShell()->GetView().GetDocShell()->HasName())
         eMode = DragDropMode::APP_COPY;
 
     sal_Int8 nDragMode;
     FillTransferData( rContainer, nDragMode );
-    bDocChgdInDragging = false;
-    bIsInternalDrag = true;
+    m_bDocChgdInDragging = false;
+    m_bIsInternalDrag = true;
     return eMode;
 }
 // After the drag the current paragraph will be moved  w i t h  the children.
@@ -2507,7 +2507,7 @@ DragDropMode SwContentTree::NotifyStartDrag(
 TriState SwContentTree::NotifyMoving( SvTreeListEntry*  pTarget,
         SvTreeListEntry*  pEntry, SvTreeListEntry*& , sal_uLong& )
 {
-    if(!bDocChgdInDragging)
+    if(!m_bDocChgdInDragging)
     {
         sal_uInt16 nTargetPos = 0;
         sal_uInt16 nSourcePos = static_cast<SwOutlineContent*>(pEntry->GetUserData())->GetPos();
@@ -2515,7 +2515,7 @@ TriState SwContentTree::NotifyMoving( SvTreeListEntry*  pTarget,
             nTargetPos = USHRT_MAX;
         else
             nTargetPos = static_cast<SwOutlineContent*>(pTarget->GetUserData())->GetPos();
-        if( MAXLEVEL > nOutlineLevel && // Not all layers are displayed.
+        if( MAXLEVEL > m_nOutlineLevel && // Not all layers are displayed.
                         nTargetPos != USHRT_MAX)
         {
             SvTreeListEntry* pNext = Next(pTarget);
@@ -2532,7 +2532,7 @@ TriState SwContentTree::NotifyMoving( SvTreeListEntry*  pTarget,
                                     nTargetPos,
                                     true);
 
-        aActiveContentArr[ContentTypeId::OUTLINE]->Invalidate();
+        m_aActiveContentArr[ContentTypeId::OUTLINE]->Invalidate();
         Display(true);
     }
     //TreeListBox will be reloaded from the document
@@ -2544,7 +2544,7 @@ TriState SwContentTree::NotifyMoving( SvTreeListEntry*  pTarget,
 TriState SwContentTree::NotifyCopying( SvTreeListEntry*  pTarget,
         SvTreeListEntry*  pEntry, SvTreeListEntry*& , sal_uLong& )
 {
-    if(!bDocChgdInDragging)
+    if(!m_bDocChgdInDragging)
     {
         sal_uInt16 nTargetPos = 0;
         sal_uInt16 nSourcePos = static_cast<SwOutlineContent*>(pEntry->GetUserData())->GetPos();
@@ -2553,7 +2553,7 @@ TriState SwContentTree::NotifyCopying( SvTreeListEntry*  pTarget,
         else
             nTargetPos = static_cast<SwOutlineContent*>(pTarget->GetUserData())->GetPos();
 
-        if( MAXLEVEL > nOutlineLevel && // Not all layers are displayed.
+        if( MAXLEVEL > m_nOutlineLevel && // Not all layers are displayed.
                         nTargetPos != USHRT_MAX)
         {
             SvTreeListEntry* pNext = Next(pTarget);
@@ -2569,7 +2569,7 @@ TriState SwContentTree::NotifyCopying( SvTreeListEntry*  pTarget,
         GetParentWindow()->MoveOutline( nSourcePos, nTargetPos, false);
 
         //TreeListBox will be reloaded from the document
-        aActiveContentArr[ContentTypeId::OUTLINE]->Invalidate();
+        m_aActiveContentArr[ContentTypeId::OUTLINE]->Invalidate();
         Display(true);
     }
     return TRISTATE_FALSE;
@@ -2603,20 +2603,20 @@ void  SwContentTree::GetFocus()
     if(pActView)
     {
         SwWrtShell* pActShell = pActView->GetWrtShellPtr();
-        if(bIsConstant && !lcl_FindShell(pActiveShell))
+        if(m_bIsConstant && !lcl_FindShell(m_pActiveShell))
         {
             SetActiveShell(pActShell);
         }
 
-        if(bIsActive && pActShell != GetWrtShell())
+        if(m_bIsActive && pActShell != GetWrtShell())
             SetActiveShell(pActShell);
-        else if( (bIsActive || (bIsConstant && pActShell == GetWrtShell())) &&
+        else if( (m_bIsActive || (m_bIsConstant && pActShell == GetWrtShell())) &&
                     HasContentChanged())
         {
             Display(true);
         }
     }
-    else if(bIsActive)
+    else if(m_bIsActive)
         Clear();
     SvTreeListBox::GetFocus();
 }
@@ -2656,12 +2656,12 @@ void  SwContentTree::KeyInput(const KeyEvent& rEvent)
         if(pEntry &&
             lcl_IsContent(pEntry) &&
                 static_cast<SwContent*>(pEntry->GetUserData())->GetParent()->IsDeletable() &&
-                    !pActiveShell->GetView().GetDocShell()->IsReadOnly())
+                    !m_pActiveShell->GetView().GetDocShell()->IsReadOnly())
         {
             EditEntry(pEntry, EditEntryMode::DELETE);
-            bViewHasChanged = true;
+            m_bViewHasChanged = true;
             GetParentWindow()->UpdateListBox();
-            TimerUpdate(&aUpdTimer);
+            TimerUpdate(&m_aUpdTimer);
             GrabFocus();
         }
     }
@@ -2672,17 +2672,17 @@ void  SwContentTree::KeyInput(const KeyEvent& rEvent)
 
         SvTreeListEntry* pEntry = GetCurEntry();
         if( GetChildCount( pEntry ) == 0 )
-            bIsKeySpace = true;
+            m_bIsKeySpace = true;
         Point tempPoint = GetEntryPosition( pEntry );//Change from "GetEntryPos" to "GetEntryPosition" for acc migration
-        oldRectangle = GetFocusRect( pEntry,tempPoint.Y() );
+        m_aOldRectangle = GetFocusRect( pEntry,tempPoint.Y() );
 
         if(pEntry)
         {
-            if(bIsActive || bIsConstant)
+            if(m_bIsActive || m_bIsConstant)
             {
-                if(bIsConstant)
+                if(m_bIsConstant)
                 {
-                    pActiveShell->GetView().GetViewFrame()->GetWindow().ToTop();
+                    m_pActiveShell->GetView().GetViewFrame()->GetWindow().ToTop();
                 }
 
                 SwContent* pCnt = static_cast<SwContent*>(pEntry->GetUserData());
@@ -2691,12 +2691,12 @@ void  SwContentTree::KeyInput(const KeyEvent& rEvent)
                 {
                     case ContentTypeId::DRAWOBJECT:
                     {
-                        SdrView* pDrawView = pActiveShell->GetDrawView();
+                        SdrView* pDrawView = m_pActiveShell->GetDrawView();
                         if (pDrawView)
                         {
                             pDrawView->SdrEndTextEdit();//Change from "EndTextEdit" to "SdrEndTextEdit" for acc migration
 
-                            SwDrawModel* pDrawModel = pActiveShell->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel();
+                            SwDrawModel* pDrawModel = m_pActiveShell->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel();
                             SdrPage* pPage = pDrawModel->GetPage(0);
                             const size_t nCount = pPage->GetObjCount();
                             bool hasObjectMarked = false;
@@ -2757,7 +2757,7 @@ void  SwContentTree::KeyInput(const KeyEvent& rEvent)
                             if ( !hasObjectMarked )
                             {
                                 SwEditWin& pEditWindow =
-                                    pActiveShell->GetView().GetEditWin();
+                                    m_pActiveShell->GetView().GetEditWin();
                                 vcl::KeyCode tempKeycode( KEY_ESCAPE );
                                 KeyEvent rKEvt( 0 , tempKeycode );
                                 static_cast<vcl::Window*>(&pEditWindow)->KeyInput( rKEvt );
@@ -2769,7 +2769,7 @@ void  SwContentTree::KeyInput(const KeyEvent& rEvent)
                     default: break;
                 }
 
-                bViewHasChanged = true;
+                m_bViewHasChanged = true;
             }
         }
 
@@ -2843,7 +2843,7 @@ void  SwContentTree::RequestHelp( const HelpEvent& rHEvt )
                 {
                     if(!sEntry.isEmpty())
                         sEntry += ", ";
-                    sEntry += sInvisible;
+                    sEntry += m_sInvisible;
                     bRet = true;
                 }
             }
@@ -2912,7 +2912,7 @@ void    SwContentTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
         case 109:
         case 110:
             nSelectedPopupEntry -= 100;
-            if(nOutlineLevel != nSelectedPopupEntry )
+            if(m_nOutlineLevel != nSelectedPopupEntry )
                 SetOutlineLevel((sal_Int8)nSelectedPopupEntry);
         break;
         case 201:
@@ -2935,7 +2935,7 @@ void    SwContentTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
         {
             const SwTOXBase* pBase = static_cast<SwTOXBaseContent*>(pFirst->GetUserData())
                                                                 ->GetTOXBase();
-            pActiveShell->SetTOXBaseReadonly(*pBase, !SwEditShell::IsTOXBaseReadonly(*pBase));
+            m_pActiveShell->SetTOXBaseReadonly(*pBase, !SwEditShell::IsTOXBaseReadonly(*pBase));
         }
         break;
         case 4:
@@ -2947,15 +2947,15 @@ void    SwContentTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
             EditEntry(pFirst, EditEntryMode::RENAME);
         break;
         case 600:
-            pActiveShell->GetView().GetPostItMgr()->Show();
+            m_pActiveShell->GetView().GetPostItMgr()->Show();
             break;
         case 601:
-            pActiveShell->GetView().GetPostItMgr()->Hide();
+            m_pActiveShell->GetView().GetPostItMgr()->Hide();
             break;
         case 602:
             {
-                pActiveShell->GetView().GetPostItMgr()->SetActiveSidebarWin(0);
-                pActiveShell->GetView().GetPostItMgr()->Delete();
+                m_pActiveShell->GetView().GetPostItMgr()->SetActiveSidebarWin(0);
+                m_pActiveShell->GetView().GetPostItMgr()->Delete();
                 break;
             }
         //Display
@@ -2976,8 +2976,8 @@ void    SwContentTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
             }
             if(nSelectedPopupEntry)
             {
-                bViewHasChanged = bIsActive = nSelectedPopupEntry == 1;
-                bIsConstant = false;
+                m_bViewHasChanged = m_bIsActive = nSelectedPopupEntry == 1;
+                m_bIsConstant = false;
                 Display(nSelectedPopupEntry == 1);
             }
         }
@@ -2987,27 +2987,27 @@ void    SwContentTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
 
 void SwContentTree::SetOutlineLevel(sal_uInt8 nSet)
 {
-    nOutlineLevel = nSet;
-    pConfig->SetOutlineLevel( nOutlineLevel );
-    SwContentType** ppContentT = bIsActive ?
-                    &aActiveContentArr[ContentTypeId::OUTLINE] :
-                        &aHiddenContentArr[ContentTypeId::OUTLINE];
+    m_nOutlineLevel = nSet;
+    m_pConfig->SetOutlineLevel( m_nOutlineLevel );
+    SwContentType** ppContentT = m_bIsActive ?
+                    &m_aActiveContentArr[ContentTypeId::OUTLINE] :
+                        &m_aHiddenContentArr[ContentTypeId::OUTLINE];
     if(*ppContentT)
     {
-        (*ppContentT)->SetOutlineLevel(nOutlineLevel);
+        (*ppContentT)->SetOutlineLevel(m_nOutlineLevel);
         (*ppContentT)->Init();
     }
-    Display(bIsActive);
+    Display(m_bIsActive);
 }
 
 // Mode Change: Show dropped Doc
 
 void SwContentTree::ShowHiddenShell()
 {
-    if(pHiddenShell)
+    if(m_pHiddenShell)
     {
-        bIsConstant = false;
-        bIsActive = false;
+        m_bIsConstant = false;
+        m_bIsActive = false;
         Display(false);
     }
 }
@@ -3016,8 +3016,8 @@ void SwContentTree::ShowHiddenShell()
 
 void SwContentTree::ShowActualView()
 {
-    bIsActive = true;
-    bIsConstant = false;
+    m_bIsActive = true;
+    m_bIsConstant = false;
     Display(true);
     GetParentWindow()->UpdateListBox();
 }
@@ -3033,13 +3033,13 @@ bool SwContentTree::Select( SvTreeListEntry* pEntry, bool bSelect )
     {
         pParentEntry = GetParent(pParentEntry);
     }
-    if (!bIsLastReadOnly)
+    if (!m_bIsLastReadOnly)
     {
         if (!IsVisible())
             bEnable = true;
         else if (pParentEntry)
         {
-            if ((bIsRoot && nRootType == ContentTypeId::OUTLINE) ||
+            if ((m_bIsRoot && m_nRootType == ContentTypeId::OUTLINE) ||
                 (lcl_IsContent(pEntry) &&
                     static_cast<SwContentType*>(pParentEntry->GetUserData())->GetType() == ContentTypeId::OUTLINE))
             {
@@ -3058,9 +3058,9 @@ bool SwContentTree::Select( SvTreeListEntry* pEntry, bool bSelect )
 
 void SwContentTree::SetRootType(ContentTypeId nType)
 {
-    nRootType = nType;
-    bIsRoot = true;
-    pConfig->SetRootType( nRootType );
+    m_nRootType = nType;
+    m_bIsRoot = true;
+    m_pConfig->SetRootType( m_nRootType );
 }
 
 OUString SwContentType::RemoveNewline(const OUString& rEntry)
@@ -3089,12 +3089,12 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, EditEntryMode nMode)
         case ContentTypeId::TABLE     :
             if(nMode == EditEntryMode::UNPROTECT_TABLE)
             {
-                pActiveShell->GetView().GetDocShell()->
+                m_pActiveShell->GetView().GetDocShell()->
                         GetDoc()->UnProtectCells( pCnt->GetName());
             }
             else if(nMode == EditEntryMode::DELETE)
             {
-                pActiveShell->StartAction();
+                m_pActiveShell->StartAction();
                 OUString sTable = SW_RES(STR_TABLE_NAME);
                 SwRewriter aRewriterTableName;
                 aRewriterTableName.AddRule(UndoArg1, SW_RES(STR_START_QUOTE));
@@ -3104,15 +3104,15 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, EditEntryMode nMode)
 
                 SwRewriter aRewriter;
                 aRewriter.AddRule(UndoArg1, sTable);
-                pActiveShell->StartUndo(UNDO_DELETE, &aRewriter);
-                pActiveShell->GetView().GetViewFrame()->GetDispatcher()->Execute(FN_TABLE_SELECT_ALL);
-                pActiveShell->DeleteRow();
-                pActiveShell->EndUndo();
-                pActiveShell->EndAction();
+                m_pActiveShell->StartUndo(UNDO_DELETE, &aRewriter);
+                m_pActiveShell->GetView().GetViewFrame()->GetDispatcher()->Execute(FN_TABLE_SELECT_ALL);
+                m_pActiveShell->DeleteRow();
+                m_pActiveShell->EndUndo();
+                m_pActiveShell->EndAction();
             }
             else if(nMode == EditEntryMode::RENAME)
             {
-                uno::Reference< frame::XModel >  xModel = pActiveShell->GetView().GetDocShell()->GetBaseModel();
+                uno::Reference< frame::XModel >  xModel = m_pActiveShell->GetView().GetDocShell()->GetBaseModel();
                 uno::Reference< text::XTextTablesSupplier >  xTables(xModel, uno::UNO_QUERY);
                 xNameAccess = xTables->getTextTables();
             }
@@ -3123,11 +3123,11 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, EditEntryMode nMode)
         case ContentTypeId::GRAPHIC   :
             if(nMode == EditEntryMode::DELETE)
             {
-                pActiveShell->DelRight();
+                m_pActiveShell->DelRight();
             }
             else if(nMode == EditEntryMode::RENAME)
             {
-                uno::Reference< frame::XModel >  xModel = pActiveShell->GetView().GetDocShell()->GetBaseModel();
+                uno::Reference< frame::XModel >  xModel = m_pActiveShell->GetView().GetDocShell()->GetBaseModel();
                 uno::Reference< text::XTextGraphicObjectsSupplier >  xGraphics(xModel, uno::UNO_QUERY);
                 xNameAccess = xGraphics->getGraphicObjects();
                 uno::Reference< text::XTextFramesSupplier >  xFrms(xModel, uno::UNO_QUERY);
@@ -3143,11 +3143,11 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, EditEntryMode nMode)
         case ContentTypeId::OLE       :
             if(nMode == EditEntryMode::DELETE)
             {
-                pActiveShell->DelRight();
+                m_pActiveShell->DelRight();
             }
             else if(nMode == EditEntryMode::RENAME)
             {
-                uno::Reference< frame::XModel >  xModel = pActiveShell->GetView().GetDocShell()->GetBaseModel();
+                uno::Reference< frame::XModel >  xModel = m_pActiveShell->GetView().GetDocShell()->GetBaseModel();
                 uno::Reference< text::XTextFramesSupplier >  xFrms(xModel, uno::UNO_QUERY);
                 uno::Reference< text::XTextEmbeddedObjectsSupplier >  xObjs(xModel, uno::UNO_QUERY);
                 if(ContentTypeId::FRAME == nType)
@@ -3169,12 +3169,12 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, EditEntryMode nMode)
         case ContentTypeId::BOOKMARK  :
             if(nMode == EditEntryMode::DELETE)
             {
-                IDocumentMarkAccess* const pMarkAccess = pActiveShell->getIDocumentMarkAccess();
+                IDocumentMarkAccess* const pMarkAccess = m_pActiveShell->getIDocumentMarkAccess();
                 pMarkAccess->deleteMark( pMarkAccess->findMark(pCnt->GetName()) );
             }
             else if(nMode == EditEntryMode::RENAME)
             {
-                uno::Reference< frame::XModel >  xModel = pActiveShell->GetView().GetDocShell()->GetBaseModel();
+                uno::Reference< frame::XModel >  xModel = m_pActiveShell->GetView().GetDocShell()->GetBaseModel();
                 uno::Reference< text::XBookmarksSupplier >  xBkms(xModel, uno::UNO_QUERY);
                 xNameAccess = xBkms->getBookmarks();
             }
@@ -3185,7 +3185,7 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, EditEntryMode nMode)
         case ContentTypeId::REGION    :
             if(nMode == EditEntryMode::RENAME)
             {
-                uno::Reference< frame::XModel >  xModel = pActiveShell->GetView().GetDocShell()->GetBaseModel();
+                uno::Reference< frame::XModel >  xModel = m_pActiveShell->GetView().GetDocShell()->GetBaseModel();
                 uno::Reference< text::XTextSectionsSupplier >  xSects(xModel, uno::UNO_QUERY);
                 xNameAccess = xSects->getTextSections();
             }
@@ -3201,13 +3201,13 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, EditEntryMode nMode)
         break;
 
         case ContentTypeId::POSTIT:
-            pActiveShell->GetView().GetPostItMgr()->AssureStdModeAtShell();
+            m_pActiveShell->GetView().GetPostItMgr()->AssureStdModeAtShell();
             if(nMode == EditEntryMode::DELETE)
             {
                 if (static_cast<SwPostItContent*>(pCnt)->IsPostIt())
                 {
-                    pActiveShell->GetView().GetPostItMgr()->SetActiveSidebarWin(0);
-                    pActiveShell->DelRight();
+                    m_pActiveShell->GetView().GetPostItMgr()->SetActiveSidebarWin(0);
+                    m_pActiveShell->DelRight();
                 }
             }
             else
@@ -3227,7 +3227,7 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, EditEntryMode nMode)
                     if(pBase)
                     {
                         SwPtrItem aPtrItem( FN_INSERT_MULTI_TOX, const_cast<SwTOXBase *>(pBase));
-                        pActiveShell->GetView().GetViewFrame()->
+                        m_pActiveShell->GetView().GetViewFrame()->
                             GetDispatcher()->Execute(FN_INSERT_MULTI_TOX,
                                             SfxCallMode::ASYNCHRON, &aPtrItem, 0L);
 
@@ -3237,13 +3237,13 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, EditEntryMode nMode)
                 case EditEntryMode::DELETE:
                 {
                     if( pBase )
-                        pActiveShell->DeleteTOX(*pBase, EditEntryMode::DELETE == nMode);
+                        m_pActiveShell->DeleteTOX(*pBase, EditEntryMode::DELETE == nMode);
                 }
                 break;
                 case EditEntryMode::UPD_IDX:
                 case EditEntryMode::RENAME:
                 {
-                    Reference< frame::XModel >  xModel = pActiveShell->GetView().GetDocShell()->GetBaseModel();
+                    Reference< frame::XModel >  xModel = m_pActiveShell->GetView().GetDocShell()->GetBaseModel();
                     Reference< XDocumentIndexesSupplier >  xIndexes(xModel, UNO_QUERY);
                     Reference< XIndexAccess> xIdxAcc(xIndexes->getDocumentIndexes());
                     Reference< XNameAccess >xLocalNameAccess(xIdxAcc, UNO_QUERY);
@@ -3269,7 +3269,7 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, EditEntryMode nMode)
         default: break;
     }
     if(nSlot)
-        pActiveShell->GetView().GetViewFrame()->
+        m_pActiveShell->GetView().GetViewFrame()->
                     GetDispatcher()->Execute(nSlot, SfxCallMode::ASYNCHRON);
     else if(xNameAccess.is())
     {
@@ -3301,80 +3301,80 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, EditEntryMode nMode)
 
 void SwContentTree::GotoContent(SwContent* pCnt)
 {
-    pActiveShell->EnterStdMode();
+    m_pActiveShell->EnterStdMode();
 
     bool bSel = false;
     switch(pCnt->GetParent()->GetType())
     {
         case ContentTypeId::OUTLINE   :
         {
-            pActiveShell->GotoOutline(static_cast<SwOutlineContent*>(pCnt)->GetPos());
+            m_pActiveShell->GotoOutline(static_cast<SwOutlineContent*>(pCnt)->GetPos());
         }
         break;
         case ContentTypeId::TABLE     :
         {
-            pActiveShell->GotoTable(pCnt->GetName());
+            m_pActiveShell->GotoTable(pCnt->GetName());
         }
         break;
         case ContentTypeId::FRAME     :
         case ContentTypeId::GRAPHIC   :
         case ContentTypeId::OLE       :
         {
-            if(pActiveShell->GotoFly(pCnt->GetName()))
+            if(m_pActiveShell->GotoFly(pCnt->GetName()))
                 bSel = true;
         }
         break;
         case ContentTypeId::BOOKMARK:
         {
-            pActiveShell->GotoMark(pCnt->GetName());
+            m_pActiveShell->GotoMark(pCnt->GetName());
         }
         break;
         case ContentTypeId::REGION    :
         {
-            pActiveShell->GotoRegion(pCnt->GetName());
+            m_pActiveShell->GotoRegion(pCnt->GetName());
         }
         break;
         case ContentTypeId::URLFIELD:
         {
-            if(pActiveShell->GotoINetAttr(
+            if(m_pActiveShell->GotoINetAttr(
                             *static_cast<SwURLFieldContent*>(pCnt)->GetINetAttr() ))
             {
-                pActiveShell->Right( CRSR_SKIP_CHARS, true, 1, false);
-                pActiveShell->SwCrsrShell::SelectTextAttr( RES_TXTATR_INETFMT, true );
+                m_pActiveShell->Right( CRSR_SKIP_CHARS, true, 1, false);
+                m_pActiveShell->SwCrsrShell::SelectTextAttr( RES_TXTATR_INETFMT, true );
             }
 
         }
         break;
         case ContentTypeId::REFERENCE:
         {
-            pActiveShell->GotoRefMark(pCnt->GetName());
+            m_pActiveShell->GotoRefMark(pCnt->GetName());
         }
         break;
         case ContentTypeId::INDEX:
         {
             const OUString sName(pCnt->GetName());
-            if (!pActiveShell->GotoNextTOXBase(&sName))
-                pActiveShell->GotoPrevTOXBase(&sName);
+            if (!m_pActiveShell->GotoNextTOXBase(&sName))
+                m_pActiveShell->GotoPrevTOXBase(&sName);
         }
         break;
         case ContentTypeId::POSTIT:
-            pActiveShell->GetView().GetPostItMgr()->AssureStdModeAtShell();
+            m_pActiveShell->GetView().GetPostItMgr()->AssureStdModeAtShell();
             if (static_cast<SwPostItContent*>(pCnt)->IsPostIt())
-                pActiveShell->GotoFormatField(*static_cast<SwPostItContent*>(pCnt)->GetPostIt());
+                m_pActiveShell->GotoFormatField(*static_cast<SwPostItContent*>(pCnt)->GetPostIt());
             else
-                pActiveShell->GetView().GetDocShell()->GetWrtShell()->GotoRedline(
-                        pActiveShell->GetView().GetDocShell()->GetWrtShell()->FindRedlineOfData(static_cast<SwPostItContent*>(pCnt)->GetRedline()->GetRedlineData()));
+                m_pActiveShell->GetView().GetDocShell()->GetWrtShell()->GotoRedline(
+                        m_pActiveShell->GetView().GetDocShell()->GetWrtShell()->FindRedlineOfData(static_cast<SwPostItContent*>(pCnt)->GetRedline()->GetRedlineData()));
 
         break;
         case ContentTypeId::DRAWOBJECT:
         {
-            SwPosition aPos = *pActiveShell->GetCrsr()->GetPoint();
-            SdrView* pDrawView = pActiveShell->GetDrawView();
+            SwPosition aPos = *m_pActiveShell->GetCrsr()->GetPoint();
+            SdrView* pDrawView = m_pActiveShell->GetDrawView();
             if (pDrawView)
             {
                 pDrawView->SdrEndTextEdit();
                 pDrawView->UnmarkAll();
-                SwDrawModel* _pModel = pActiveShell->getIDocumentDrawModelAccess().GetDrawModel();
+                SwDrawModel* _pModel = m_pActiveShell->getIDocumentDrawModelAccess().GetDrawModel();
                 SdrPage* pPage = _pModel->GetPage(0);
                 const size_t nCount = pPage->GetObjCount();
                 for( size_t i=0; i<nCount; ++i )
@@ -3390,7 +3390,7 @@ void SwContentTree::GotoContent(SwContent* pCnt)
                         }
                     }
                 }
-                pActiveShell->GetNavigationMgr().addEntry(aPos);
+                m_pActiveShell->GetNavigationMgr().addEntry(aPos);
             }
         }
         break;
@@ -3398,10 +3398,10 @@ void SwContentTree::GotoContent(SwContent* pCnt)
     }
     if(bSel)
     {
-        pActiveShell->HideCrsr();
-        pActiveShell->EnterSelFrmMode();
+        m_pActiveShell->HideCrsr();
+        m_pActiveShell->EnterSelFrmMode();
     }
-    SwView& rView = pActiveShell->GetView();
+    SwView& rView = m_pActiveShell->GetView();
     rView.StopShellTimer();
     rView.GetPostItMgr()->SetActiveSidebarWin(0);
     rView.GetEditWin().GrabFocus();
@@ -3514,7 +3514,7 @@ void SwContentTree::DataChanged(const DataChangedEvent& rDCEvt)
     {
         FindActiveTypeAndRemoveUserData();
 
-        bIsImageListInitialized = false;
+        m_bIsImageListInitialized = false;
         Display(true);
     }
     SvTreeListBox::DataChanged( rDCEvt );