sw: prefix members of SwNavigationConfig, SwNumRulesWithName and SwSrcView

See tdf#94879 for motivation.

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

6 files changed, 131 insertions, 131 deletions

diff --git a/sw/source/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx
index 51fd9127859b..70d01d01d746 100644
--- a/sw/source/uibase/config/uinums.cxx
+++ b/sw/source/uibase/config/uinums.cxx
@@ -111,9 +111,9 @@ SwNumRulesWithName::SwNumRulesWithName( const SwNumRule &rCopy,
     {
         const SwNumFormat* pFormat = rCopy.GetNumFormat( n );
         if( pFormat )
-            aFormats[ n ].reset(new SwNumFormatGlobal( *pFormat ));
+            m_aFormats[ n ].reset(new SwNumFormatGlobal( *pFormat ));
         else
-            aFormats[ n ].reset();
+            m_aFormats[ n ].reset();
     }
 }
 
@@ -133,11 +133,11 @@ SwNumRulesWithName& SwNumRulesWithName::operator=(const SwNumRulesWithName &rCop
         maName = rCopy.maName;
         for( int n = 0; n < MAXLEVEL; ++n )
         {
-            SwNumFormatGlobal* pFormat = rCopy.aFormats[ n ].get();
+            SwNumFormatGlobal* pFormat = rCopy.m_aFormats[ n ].get();
             if( pFormat )
-                aFormats[ n ].reset(new SwNumFormatGlobal( *pFormat ));
+                m_aFormats[ n ].reset(new SwNumFormatGlobal( *pFormat ));
             else
-                aFormats[ n ].reset();
+                m_aFormats[ n ].reset();
         }
     }
     return *this;
@@ -150,7 +150,7 @@ void SwNumRulesWithName::ResetNumRule(SwWrtShell& rSh, SwNumRule& rNumRule) cons
     rNumRule.SetAutoRule( false );
     for (sal_uInt16 n = 0; n < MAXLEVEL; ++n)
     {
-        SwNumFormatGlobal* pFormat = aFormats[ n ].get();
+        SwNumFormatGlobal* pFormat = m_aFormats[ n ].get();
         if (!pFormat)
             continue;
         rNumRule.Set(n, pFormat->MakeNumFormat(rSh));
@@ -160,21 +160,21 @@ void SwNumRulesWithName::ResetNumRule(SwWrtShell& rSh, SwNumRule& rNumRule) cons
 void SwNumRulesWithName::GetNumFormat(
     size_t const nIndex, SwNumFormat const*& rpNumFormat, OUString const*& rpName) const
 {
-    rpNumFormat = (aFormats[nIndex]) ? &aFormats[nIndex]->aFormat : nullptr;
-    rpName = (aFormats[nIndex]) ? &aFormats[nIndex]->sCharFormatName : nullptr;
+    rpNumFormat = (m_aFormats[nIndex]) ? &m_aFormats[nIndex]->m_aFormat : nullptr;
+    rpName = (m_aFormats[nIndex]) ? &m_aFormats[nIndex]->m_sCharFormatName : nullptr;
 }
 
 void SwNumRulesWithName::SetNumFormat(
         size_t const nIndex, SwNumFormat const& rNumFormat, OUString const& rName)
 {
-    aFormats[nIndex].reset( new SwNumFormatGlobal(rNumFormat) );
-    aFormats[nIndex]->sCharFormatName = rName;
-    aFormats[nIndex]->nCharPoolId = USHRT_MAX;
-    aFormats[nIndex]->m_Items.clear();
+    m_aFormats[nIndex].reset( new SwNumFormatGlobal(rNumFormat) );
+    m_aFormats[nIndex]->m_sCharFormatName = rName;
+    m_aFormats[nIndex]->m_nCharPoolId = USHRT_MAX;
+    m_aFormats[nIndex]->m_Items.clear();
 }
 
 SwNumRulesWithName::SwNumFormatGlobal::SwNumFormatGlobal( const SwNumFormat& rFormat )
-    : aFormat( rFormat ), nCharPoolId( USHRT_MAX )
+    : m_aFormat( rFormat ), m_nCharPoolId( USHRT_MAX )
 {
     // relative gaps?????
 
@@ -182,8 +182,8 @@ SwNumRulesWithName::SwNumFormatGlobal::SwNumFormatGlobal( const SwNumFormat& rFo
     if( !pFormat )
         return;
 
-    sCharFormatName = pFormat->GetName();
-    nCharPoolId = pFormat->GetPoolFormatId();
+    m_sCharFormatName = pFormat->GetName();
+    m_nCharPoolId = pFormat->GetPoolFormatId();
     if( pFormat->GetAttrSet().Count() )
     {
         SfxItemIter aIter( pFormat->GetAttrSet() );
@@ -195,14 +195,14 @@ SwNumRulesWithName::SwNumFormatGlobal::SwNumFormatGlobal( const SwNumFormat& rFo
         } while (pCurr);
     }
 
-    aFormat.SetCharFormat( nullptr );
+    m_aFormat.SetCharFormat( nullptr );
 }
 
 SwNumRulesWithName::SwNumFormatGlobal::SwNumFormatGlobal( const SwNumFormatGlobal& rFormat )
     :
-    aFormat( rFormat.aFormat ),
-    sCharFormatName( rFormat.sCharFormatName ),
-    nCharPoolId( rFormat.nCharPoolId )
+    m_aFormat( rFormat.m_aFormat ),
+    m_sCharFormatName( rFormat.m_sCharFormatName ),
+    m_nCharPoolId( rFormat.m_nCharPoolId )
 {
     for (size_t n = rFormat.m_Items.size(); n; )
     {
@@ -217,14 +217,14 @@ SwNumRulesWithName::SwNumFormatGlobal::~SwNumFormatGlobal()
 SwNumFormat SwNumRulesWithName::SwNumFormatGlobal::MakeNumFormat(SwWrtShell& rSh) const
 {
     SwCharFormat* pFormat = nullptr;
-    if( !sCharFormatName.isEmpty() )
+    if( !m_sCharFormatName.isEmpty() )
     {
         // at first, look for the name
         sal_uInt16 nArrLen = rSh.GetCharFormatCount();
         for( sal_uInt16 i = 1; i < nArrLen; ++i )
         {
             pFormat = &rSh.GetCharFormat( i );
-            if (pFormat->GetName()==sCharFormatName)
+            if (pFormat->GetName()==m_sCharFormatName)
                 // exists, so leave attributes as they are!
                 break;
             pFormat = nullptr;
@@ -232,13 +232,13 @@ SwNumFormat SwNumRulesWithName::SwNumFormatGlobal::MakeNumFormat(SwWrtShell& rSh
 
         if( !pFormat )
         {
-            if( IsPoolUserFormat( nCharPoolId ) )
+            if( IsPoolUserFormat( m_nCharPoolId ) )
             {
-                pFormat = rSh.MakeCharFormat( sCharFormatName );
+                pFormat = rSh.MakeCharFormat( m_sCharFormatName );
                 pFormat->SetAuto(false);
             }
             else
-                pFormat = rSh.GetCharFormatFromPool( nCharPoolId );
+                pFormat = rSh.GetCharFormatFromPool( m_nCharPoolId );
 
             if( !pFormat->HasWriterListeners() )       // set attributes
             {
@@ -249,10 +249,10 @@ SwNumFormat SwNumRulesWithName::SwNumFormatGlobal::MakeNumFormat(SwWrtShell& rSh
             }
         }
     }
-    const_cast<SwNumFormat&>(aFormat).SetCharFormat(pFormat);
-    SwNumFormat aNew = aFormat;
+    const_cast<SwNumFormat&>(m_aFormat).SetCharFormat(pFormat);
+    SwNumFormat aNew = m_aFormat;
     if (pFormat)
-        const_cast<SwNumFormat&>(aFormat).SetCharFormat(nullptr);
+        const_cast<SwNumFormat&>(m_aFormat).SetCharFormat(nullptr);
     return aNew;
 }
 
diff --git a/sw/source/uibase/inc/navicfg.hxx b/sw/source/uibase/inc/navicfg.hxx
index 43bf52b3d7ed..07c167de804b 100644
--- a/sw/source/uibase/inc/navicfg.hxx
+++ b/sw/source/uibase/inc/navicfg.hxx
@@ -26,13 +26,13 @@ enum class ContentTypeId;
 
 class SwNavigationConfig final : public utl::ConfigItem
 {
-    ContentTypeId  nRootType;      //RootType
-    sal_Int32      nSelectedPos;   //SelectedPosition
-    sal_Int32      nOutlineLevel;  //OutlineLevel
-    RegionMode     nRegionMode;    //InsertMode
-    sal_Int32      nActiveBlock;   //ActiveBlock//Expand/CollapsState
-    bool           bIsSmall;       //ShowListBox
-    bool           bIsGlobalActive; //GlobalDocMode// global view for GlobalDoc valid?
+    ContentTypeId  m_nRootType;      //RootType
+    sal_Int32      m_nSelectedPos;   //SelectedPosition
+    sal_Int32      m_nOutlineLevel;  //OutlineLevel
+    RegionMode     m_nRegionMode;    //InsertMode
+    sal_Int32      m_nActiveBlock;   //ActiveBlock//Expand/CollapsState
+    bool           m_bIsSmall;       //ShowListBox
+    bool           m_bIsGlobalActive; //GlobalDocMode// global view for GlobalDoc valid?
 
     static css::uno::Sequence<OUString> GetPropertyNames();
 
@@ -44,57 +44,57 @@ public:
 
     virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
-    ContentTypeId GetRootType()const {return nRootType;}
+    ContentTypeId GetRootType()const {return m_nRootType;}
     void        SetRootType(ContentTypeId nSet){
-                        if(nRootType != nSet)
+                        if(m_nRootType != nSet)
                         {
                             SetModified();
-                            nRootType = nSet;
+                            m_nRootType = nSet;
                         }
                     }
 
-    sal_Int32   GetOutlineLevel()const {return nOutlineLevel;}
+    sal_Int32   GetOutlineLevel()const {return m_nOutlineLevel;}
     void        SetOutlineLevel(sal_Int32 nSet){
-                        if(nOutlineLevel != nSet)
+                        if(m_nOutlineLevel != nSet)
                         {
                             SetModified();
-                            nOutlineLevel = nSet;
+                            m_nOutlineLevel = nSet;
                         }
                     }
 
-    RegionMode  GetRegionMode()const {return nRegionMode;}
+    RegionMode  GetRegionMode()const {return m_nRegionMode;}
     void        SetRegionMode(RegionMode nSet){
-                    if(nRegionMode != nSet)
+                    if(m_nRegionMode != nSet)
                     {
                         SetModified();
-                        nRegionMode = nSet;
+                        m_nRegionMode = nSet;
                     }
                 }
 
-    sal_Int32   GetActiveBlock()const {return nActiveBlock;}
+    sal_Int32   GetActiveBlock()const {return m_nActiveBlock;}
     void        SetActiveBlock(sal_Int32 nSet){
-                        if(nActiveBlock != nSet)
+                        if(m_nActiveBlock != nSet)
                         {
                             SetModified();
-                            nActiveBlock = nSet;
+                            m_nActiveBlock = nSet;
                         }
                     }
 
-    bool    IsSmall() const {return bIsSmall;}
+    bool    IsSmall() const {return m_bIsSmall;}
     void        SetSmall(bool bSet){
-                        if(bIsSmall != bSet)
+                        if(m_bIsSmall != bSet)
                         {
                             SetModified();
-                            bIsSmall = bSet;
+                            m_bIsSmall = bSet;
                         }
                     }
 
-    bool    IsGlobalActive() const {return bIsGlobalActive;}
+    bool    IsGlobalActive() const {return m_bIsGlobalActive;}
     void        SetGlobalActive(bool bSet){
-                        if(bIsGlobalActive != bSet)
+                        if(m_bIsGlobalActive != bSet)
                         {
                             SetModified();
-                            bIsGlobalActive = bSet;
+                            m_bIsGlobalActive = bSet;
                         }
                     }
 };
diff --git a/sw/source/uibase/inc/srcview.hxx b/sw/source/uibase/inc/srcview.hxx
index f58712b57e59..caaecad67d6d 100644
--- a/sw/source/uibase/inc/srcview.hxx
+++ b/sw/source/uibase/inc/srcview.hxx
@@ -32,12 +32,12 @@ class SfxMedium;
 
 class SwSrcView final : public SfxViewShell
 {
-    VclPtr<SwSrcEditWindow> aEditWin;
+    VclPtr<SwSrcEditWindow> m_aEditWin;
 
-    std::unique_ptr<SvxSearchItem> pSearchItem;
+    std::unique_ptr<SvxSearchItem> m_pSearchItem;
 
-    bool                bSourceSaved    :1;
-    rtl_TextEncoding    eLoadEncoding;
+    bool                m_bSourceSaved    :1;
+    rtl_TextEncoding    m_eLoadEncoding;
     void                Init();
 
     // for read-only switching
@@ -64,7 +64,7 @@ public:
     void                SaveContent(const OUString& rTmpFile);
     void                SaveContentTo(SfxMedium& rMed);
 
-    bool                IsModified() const {return aEditWin->IsModified();}
+    bool                IsModified() const {return m_aEditWin->IsModified();}
 
     void            Execute(SfxRequest&);
     void            GetState(SfxItemSet&);
@@ -79,7 +79,7 @@ public:
 
     sal_Int32       PrintSource( OutputDevice *pOutDev, sal_Int32 nPage, bool bCalcNumPagesOnly );
 
-    bool            HasSourceSaved() const {return bSourceSaved;}
+    bool            HasSourceSaved() const {return m_bSourceSaved;}
 
 };
 
diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx
index 37e36feae634..54dd1c2a0f4b 100644
--- a/sw/source/uibase/inc/uinums.hxx
+++ b/sw/source/uibase/inc/uinums.hxx
@@ -41,9 +41,9 @@ class SW_DLLPUBLIC SwNumRulesWithName final
     class SAL_DLLPRIVATE SwNumFormatGlobal
     {
         friend class SwNumRulesWithName;
-        SwNumFormat aFormat;
-        OUString sCharFormatName;
-        sal_uInt16 nCharPoolId;
+        SwNumFormat m_aFormat;
+        OUString m_sCharFormatName;
+        sal_uInt16 m_nCharPoolId;
         std::vector<std::unique_ptr<SfxPoolItem>> m_Items;
 
         SwNumFormatGlobal& operator=( const SwNumFormatGlobal& ) = delete;
@@ -56,7 +56,7 @@ class SW_DLLPUBLIC SwNumRulesWithName final
         SwNumFormat MakeNumFormat(SwWrtShell& rSh) const;
     };
 
-    std::unique_ptr<SwNumFormatGlobal> aFormats[ MAXLEVEL ];
+    std::unique_ptr<SwNumFormatGlobal> m_aFormats[ MAXLEVEL ];
 
     friend class sw::StoredChapterNumberingRules;
     friend class SwChapterNumRules;
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index e453f7f43ce5..a5c2791da06b 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -191,9 +191,9 @@ static OUString lcl_ConvertTabsToSpaces( const OUString& sLine )
 
 SwSrcView::SwSrcView(SfxViewFrame* pViewFrame, SfxViewShell*) :
     SfxViewShell( pViewFrame, SWSRCVIEWFLAGS ),
-    aEditWin( VclPtr<SwSrcEditWindow>::Create( &pViewFrame->GetWindow(), this ) ),
-    bSourceSaved(false),
-    eLoadEncoding(RTL_TEXTENCODING_DONTKNOW)
+    m_aEditWin( VclPtr<SwSrcEditWindow>::Create( &pViewFrame->GetWindow(), this ) ),
+    m_bSourceSaved(false),
+    m_eLoadEncoding(RTL_TEXTENCODING_DONTKNOW)
 {
     Init();
 }
@@ -202,7 +202,7 @@ SwSrcView::~SwSrcView()
 {
     SwDocShell* pDocShell = GetDocShell();
     assert(dynamic_cast<SwWebDocShell*>( pDocShell) && "Why no WebDocShell?" );
-    const TextSelection&  rSel = aEditWin->GetTextView()->GetSelection();
+    const TextSelection&  rSel = m_aEditWin->GetTextView()->GetSelection();
     static_cast<SwWebDocShell*>(pDocShell)->SetSourcePara( static_cast< sal_uInt16 >( rSel.GetStart().GetPara() ) );
 
     uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
@@ -214,22 +214,22 @@ SwSrcView::~SwSrcView()
     pDocShell->SetAutoLoad(INetURLObject(url), delay,
                             (delay != 0) || !url.isEmpty());
     EndListening(*pDocShell);
-    pSearchItem.reset();
+    m_pSearchItem.reset();
 
-    aEditWin.disposeAndClear();
+    m_aEditWin.disposeAndClear();
 }
 
 void SwSrcView::SaveContentTo(SfxMedium& rMed)
 {
     SvStream* pOutStream = rMed.GetOutStream();
-    pOutStream->SetStreamCharSet(lcl_GetStreamCharSet(eLoadEncoding));
-    aEditWin->Write( *pOutStream );
+    pOutStream->SetStreamCharSet(lcl_GetStreamCharSet(m_eLoadEncoding));
+    m_aEditWin->Write( *pOutStream );
 }
 
 void SwSrcView::Init()
 {
     SetName("Source");
-    SetWindow( aEditWin.get() );
+    SetWindow( m_aEditWin.get() );
     SwDocShell* pDocShell = GetDocShell();
     // If the doc is still loading, then the DocShell must fire up
     // the Load if the loading is completed.
@@ -237,7 +237,7 @@ void SwSrcView::Init()
         Load(pDocShell);
     else
     {
-        aEditWin->SetReadonly(true);
+        m_aEditWin->SetReadonly(true);
     }
 
     SetNewWindowAllowed( false );
@@ -254,14 +254,14 @@ void SwSrcView::SaveContent(const OUString& rTmpFile)
 {
     SfxMedium aMedium( rTmpFile, StreamMode::WRITE);
     SvStream* pOutStream = aMedium.GetOutStream();
-    pOutStream->SetStreamCharSet( lcl_GetStreamCharSet(eLoadEncoding) );
-    aEditWin->Write(*pOutStream);
+    pOutStream->SetStreamCharSet( lcl_GetStreamCharSet(m_eLoadEncoding) );
+    m_aEditWin->Write(*pOutStream);
     aMedium.Commit();
 }
 
 void SwSrcView::Execute(SfxRequest& rReq)
 {
-    TextView* pTextView = aEditWin->GetTextView();
+    TextView* pTextView = m_aEditWin->GetTextView();
     switch( rReq.GetSlot() )
     {
         case SID_SAVEACOPY:
@@ -270,7 +270,7 @@ void SwSrcView::Execute(SfxRequest& rReq)
             // filesave dialog with autoextension
             FileDialogHelper aDlgHelper(
                 TemplateDescription::FILESAVE_AUTOEXTENSION,
-                FileDialogFlags::NONE, aEditWin->GetFrameWeld());
+                FileDialogFlags::NONE, m_aEditWin->GetFrameWeld());
             uno::Reference < XFilePicker3 > xFP = aDlgHelper.GetFilePicker();
 
             // search for an html filter for export
@@ -298,8 +298,8 @@ void SwSrcView::Execute(SfxRequest& rReq)
                 SfxMedium aMedium( xFP->getSelectedFiles().getConstArray()[0],
                                     StreamMode::WRITE | StreamMode::SHARE_DENYNONE );
                 SvStream* pOutStream = aMedium.GetOutStream();
-                pOutStream->SetStreamCharSet(lcl_GetStreamCharSet(eLoadEncoding));
-                aEditWin->Write( *pOutStream );
+                pOutStream->SetStreamCharSet(lcl_GetStreamCharSet(m_eLoadEncoding));
+                m_aEditWin->Write( *pOutStream );
                 aMedium.Commit();
             }
         }
@@ -322,13 +322,13 @@ void SwSrcView::Execute(SfxRequest& rReq)
                 SvStream* pOutStream = pMed->GetOutStream();
                 pOutStream->Seek(0);
                 pOutStream->SetStreamSize(0);
-                pOutStream->SetStreamCharSet(lcl_GetStreamCharSet(eLoadEncoding));
-                aEditWin->Write( *pOutStream );
+                pOutStream->SetStreamCharSet(lcl_GetStreamCharSet(m_eLoadEncoding));
+                m_aEditWin->Write( *pOutStream );
                 pMed->CloseOutStream();
                 pMed->Commit();
                 pDocShell->GetDoc()->getIDocumentState().ResetModified();
-                bSourceSaved = true;
-                aEditWin->ClearModifyFlag();
+                m_bSourceSaved = true;
+                m_aEditWin->ClearModifyFlag();
             }
         }
         break;
@@ -341,7 +341,7 @@ void SwSrcView::Execute(SfxRequest& rReq)
             const SfxPoolItem& rItem = pTmpArgs->Get( nWhich );
             SetSearchItem( static_cast<const SvxSearchItem&>(rItem));
             StartSearchAndReplace( static_cast<const SvxSearchItem&>(rItem), rReq.IsAPI() );
-            if(aEditWin->IsModified())
+            if(m_aEditWin->IsModified())
             {
                 SwDocShell* pDocShell = GetDocShell();
                 assert(pDocShell);
@@ -355,7 +355,7 @@ void SwSrcView::Execute(SfxRequest& rReq)
             if(pSrchItem)
             {
                 StartSearchAndReplace( *pSrchItem, rReq.IsAPI() );
-                if(aEditWin->IsModified())
+                if(m_aEditWin->IsModified())
                     GetDocShell()->GetDoc()->getIDocumentState().SetModified();
             }
         }
@@ -391,14 +391,14 @@ void SwSrcView::Execute(SfxRequest& rReq)
             pTextView->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( TEXT_PARA_ALL, TEXT_INDEX_ALL ) ) );
         break;
     }
-    aEditWin->Invalidate();
+    m_aEditWin->Invalidate();
 }
 
 void SwSrcView::GetState(SfxItemSet& rSet)
 {
     SfxWhichIter aIter(rSet);
     sal_uInt16 nWhich = aIter.FirstWhich();
-    TextView* pTextView = aEditWin->GetTextView();
+    TextView* pTextView = m_aEditWin->GetTextView();
 
     while(nWhich)
     {
@@ -450,7 +450,7 @@ void SwSrcView::GetState(SfxItemSet& rSet)
                 if ( !pTextView->HasSelection() )
                 {
                     const TextSelection& rSel = pTextView->GetSelection();
-                    sSelected = aEditWin->GetTextEngine()->GetWord( rSel.GetStart());
+                    sSelected = m_aEditWin->GetTextEngine()->GetWord( rSel.GetStart());
                 }
                 else
                 {
@@ -517,7 +517,7 @@ void SwSrcView::GetState(SfxItemSet& rSet)
             {
                 TransferableDataHelper aDataHelper(
                     TransferableDataHelper::CreateFromSystemClipboard(
-                                                        aEditWin.get()) );
+                                                        m_aEditWin.get()) );
                 bool bDisable = !aDataHelper.GetXTransferable().is() ||
                             0 == aDataHelper.GetFormatCount();
                 if( bDisable )
@@ -531,23 +531,23 @@ void SwSrcView::GetState(SfxItemSet& rSet)
 
 SvxSearchItem* SwSrcView::GetSearchItem()
 {
-    if(!pSearchItem)
+    if(!m_pSearchItem)
     {
-        pSearchItem.reset(new SvxSearchItem(SID_SEARCH_ITEM));
+        m_pSearchItem.reset(new SvxSearchItem(SID_SEARCH_ITEM));
     }
-    return pSearchItem.get();
+    return m_pSearchItem.get();
 }
 
 void SwSrcView::SetSearchItem( const SvxSearchItem& rItem )
 {
-    pSearchItem.reset(rItem.Clone());
+    m_pSearchItem.reset(rItem.Clone());
 }
 
 void SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
                                                   bool bApi,
                                                   bool bRecursive)
 {
-    TextView* pTextView = aEditWin->GetTextView();
+    TextView* pTextView = m_aEditWin->GetTextView();
     TextPaM aPaM;
 
     bool bForward = !rSearchItem.GetBackward();
@@ -669,11 +669,11 @@ sal_Int32 SwSrcView::PrintSource(
 
     pOutDev->Push();
 
-    TextEngine* pTextEngine = aEditWin->GetTextEngine();
+    TextEngine* pTextEngine = m_aEditWin->GetTextEngine();
     pOutDev->SetMapMode(MapMode(MapUnit::Map100thMM));
-    vcl::Font aFont( aEditWin->GetOutWin()->GetFont() );
+    vcl::Font aFont( m_aEditWin->GetOutWin()->GetFont() );
     Size aSize( aFont.GetFontSize() );
-    aSize = aEditWin->GetOutWin()->PixelToLogic(aSize, MapMode(MapUnit::Map100thMM));
+    aSize = m_aEditWin->GetOutWin()->PixelToLogic(aSize, MapMode(MapUnit::Map100thMM));
     aFont.SetFontSize( aSize );
     aFont.SetColor( COL_BLACK );
     pOutDev->SetFont( aFont );
@@ -739,11 +739,11 @@ void SwSrcView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
         const SwDocShell* pDocSh = GetDocShell();
         assert(pDocSh);
         if (!(rHint.GetId() == SfxHintId::TitleChanged
-              && (pDocSh->IsReadOnly() || !aEditWin->IsReadonly())))
+              && (pDocSh->IsReadOnly() || !m_aEditWin->IsReadonly())))
         {
             // Broadcast only comes once!
             const bool bReadonly = pDocSh->IsReadOnly();
-            aEditWin->SetReadonly(bReadonly);
+            m_aEditWin->SetReadonly(bReadonly);
         }
     }
     SfxViewShell::Notify(rBC, rHint);
@@ -755,8 +755,8 @@ void SwSrcView::Load(SwDocShell* pDocShell)
         rtl_getBestMimeCharsetFromTextEncoding( SvxHtmlOptions::GetTextEncoding() );
     rtl_TextEncoding eDestEnc = rtl_getTextEncodingFromMimeCharset( pCharSet );
 
-    aEditWin->SetReadonly(pDocShell->IsReadOnly());
-    aEditWin->SetTextEncoding(eDestEnc);
+    m_aEditWin->SetReadonly(pDocShell->IsReadOnly());
+    m_aEditWin->SetTextEncoding(eDestEnc);
     SfxMedium* pMedium = pDocShell->GetMedium();
 
     std::shared_ptr<const SfxFilter> pFilter = pMedium->GetFilter();
@@ -780,13 +780,13 @@ void SwSrcView::Load(SwDocShell* pDocShell)
                  eDestEnc != eHeaderEnc )
             {
                 eDestEnc = eHeaderEnc;
-                aEditWin->SetTextEncoding(eDestEnc);
+                m_aEditWin->SetTextEncoding(eDestEnc);
             }
             pStream->SetStreamCharSet( eDestEnc );
             pStream->Seek(0);
-            TextEngine* pTextEngine = aEditWin->GetTextEngine();
+            TextEngine* pTextEngine = m_aEditWin->GetTextEngine();
             pTextEngine->EnableUndo(false);
-            aEditWin->Read(*pStream);
+            m_aEditWin->Read(*pStream);
             pTextEngine->EnableUndo(true);
         }
         else
@@ -815,19 +815,19 @@ void SwSrcView::Load(SwDocShell* pDocShell)
             if(nRes)
             {
                 ErrorHandler::HandleError(nRes);
-                aEditWin->SetReadonly(true);
+                m_aEditWin->SetReadonly(true);
             }
             aMedium.Commit();
             SvStream* pInStream = aMedium.GetInStream();
             pInStream->Seek(0);
             pInStream->SetStreamCharSet( eDestEnc );
 
-            aEditWin->Read(*pInStream);
+            m_aEditWin->Read(*pInStream);
         }
     }
-    aEditWin->ClearModifyFlag();
+    m_aEditWin->ClearModifyFlag();
 
-    eLoadEncoding = eDestEnc;
+    m_eLoadEncoding = eDestEnc;
 
     if(bDocModified)
         pDocShell->SetModified();// The flag will be reset in between times.
@@ -835,9 +835,9 @@ void SwSrcView::Load(SwDocShell* pDocShell)
     pDocShell->SetAutoLoad(INetURLObject(), 0, false);
     assert(dynamic_cast<SwWebDocShell*>( pDocShell) && "Why no WebDocShell?" );
     sal_uInt16 nLine = static_cast<SwWebDocShell*>(pDocShell)->GetSourcePara();
-    aEditWin->SetStartLine(nLine);
-    aEditWin->GetTextEngine()->ResetUndo();
-    aEditWin->GetOutWin()->GrabFocus();
+    m_aEditWin->SetStartLine(nLine);
+    m_aEditWin->GetTextEngine()->ResetUndo();
+    m_aEditWin->GetOutWin()->GrabFocus();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/navicfg.cxx b/sw/source/uibase/utlui/navicfg.cxx
index b28ff4f755ba..386c3451bf3e 100644
--- a/sw/source/uibase/utlui/navicfg.cxx
+++ b/sw/source/uibase/utlui/navicfg.cxx
@@ -42,13 +42,13 @@ Sequence<OUString> SwNavigationConfig::GetPropertyNames()
 
 SwNavigationConfig::SwNavigationConfig() :
     utl::ConfigItem("Office.Writer/Navigator"),
-    nRootType(ContentTypeId::UNKNOWN),
-    nSelectedPos(0),
-    nOutlineLevel(MAXLEVEL),
-    nRegionMode(RegionMode::NONE),
-    nActiveBlock(0),
-    bIsSmall(false),
-    bIsGlobalActive(true)
+    m_nRootType(ContentTypeId::UNKNOWN),
+    m_nSelectedPos(0),
+    m_nOutlineLevel(MAXLEVEL),
+    m_nRegionMode(RegionMode::NONE),
+    m_nActiveBlock(0),
+    m_bIsSmall(false),
+    m_bIsGlobalActive(true)
 {
     Sequence<OUString> aNames = GetPropertyNames();
     Sequence<Any> aValues = GetProperties(aNames);
@@ -76,22 +76,22 @@ SwNavigationConfig::SwNavigationConfig() :
                                 "out-of-bounds ContentTypeId " << nTmp);
                             nTmp = sal_Int32(ContentTypeId::UNKNOWN);
                         }
-                        nRootType = static_cast<ContentTypeId>(nTmp);
+                        m_nRootType = static_cast<ContentTypeId>(nTmp);
                     }
                     break;
                 }
-                case 1: pValues[nProp] >>= nSelectedPos;   break;
-                case 2: pValues[nProp] >>= nOutlineLevel;  break;
+                case 1: pValues[nProp] >>= m_nSelectedPos;   break;
+                case 2: pValues[nProp] >>= m_nOutlineLevel;  break;
                 case 3:
                 {
                         sal_uInt16 nTmp;
                         if (pValues[nProp] >>= nTmp)
-                            nRegionMode = static_cast<RegionMode>(nTmp);
+                            m_nRegionMode = static_cast<RegionMode>(nTmp);
                         break;
                 }
-                case 4: pValues[nProp] >>= nActiveBlock;    break;
-                case 5: bIsSmall        = *o3tl::doAccess<bool>(pValues[nProp]);  break;
-                case 6: bIsGlobalActive = *o3tl::doAccess<bool>(pValues[nProp]);  break;
+                case 4: pValues[nProp] >>= m_nActiveBlock;    break;
+                case 5: m_bIsSmall        = *o3tl::doAccess<bool>(pValues[nProp]);  break;
+                case 6: m_bIsGlobalActive = *o3tl::doAccess<bool>(pValues[nProp]);  break;
             }
         }
     }
@@ -111,13 +111,13 @@ void SwNavigationConfig::ImplCommit()
     {
         switch(nProp)
         {
-            case 0: pValues[nProp] <<= static_cast<sal_Int32>(nRootType);     break;
-            case 1: pValues[nProp] <<= nSelectedPos;  break;
-            case 2: pValues[nProp] <<= nOutlineLevel; break;
-            case 3: pValues[nProp] <<= static_cast<sal_uInt16>(nRegionMode); break;
-            case 4: pValues[nProp] <<= nActiveBlock;    break;
-            case 5: pValues[nProp] <<= bIsSmall; break;
-            case 6: pValues[nProp] <<= bIsGlobalActive; break;
+            case 0: pValues[nProp] <<= static_cast<sal_Int32>(m_nRootType);     break;
+            case 1: pValues[nProp] <<= m_nSelectedPos;  break;
+            case 2: pValues[nProp] <<= m_nOutlineLevel; break;
+            case 3: pValues[nProp] <<= static_cast<sal_uInt16>(m_nRegionMode); break;
+            case 4: pValues[nProp] <<= m_nActiveBlock;    break;
+            case 5: pValues[nProp] <<= m_bIsSmall; break;
+            case 6: pValues[nProp] <<= m_bIsGlobalActive; break;
         }
     }
     PutProperties(aNames, aValues);