sw: prefix members of SwAuthorMarkPane, SwEndNoteOptionPage, ...

... SwGlossaryGroupDlg and SwTOXWidget

See tdf#94879 for motivation.

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

5 files changed, 77 insertions, 77 deletions

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index d2671d2dd664..6879d4700c27 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1435,14 +1435,14 @@ IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, const OString&, rIdent, void)
 class SwTOXWidget
 {
 protected:
-    Link<SwTOXWidget&,void> aGetFocusLink;
+    Link<SwTOXWidget&,void> m_aGetFocusLink;
 public:
     virtual WindowType GetType() const = 0;
     virtual void GrabFocus() = 0;
     virtual void Hide() = 0;
     virtual void set_grid_left_attach(int nPos) = 0;
     virtual void get_extents_relative_to(weld::Widget& rRelative, int& x, int& y, int& width, int& height) = 0;
-    void SetGetFocusHdl(const Link<SwTOXWidget&,void>& rLink) { aGetFocusLink = rLink; }
+    void SetGetFocusHdl(const Link<SwTOXWidget&,void>& rLink) { m_aGetFocusLink = rLink; }
     virtual ~SwTOXWidget() {}
 };
 
@@ -1600,7 +1600,7 @@ IMPL_LINK(SwTOXEdit, KeyInputHdl, const KeyEvent&, rKEvt, bool)
 
 IMPL_LINK_NOARG(SwTOXEdit, FocusInHdl, weld::Widget&, void)
 {
-    aGetFocusLink.Call(*this);
+    m_aGetFocusLink.Call(*this);
 }
 
 void SwTOXEdit::AdjustSize()
@@ -1792,7 +1792,7 @@ IMPL_LINK(SwTOXButton, KeyInputHdl, const KeyEvent&, rKEvt, bool)
 
 IMPL_LINK_NOARG(SwTOXButton, FocusInHdl, weld::Widget&, void)
 {
-    aGetFocusLink.Call(*this);
+    m_aGetFocusLink.Call(*this);
 }
 
 namespace
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index a60e556d7974..8166b4713c7e 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1165,7 +1165,7 @@ static OUString lcl_FindColumnEntry(const uno::Sequence<beans::PropertyValue>& r
     return OUString();
 }
 
-bool SwAuthorMarkPane::bIsFromComponent = true;
+bool SwAuthorMarkPane::s_bIsFromComponent = true;
 
 SwAuthorMarkPane::SwAuthorMarkPane(weld::DialogController &rDialog, weld::Builder& rBuilder, bool bNewDlg)
     : m_rDialog(rDialog)
@@ -1186,8 +1186,8 @@ SwAuthorMarkPane::SwAuthorMarkPane(weld::DialogController &rDialog, weld::Builde
     m_xActionBT->show();
     m_xFromComponentRB->set_visible(m_bNewEntry);
     m_xFromDocContentRB->set_visible(m_bNewEntry);
-    m_xFromComponentRB->set_active(bIsFromComponent);
-    m_xFromDocContentRB->set_active(!bIsFromComponent);
+    m_xFromComponentRB->set_active(s_bIsFromComponent);
+    m_xFromDocContentRB->set_active(!s_bIsFromComponent);
 
     m_xActionBT->connect_clicked(LINK(this,SwAuthorMarkPane, InsertHdl));
     m_xCloseBT->connect_clicked(LINK(this,SwAuthorMarkPane, CloseHdl));
@@ -1230,7 +1230,7 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, CloseHdl, weld::Button&, void)
 IMPL_LINK( SwAuthorMarkPane, CompEntryHdl, weld::ComboBox&, rBox, void)
 {
     const OUString sEntry(rBox.get_active_text());
-    if(bIsFromComponent)
+    if(s_bIsFromComponent)
     {
         if(m_xBibAccess.is() && !sEntry.isEmpty())
         {
@@ -1378,10 +1378,10 @@ IMPL_LINK(SwAuthorMarkPane, CreateEntryHdl, weld::Button&, rButton, void)
 IMPL_LINK_NOARG(SwAuthorMarkPane, ChangeSourceHdl, weld::Toggleable&, void)
 {
     bool bFromComp = m_xFromComponentRB->get_active();
-    bIsFromComponent = bFromComp;
-    m_xCreateEntryPB->set_sensitive(!bIsFromComponent);
+    s_bIsFromComponent = bFromComp;
+    m_xCreateEntryPB->set_sensitive(!s_bIsFromComponent);
     m_xEntryLB->clear();
-    if(bIsFromComponent)
+    if(s_bIsFromComponent)
     {
         if(!m_bBibAccessInitialized)
         {
@@ -1452,7 +1452,7 @@ IMPL_LINK(SwAuthorMarkPane, IsEntryAllowedHdl, weld::Entry&, rEdit, bool)
     {
         if (m_xEntryLB->find_text(sEntry) != -1)
             return false;
-        else if(bIsFromComponent)
+        else if(s_bIsFromComponent)
         {
             const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
                                         m_pSh->GetFieldType(SwFieldIds::TableOfAuthorities, OUString()));
@@ -1474,7 +1474,7 @@ IMPL_LINK(SwAuthorMarkPane, IsEditAllowedHdl, weld::Entry&, rEdit, bool)
     {
         if (m_xEntryLB->find_text(sEntry) != -1)
             return false;
-        else if(bIsFromComponent)
+        else if(s_bIsFromComponent)
         {
             const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
                                         m_pSh->GetFieldType(SwFieldIds::TableOfAuthorities, OUString()));
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 30d218860eae..576cb1521d1b 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -70,9 +70,9 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(weld::Container* pPage, weld::DialogCon
         bEN ? OUString("modules/swriter/ui/endnotepage.ui") : OUString("modules/swriter/ui/footnotepage.ui"),
         bEN ? OString("EndnotePage") : OString("FootnotePage"),
         &rSet)
-    , pSh(nullptr)
-    , bPosDoc(false)
-    , bEndNote(bEN)
+    , m_pSh(nullptr)
+    , m_bPosDoc(false)
+    , m_bEndNote(bEN)
     , m_xNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box("numberinglb")))
     , m_xOffsetLbl(m_xBuilder->weld_label("offset"))
     , m_xOffsetField(m_xBuilder->weld_spin_button("offsetnf"))
@@ -91,12 +91,12 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(weld::Container* pPage, weld::DialogCon
     , m_xContFromEdit(m_xBuilder->weld_entry("contfromed"))
 {
     m_xNumViewBox->Reload(SwInsertNumTypes::Extended);
-    if (!bEndNote)
+    if (!m_bEndNote)
     {
         m_xNumCountBox->connect_changed(LINK(this, SwEndNoteOptionPage, NumCountHdl));
-        aNumDoc = m_xNumCountBox->get_text(FTNNUM_DOC);
-        aNumPage = m_xNumCountBox->get_text(FTNNUM_PAGE);
-        aNumChapter = m_xNumCountBox->get_text(FTNNUM_CHAPTER);
+        m_aNumDoc = m_xNumCountBox->get_text(FTNNUM_DOC);
+        m_aNumPage = m_xNumCountBox->get_text(FTNNUM_PAGE);
+        m_aNumChapter = m_xNumCountBox->get_text(FTNNUM_CHAPTER);
         m_xPosPageBox->connect_toggled(LINK(this, SwEndNoteOptionPage, ToggleHdl));
         m_xPosChapterBox->connect_toggled(LINK(this, SwEndNoteOptionPage, ToggleHdl));
     }
@@ -109,20 +109,20 @@ SwEndNoteOptionPage::~SwEndNoteOptionPage()
 
 void SwEndNoteOptionPage::Reset( const SfxItemSet* )
 {
-    std::unique_ptr<SwEndNoteInfo> pInf(bEndNote ? new SwEndNoteInfo( pSh->GetEndNoteInfo() )
-                                          : new SwFootnoteInfo( pSh->GetFootnoteInfo() ));
+    std::unique_ptr<SwEndNoteInfo> pInf(m_bEndNote ? new SwEndNoteInfo( m_pSh->GetEndNoteInfo() )
+                                          : new SwFootnoteInfo( m_pSh->GetFootnoteInfo() ));
     SfxObjectShell * pDocSh = SfxObjectShell::Current();
 
     if (dynamic_cast<SwWebDocShell*>( pDocSh) )
         m_xStylesContainer->hide();
 
-    if ( bEndNote )
+    if ( m_bEndNote )
     {
-        bPosDoc = true;
+        m_bPosDoc = true;
     }
     else
     {
-        const SwFootnoteInfo &rInf = pSh->GetFootnoteInfo();
+        const SwFootnoteInfo &rInf = m_pSh->GetFootnoteInfo();
         // set position (page, chapter)
         if ( rInf.m_ePos == FTNPOS_PAGE )
         {
@@ -133,9 +133,9 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* )
         else
         {
             m_xPosChapterBox->set_active(true);
-            m_xNumCountBox->remove_text(aNumPage);
-            m_xNumCountBox->remove_text(aNumChapter);
-            bPosDoc = true;
+            m_xNumCountBox->remove_text(m_aNumPage);
+            m_xNumCountBox->remove_text(m_aNumChapter);
+            m_bPosDoc = true;
         }
             // reference tests
         m_xContEdit->set_text(rInf.m_aQuoVadis);
@@ -153,17 +153,17 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* )
     m_xSuffixED->set_text(pInf->GetSuffix().replaceAll("\t", "\\t"));
 
     const SwCharFormat* pCharFormat = pInf->GetCharFormat(
-                        *pSh->GetView().GetDocShell()->GetDoc());
+                        *m_pSh->GetView().GetDocShell()->GetDoc());
     m_xFootnoteCharTextTemplBox->set_active_text(pCharFormat->GetName());
     m_xFootnoteCharTextTemplBox->save_value();
 
-    pCharFormat = pInf->GetAnchorCharFormat( *pSh->GetDoc() );
+    pCharFormat = pInf->GetAnchorCharFormat( *m_pSh->GetDoc() );
     m_xFootnoteCharAnchorTemplBox->set_active_text( pCharFormat->GetName() );
     m_xFootnoteCharAnchorTemplBox->save_value();
 
         // styles   special regions
         // paragraph
-    SfxStyleSheetBasePool* pStyleSheetPool = pSh->GetView().GetDocShell()->GetStyleSheetPool();
+    SfxStyleSheetBasePool* pStyleSheetPool = m_pSh->GetView().GetDocShell()->GetStyleSheetPool();
     SfxStyleSheetBase *pStyle = pStyleSheetPool->First(SfxStyleFamily::Para, SfxStyleSearchBits::SwExtra);
     while(pStyle)
     {
@@ -172,7 +172,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* )
     }
 
     OUString sStr;
-    SwStyleNameMapper::FillUIName( static_cast< sal_uInt16 >(bEndNote ? RES_POOLCOLL_ENDNOTE
+    SwStyleNameMapper::FillUIName( static_cast< sal_uInt16 >(m_bEndNote ? RES_POOLCOLL_ENDNOTE
                            : RES_POOLCOLL_FOOTNOTE), sStr );
     if (m_xParaTemplBox->find_text(sStr) == -1)
         m_xParaTemplBox->append_text(sStr);
@@ -197,16 +197,16 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* )
     for (sal_uInt16 i = RES_POOLPAGE_BEGIN; i < RES_POOLPAGE_END; ++i)
         m_xPageTemplBox->append_text(SwStyleNameMapper::GetUIName(i, OUString()));
 
-    const size_t nCount = pSh->GetPageDescCnt();
+    const size_t nCount = m_pSh->GetPageDescCnt();
     for(size_t i = 0; i < nCount; ++i)
     {
-        const SwPageDesc &rPageDesc = pSh->GetPageDesc(i);
+        const SwPageDesc &rPageDesc = m_pSh->GetPageDesc(i);
         if (m_xPageTemplBox->find_text(rPageDesc.GetName()) == -1)
             m_xPageTemplBox->append_text(rPageDesc.GetName());
     }
     m_xPageTemplBox->make_sorted();
 
-    m_xPageTemplBox->set_active_text(pInf->GetPageDesc(*pSh->GetDoc())->GetName());
+    m_xPageTemplBox->set_active_text(pInf->GetPageDesc(*m_pSh->GetDoc())->GetName());
 }
 
 std::unique_ptr<SfxTabPage> SwEndNoteOptionPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet )
@@ -222,13 +222,13 @@ void SwEndNoteOptionPage::SelectNumbering(SwFootnoteNum const eNum)
     switch(eNum)
     {
         case FTNNUM_DOC:
-            sSelect = aNumDoc;
+            sSelect = m_aNumDoc;
         break;
         case FTNNUM_PAGE:
-            sSelect = aNumPage;
+            sSelect = m_aNumPage;
         break;
         case FTNNUM_CHAPTER:
-            sSelect = aNumChapter;
+            sSelect = m_aNumChapter;
         break;
         default:
             assert(false);
@@ -240,20 +240,20 @@ void SwEndNoteOptionPage::SelectNumbering(SwFootnoteNum const eNum)
 SwFootnoteNum SwEndNoteOptionPage::GetNumbering() const
 {
     const int nPos = m_xNumCountBox->get_active();
-    return static_cast<SwFootnoteNum>(bPosDoc ? nPos + 2 : nPos);
+    return static_cast<SwFootnoteNum>(m_bPosDoc ? nPos + 2 : nPos);
 }
 
 void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell )
 {
-    pSh = &rShell;
+    m_pSh = &rShell;
     // collect character templates
     m_xFootnoteCharTextTemplBox->clear();
     m_xFootnoteCharAnchorTemplBox->clear();
     ::FillCharStyleListBox(*m_xFootnoteCharTextTemplBox,
-                        pSh->GetView().GetDocShell(), true);
+                        m_pSh->GetView().GetDocShell(), true);
 
     ::FillCharStyleListBox(*m_xFootnoteCharAnchorTemplBox,
-                        pSh->GetView().GetDocShell(), true);
+                        m_pSh->GetView().GetDocShell(), true);
 }
 
 IMPL_LINK(SwEndNoteOptionPage, ToggleHdl, weld::Toggleable&, rButton, void)
@@ -267,11 +267,11 @@ IMPL_LINK(SwEndNoteOptionPage, ToggleHdl, weld::Toggleable&, rButton, void)
         // all kinds of numbering can be used.
 
         const SwFootnoteNum eNum = GetNumbering();
-        bPosDoc = false;
-        if (m_xNumCountBox->find_text(aNumPage) == -1)
+        m_bPosDoc = false;
+        if (m_xNumCountBox->find_text(m_aNumPage) == -1)
         {
-            m_xNumCountBox->insert_text(FTNNUM_PAGE, aNumPage);
-            m_xNumCountBox->insert_text(FTNNUM_CHAPTER, aNumChapter);
+            m_xNumCountBox->insert_text(FTNNUM_PAGE, m_aNumPage);
+            m_xNumCountBox->insert_text(FTNNUM_CHAPTER, m_aNumChapter);
             SelectNumbering(eNum);
         }
         m_xPageTemplLbl->set_sensitive(false);
@@ -282,12 +282,12 @@ IMPL_LINK(SwEndNoteOptionPage, ToggleHdl, weld::Toggleable&, rButton, void)
         // Handler behind the button to collect the footnote at the chapter or end of
         // the document. In this case no pagewise numbering can be used.
 
-        if ( !bPosDoc )
+        if ( !m_bPosDoc )
             SelectNumbering(FTNNUM_DOC);
 
-        bPosDoc = true;
-        m_xNumCountBox->remove_text(aNumPage);
-        m_xNumCountBox->remove_text(aNumChapter);
+        m_bPosDoc = true;
+        m_xNumCountBox->remove_text(m_aNumPage);
+        m_xNumCountBox->remove_text(m_aNumChapter);
         m_xPageTemplLbl->set_sensitive(true);
         m_xPageTemplBox->set_sensitive(true);
     }
@@ -332,16 +332,16 @@ static SwCharFormat* lcl_GetCharFormat( SwWrtShell* pSh, const OUString& rCharFo
 
 bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * )
 {
-    std::unique_ptr<SwEndNoteInfo> pInf(bEndNote ? new SwEndNoteInfo() : new SwFootnoteInfo());
+    std::unique_ptr<SwEndNoteInfo> pInf(m_bEndNote ? new SwEndNoteInfo() : new SwFootnoteInfo());
 
     pInf->m_nFootnoteOffset = m_xOffsetField->get_value() - 1;
     pInf->m_aFormat.SetNumberingType(m_xNumViewBox->GetSelectedNumberingType() );
     pInf->SetPrefix(m_xPrefixED->get_text().replaceAll("\\t", "\t"));
     pInf->SetSuffix(m_xSuffixED->get_text().replaceAll("\\t", "\t"));
 
-    pInf->SetCharFormat( lcl_GetCharFormat( pSh,
+    pInf->SetCharFormat( lcl_GetCharFormat( m_pSh,
                         m_xFootnoteCharTextTemplBox->get_active_text() ) );
-    pInf->SetAnchorCharFormat( lcl_GetCharFormat( pSh,
+    pInf->SetAnchorCharFormat( lcl_GetCharFormat( m_pSh,
                         m_xFootnoteCharAnchorTemplBox->get_active_text() ) );
 
     // paragraph template
@@ -349,19 +349,19 @@ bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * )
     if (nPos != -1)
     {
         const OUString aFormatName( m_xParaTemplBox->get_active_text() );
-        SwTextFormatColl *pColl = pSh->GetParaStyle(aFormatName, SwWrtShell::GETSTYLE_CREATEANY);
+        SwTextFormatColl *pColl = m_pSh->GetParaStyle(aFormatName, SwWrtShell::GETSTYLE_CREATEANY);
         OSL_ENSURE(pColl, "paragraph style not found");
         pInf->SetFootnoteTextColl(*pColl);
     }
 
     // page template
-    pInf->ChgPageDesc( pSh->FindPageDescByName(
+    pInf->ChgPageDesc( m_pSh->FindPageDescByName(
                                 m_xPageTemplBox->get_active_text(), true ) );
 
-    if ( bEndNote )
+    if ( m_bEndNote )
     {
-        if ( !(*pInf == pSh->GetEndNoteInfo()) )
-            pSh->SetEndNoteInfo( *pInf );
+        if ( !(*pInf == m_pSh->GetEndNoteInfo()) )
+            m_pSh->SetEndNoteInfo( *pInf );
     }
     else
     {
@@ -370,8 +370,8 @@ bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * )
         pI->m_eNum = GetNumbering();
         pI->m_aQuoVadis = m_xContEdit->get_text();
         pI->m_aErgoSum = m_xContFromEdit->get_text();
-        if ( !(*pI == pSh->GetFootnoteInfo()) )
-            pSh->SetFootnoteInfo( *pI );
+        if ( !(*pI == m_pSh->GetFootnoteInfo()) )
+            m_pSh->SetFootnoteInfo( *pI );
     }
     return true;
 }
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 5e88c4871ee9..d33cd1ef3816 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -45,7 +45,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(weld::Window * pParent,
     : SfxDialogController(pParent, "modules/swriter/ui/editcategories.ui",
                           "EditCategoriesDialog")
     , m_pParent(pParent)
-    , pGlosHdl(pHdl)
+    , m_pGlosHdl(pHdl)
     , m_xNameED(m_xBuilder->weld_entry("name"))
     , m_xPathLB(m_xBuilder->weld_combo_box("pathlb"))
     , m_xGroupTLB(m_xBuilder->weld_tree_view("group"))
@@ -148,7 +148,7 @@ void SwGlossaryGroupDlg::Apply()
             if (m_xGroupTLB->n_children())
             {
                 GlosBibUserData* pUserData = weld::fromId<GlosBibUserData*>(m_xGroupTLB->get_id(0));
-                pGlosHdl->SetCurGroup(pUserData->sGroupName);
+                m_pGlosHdl->SetCurGroup(pUserData->sGroupName);
             }
         }
         const OUString sMsg(SwResId(STR_QUERY_DELETE_GROUP1)
@@ -159,7 +159,7 @@ void SwGlossaryGroupDlg::Apply()
                                                        VclMessageType::Question, VclButtonsType::YesNo, sMsg));
         xQueryBox->set_default_response(RET_NO);
         if (RET_YES == xQueryBox->run())
-            pGlosHdl->DelGroup( sDelGroup );
+            m_pGlosHdl->DelGroup( sDelGroup );
     }
 
     //don't rename before there was one
@@ -169,10 +169,10 @@ void SwGlossaryGroupDlg::Apply()
         OUString const sOld(it->getToken(0, RENAME_TOKEN_DELIM, nIdx));
         OUString sNew(it->getToken(0, RENAME_TOKEN_DELIM, nIdx));
         OUString const sTitle(it->getToken(0, RENAME_TOKEN_DELIM, nIdx));
-        pGlosHdl->RenameGroup(sOld, sNew, sTitle);
+        m_pGlosHdl->RenameGroup(sOld, sNew, sTitle);
         if (it == m_RenamedArr.begin())
         {
-            sCreatedGroup = sNew;
+            m_sCreatedGroup = sNew;
         }
     }
     for (auto& sNewGroup : m_InsertedArr)
@@ -180,9 +180,9 @@ void SwGlossaryGroupDlg::Apply()
         OUString sNewTitle = sNewGroup.getToken(0, GLOS_DELIM);
         if( sNewGroup != aActGroup )
         {
-            pGlosHdl->NewGroup(sNewGroup, sNewTitle);
-            if(sCreatedGroup.isEmpty())
-                sCreatedGroup = sNewGroup;
+            m_pGlosHdl->NewGroup(sNewGroup, sNewTitle);
+            if(m_sCreatedGroup.isEmpty())
+                m_sCreatedGroup = sNewGroup;
         }
     }
 }
@@ -218,7 +218,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, NewHdl, weld::Button&, void)
     OUString sGroup = m_xNameED->get_text()
         + OUStringChar(GLOS_DELIM)
         + OUString::number(m_xPathLB->get_active());
-    OSL_ENSURE(!pGlosHdl->FindGroupName(sGroup), "group already available!");
+    OSL_ENSURE(!m_pGlosHdl->FindGroupName(sGroup), "group already available!");
     m_InsertedArr.push_back(sGroup);
     GlosBibUserData* pData = new GlosBibUserData;
     pData->sPath = m_xPathLB->get_active_text();
@@ -296,7 +296,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl, weld::Button&, void)
     OUString sNewName = sNewTitle
         + OUStringChar(GLOS_DELIM)
         + OUString::number(m_xPathLB->get_active());
-    OSL_ENSURE(!pGlosHdl->FindGroupName(sNewName), "group already available!");
+    OSL_ENSURE(!m_pGlosHdl->FindGroupName(sNewName), "group already available!");
 
     // if the name to be renamed is among the new ones - replace
     bool bDone = false;
@@ -388,7 +388,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyHdl, weld::Entry&, void)
 
 bool SwGlossaryGroupDlg::IsDeleteAllowed(const OUString &rGroup)
 {
-    bool bDel = !pGlosHdl->IsReadOnly(&rGroup);
+    bool bDel = !m_pGlosHdl->IsReadOnly(&rGroup);
 
     // OM: if the name is among the new region name, it is deletable
     // as well! Because for non existing region names ReadOnly issues
diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx
index aa376af03bee..eb5c491a45f9 100644
--- a/sw/source/ui/misc/impfnote.hxx
+++ b/sw/source/ui/misc/impfnote.hxx
@@ -28,12 +28,12 @@ class SwWrtShell;
 
 class SwEndNoteOptionPage : public SfxTabPage
 {
-    OUString aNumDoc;
-    OUString aNumPage;
-    OUString aNumChapter;
-    SwWrtShell *pSh;
-    bool    bPosDoc;
-    bool    bEndNote;
+    OUString m_aNumDoc;
+    OUString m_aNumPage;
+    OUString m_aNumChapter;
+    SwWrtShell *m_pSh;
+    bool    m_bPosDoc;
+    bool    m_bEndNote;
 
     std::unique_ptr<SwNumberingTypeListBox> m_xNumViewBox;
     std::unique_ptr<weld::Label> m_xOffsetLbl;