sw: prefix members of SwChangeDBDlg, SwEditRegionDlg, SwLabFormatPage ...

... and SwLabPage

See tdf#94879 for motivation.

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

8 files changed, 129 insertions, 129 deletions

diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 2391919aa1c4..ed3c0dfb506a 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -332,8 +332,8 @@ SwEditRegionDlg::SwEditRegionDlg(weld::Window* pParent, SwWrtShell& rWrtSh)
     : SfxDialogController(pParent, "modules/swriter/ui/editsectiondialog.ui",
                           "EditSectionDialog")
     , m_bSubRegionsFilled(false)
-    , rSh(rWrtSh)
-    , bDontCheckPasswd(true)
+    , m_rSh(rWrtSh)
+    , m_bDontCheckPasswd(true)
     , m_xCurName(m_xBuilder->weld_entry("curname"))
     , m_xTree(m_xBuilder->weld_tree_view("tree"))
     , m_xFileCB(m_xBuilder->weld_check_button("link"))
@@ -365,7 +365,7 @@ SwEditRegionDlg::SwEditRegionDlg(weld::Window* pParent, SwWrtShell& rWrtSh)
     // edit in readonly sections
     m_xEditInReadonlyCB->set_state(TRISTATE_FALSE);
 
-    bool bWeb = dynamic_cast<SwWebDocShell*>( rSh.GetView().GetDocShell() ) != nullptr;
+    bool bWeb = dynamic_cast<SwWebDocShell*>( m_rSh.GetView().GetDocShell() ) != nullptr;
 
     m_xTree->connect_changed(LINK(this, SwEditRegionDlg, GetFirstEntryHdl));
     m_xCurName->connect_changed(LINK(this, SwEditRegionDlg, NameEditHdl));
@@ -398,7 +398,7 @@ SwEditRegionDlg::SwEditRegionDlg(weld::Window* pParent, SwWrtShell& rWrtSh)
 
     m_xDDECB->connect_toggled(LINK(this, SwEditRegionDlg, DDEHdl));
 
-    pCurrSect = rSh.GetCurrSection();
+    m_pCurrSect = m_rSh.GetCurrSection();
     RecurseList( nullptr, nullptr );
 
     // if the cursor is not in a region the first one will always be selected
@@ -413,12 +413,12 @@ SwEditRegionDlg::SwEditRegionDlg(weld::Window* pParent, SwWrtShell& rWrtSh)
     }
 
     m_xTree->show();
-    bDontCheckPasswd = false;
+    m_bDontCheckPasswd = false;
 }
 
 bool SwEditRegionDlg::CheckPasswd(weld::Toggleable* pBox)
 {
-    if (bDontCheckPasswd)
+    if (m_bDontCheckPasswd)
         return true;
     bool bRet = true;
 
@@ -467,11 +467,11 @@ void SwEditRegionDlg::RecurseList(const SwSectionFormat* pFormat, const weld::Tr
     std::unique_ptr<weld::TreeIter> xIter(m_xTree->make_iterator());
     if (!pFormat)
     {
-        const size_t nCount=rSh.GetSectionFormatCount();
+        const size_t nCount=m_rSh.GetSectionFormatCount();
         for ( size_t n = 0; n < nCount; n++ )
         {
             SectionType eTmpType;
-            if( !( pFormat = &rSh.GetSectionFormat(n))->GetParent() &&
+            if( !( pFormat = &m_rSh.GetSectionFormat(n))->GetParent() &&
                 pFormat->IsInNodesArr() &&
                 (eTmpType = pFormat->GetSection()->GetType()) != SectionType::ToxContent
                 && SectionType::ToxHeader != eTmpType )
@@ -488,7 +488,7 @@ void SwEditRegionDlg::RecurseList(const SwSectionFormat* pFormat, const weld::Tr
                 RecurseList(pFormat, xIter.get());
                 if (m_xTree->iter_has_child(*xIter))
                     m_xTree->expand_row(*xIter);
-                if (pCurrSect==pSect)
+                if (m_pCurrSect==pSect)
                 {
                     m_xTree->select(*xIter);
                     m_xTree->scroll_to_row(*xIter);
@@ -521,7 +521,7 @@ void SwEditRegionDlg::RecurseList(const SwSectionFormat* pFormat, const weld::Tr
                 RecurseList(pSect->GetFormat(), xIter.get());
                 if (m_xTree->iter_has_child(*xIter))
                     m_xTree->expand_row(*xIter);
-                if (pCurrSect==pSect)
+                if (m_pCurrSect==pSect)
                 {
                     m_xTree->select(*xIter);
                     m_xTree->scroll_to_row(*xIter);
@@ -534,9 +534,9 @@ void SwEditRegionDlg::RecurseList(const SwSectionFormat* pFormat, const weld::Tr
 
 size_t SwEditRegionDlg::FindArrPos(const SwSectionFormat* pFormat )
 {
-    const size_t nCount=rSh.GetSectionFormatCount();
+    const size_t nCount=m_rSh.GetSectionFormatCount();
     for ( size_t i = 0; i < nCount; i++ )
-        if ( pFormat == &rSh.GetSectionFormat(i) )
+        if ( pFormat == &m_rSh.GetSectionFormat(i) )
             return i;
 
     OSL_FAIL("SectionFormat not on the list" );
@@ -579,7 +579,7 @@ void SwEditRegionDlg::SelectSection(std::u16string_view rSectionName)
 // multiselection some controls are disabled
 IMPL_LINK(SwEditRegionDlg, GetFirstEntryHdl, weld::TreeView&, rBox, void)
 {
-    bDontCheckPasswd = true;
+    m_bDontCheckPasswd = true;
     std::unique_ptr<weld::TreeIter> xIter(rBox.make_iterator());
     bool bEntry = rBox.get_selected(xIter.get());
     m_xHideCB->set_sensitive(true);
@@ -734,7 +734,7 @@ IMPL_LINK(SwEditRegionDlg, GetFirstEntryHdl, weld::TreeView&, rBox, void)
         m_xPasswdCB->set_sensitive(bPasswdEnabled);
         m_xPasswdPB->set_sensitive(bPasswdEnabled);
     }
-    bDontCheckPasswd = false;
+    m_bDontCheckPasswd = false;
 }
 
 // in OkHdl the modified settings are being applied and reversed regions are deleted
@@ -747,12 +747,12 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl, weld::Button&, void)
     // StartUndo must certainly also happen not before the formats
     // are copied (ClearRedo!)
 
-    const SwSectionFormats& rDocFormats = rSh.GetDoc()->GetSections();
+    const SwSectionFormats& rDocFormats = m_rSh.GetDoc()->GetSections();
     SwSectionFormats aOrigArray(rDocFormats);
 
-    rSh.StartAllAction();
-    rSh.StartUndo();
-    rSh.ResetSelect( nullptr,false );
+    m_rSh.StartAllAction();
+    m_rSh.StartUndo();
+    m_rSh.ResetSelect( nullptr,false );
 
     std::unique_ptr<weld::TreeIter> xIter(m_xTree->make_iterator());
     if (m_xTree->get_iter_first(*xIter))
@@ -791,7 +791,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl, weld::Button&, void)
                 if( pFormat->GetLRSpace() != *pRepr->GetLRSpace())
                     pSet->Put( *pRepr->GetLRSpace());
 
-                rSh.UpdateSection( nNewPos, pRepr->GetSectionData(),
+                m_rSh.UpdateSection( nNewPos, pRepr->GetSectionData(),
                                    pSet->Count() ? pSet.get() : nullptr );
             }
         } while (m_xTree->iter_next(*xIter));
@@ -803,7 +803,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl, weld::Button&, void)
         SwSectionFormat* pFormat = aOrigArray[ it->second->GetArrPos() ];
         const size_t nNewPos = rDocFormats.GetPos( pFormat );
         if( SIZE_MAX != nNewPos )
-            rSh.DelSectionFormat( nNewPos );
+            m_rSh.DelSectionFormat( nNewPos );
     }
 
     aOrigArray.clear();
@@ -812,8 +812,8 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl, weld::Button&, void)
     // otherwise ScrollError can occur.
     m_xDialog->response(RET_OK);
 
-    rSh.EndUndo();
-    rSh.EndAllAction();
+    m_rSh.EndUndo();
+    m_rSh.EndAllAction();
 }
 
 // Toggle protect
@@ -949,7 +949,7 @@ IMPL_LINK(SwEditRegionDlg, UseFileHdl, weld::Toggleable&, rButton, void)
         m_xTree->selected_foreach([&](weld::TreeIter& rEntry){
             SectRepr* const pSectRepr = weld::fromId<SectRepr*>(m_xTree->get_id(rEntry));
             bool bContent = pSectRepr->IsContent();
-            if( rButton.get_active() && bContent && rSh.HasSelection() )
+            if( rButton.get_active() && bContent && m_rSh.HasSelection() )
             {
                 std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(m_xDialog.get(),
                                                                VclMessageType::Question, VclButtonsType::YesNo,
@@ -1016,7 +1016,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl, weld::Button&, void)
             RES_COL, RES_COL,
             RES_FTN_AT_TXTEND, RES_FRAMEDIR,
             XATTR_FILL_FIRST, XATTR_FILL_LAST,
-            SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE>  aSet( rSh.GetView().GetPool() );
+            SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE>  aSet( m_rSh.GetView().GetPool() );
 
     aSet.Put( pSectRepr->GetCol() );
     aSet.Put( *pSectRepr->GetBackground() );
@@ -1026,11 +1026,11 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl, weld::Button&, void)
     aSet.Put( *pSectRepr->GetFrameDir() );
     aSet.Put( *pSectRepr->GetLRSpace() );
 
-    const SwSectionFormats& rDocFormats = rSh.GetDoc()->GetSections();
+    const SwSectionFormats& rDocFormats = m_rSh.GetDoc()->GetSections();
     SwSectionFormats aOrigArray(rDocFormats);
 
     SwSectionFormat* pFormat = aOrigArray[pSectRepr->GetArrPos()];
-    tools::Long nWidth = rSh.GetSectionWidth(*pFormat);
+    tools::Long nWidth = m_rSh.GetSectionWidth(*pFormat);
     aOrigArray.clear();
     if (!nWidth)
         nWidth = USHRT_MAX;
@@ -1038,7 +1038,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl, weld::Button&, void)
     aSet.Put(SwFormatFrameSize(SwFrameSize::Variable, nWidth));
     aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth)));
 
-    SwSectionPropertyTabDialog aTabDlg(m_xDialog.get(), aSet, rSh);
+    SwSectionPropertyTabDialog aTabDlg(m_xDialog.get(), aSet, m_rSh);
     if (RET_OK != aTabDlg.run())
         return;
 
@@ -1132,7 +1132,7 @@ IMPL_LINK(SwEditRegionDlg, FileNameEntryHdl, weld::Entry&, rEdit, void)
         OUString sTmp(rEdit.get_text());
         if(!sTmp.isEmpty())
         {
-            SfxMedium* pMedium = rSh.GetView().GetDocShell()->GetMedium();
+            SfxMedium* pMedium = m_rSh.GetView().GetDocShell()->GetMedium();
             INetURLObject aAbs;
             if( pMedium )
                 aAbs = pMedium->GetURLObject();
@@ -1323,7 +1323,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, SubRegionEventHdl, weld::ComboBox&, void)
     OUString sFileName = m_xFileNameED->get_text();
     if(!sFileName.isEmpty())
     {
-        SfxMedium* pMedium = rSh.GetView().GetDocShell()->GetMedium();
+        SfxMedium* pMedium = m_rSh.GetView().GetDocShell()->GetMedium();
         INetURLObject aAbs;
         if( pMedium )
             aAbs = pMedium->GetURLObject();
@@ -1336,7 +1336,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, SubRegionEventHdl, weld::ComboBox&, void)
         ::lcl_ReadSections(aMedium, *m_xSubRegionED);
     }
     else
-        lcl_FillSubRegionList(rSh, *m_xSubRegionED, nullptr);
+        lcl_FillSubRegionList(m_rSh, *m_xSubRegionED, nullptr);
     m_bSubRegionsFilled = true;
 }
 
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 84f96f4af5db..5f0bc799d4e1 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -209,8 +209,8 @@ Printer *SwLabDlg::GetPrt()
 
 SwLabPage::SwLabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
     : SfxTabPage(pPage, pController, "modules/swriter/ui/cardmediumpage.ui", "CardMediumPage", &rSet)
-    , pDBManager(nullptr)
-    , aItem(static_cast<const SwLabItem&>(rSet.Get(FN_LABEL)))
+    , m_pDBManager(nullptr)
+    , m_aItem(static_cast<const SwLabItem&>(rSet.Get(FN_LABEL)))
     , m_xAddressFrame(m_xBuilder->weld_widget("addressframe"))
     , m_xAddrBox(m_xBuilder->weld_check_button("address"))
     , m_xWritingEdit(m_xBuilder->weld_text_view("textview"))
@@ -284,15 +284,15 @@ IMPL_LINK_NOARG(SwLabPage, AddrHdl, weld::Toggleable&, void)
 
 IMPL_LINK( SwLabPage, DatabaseHdl, weld::ComboBox&, rListBox, void )
 {
-    sActDBName = m_xDatabaseLB->get_active_text();
+    m_sActDBName = m_xDatabaseLB->get_active_text();
 
     weld::WaitObject aObj(GetParentSwLabDlg()->getDialog());
 
     if (&rListBox == m_xDatabaseLB.get())
-        GetDBManager()->GetTableNames(*m_xTableLB, sActDBName);
+        GetDBManager()->GetTableNames(*m_xTableLB, m_sActDBName);
 
     if (&rListBox == m_xDatabaseLB.get() || &rListBox == m_xTableLB.get())
-        GetDBManager()->GetColumnNames(*m_xDBFieldLB, sActDBName, m_xTableLB->get_active_text());
+        GetDBManager()->GetColumnNames(*m_xDBFieldLB, m_sActDBName, m_xTableLB->get_active_text());
 
     if (!m_xDatabaseLB->get_active_text().isEmpty() && !m_xTableLB->get_active_text().isEmpty()
             && !m_xDBFieldLB->get_active_text().isEmpty())
@@ -329,7 +329,7 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl, weld::ComboBox&, void)
 
     const OUString aMake = m_xMakeBox->get_active_text();
     GetParentSwLabDlg()->ReplaceGroup( aMake );
-    aItem.m_aLstMake = aMake;
+    m_aItem.m_aLstMake = aMake;
 
     const bool   bCont    = m_xContButton->get_active();
     const size_t nCount   = GetParentSwLabDlg()->Recs().size();
@@ -357,7 +357,7 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl, weld::ComboBox&, void)
         if(bInsert)
         {
             GetParentSwLabDlg()->TypeIds().push_back(i);
-            if ( !nLstType && aType == aItem.m_aLstType )
+            if ( !nLstType && aType == m_aItem.m_aLstType )
                 nLstType = GetParentSwLabDlg()->TypeIds().size();
         }
     }
@@ -366,7 +366,7 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl, weld::ComboBox&, void)
         m_xTypeBox->append_text(m_xHiddenSortTypeBox->get_text(nEntry));
     }
     if (nLstType)
-        m_xTypeBox->set_active_text(aItem.m_aLstType);
+        m_xTypeBox->set_active_text(m_aItem.m_aLstType);
     else
         m_xTypeBox->set_active(0);
     TypeHdl(*m_xTypeBox);
@@ -375,7 +375,7 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl, weld::ComboBox&, void)
 IMPL_LINK_NOARG(SwLabPage, TypeHdl, weld::ComboBox&, void)
 {
     DisplayFormat();
-    aItem.m_aType = m_xTypeBox->get_active_text();
+    m_aItem.m_aType = m_xTypeBox->get_active_text();
 }
 
 void SwLabPage::DisplayFormat()
@@ -388,7 +388,7 @@ void SwLabPage::DisplayFormat()
     xField->set_range(0, INT_MAX - 1, FieldUnit::NONE);
 
     SwLabRec* pRec = GetSelectedEntryPos();
-    aItem.m_aLstType = pRec->m_aType;
+    m_aItem.m_aLstType = pRec->m_aType;
     setfldval(*xField, pRec->m_nWidth);
     xField->reformat();
     const OUString aWString = xField->get_text();
@@ -420,13 +420,13 @@ void SwLabPage::InitDatabaseBox()
     for (const OUString& rDataName : aDataNames)
         m_xDatabaseLB->append_text(rDataName);
     sal_Int32 nIdx{ 0 };
-    OUString sDBName = sActDBName.getToken( 0, DB_DELIM, nIdx );
-    OUString sTableName = sActDBName.getToken( 0, DB_DELIM, nIdx );
+    OUString sDBName = m_sActDBName.getToken( 0, DB_DELIM, nIdx );
+    OUString sTableName = m_sActDBName.getToken( 0, DB_DELIM, nIdx );
     m_xDatabaseLB->set_active_text(sDBName);
     if( !sDBName.isEmpty() && GetDBManager()->GetTableNames(*m_xTableLB, sDBName))
     {
         m_xTableLB->set_active_text(sTableName);
-        GetDBManager()->GetColumnNames(*m_xDBFieldLB, sActDBName, sTableName);
+        GetDBManager()->GetColumnNames(*m_xDBFieldLB, m_sActDBName, sTableName);
     }
     else
         m_xDBFieldLB->clear();
@@ -457,7 +457,7 @@ void SwLabPage::FillItem(SwLabItem& rItem)
     rItem.m_bCont    = m_xContButton->get_active();
     rItem.m_aMake    = m_xMakeBox->get_active_text();
     rItem.m_aType    = m_xTypeBox->get_active_text();
-    rItem.m_sDBName  = sActDBName;
+    rItem.m_sDBName  = m_sActDBName;
 
     SwLabRec* pRec = GetSelectedEntryPos();
     pRec->FillItem( rItem );
@@ -468,8 +468,8 @@ void SwLabPage::FillItem(SwLabItem& rItem)
 
 bool SwLabPage::FillItemSet(SfxItemSet* rSet)
 {
-    FillItem( aItem );
-    rSet->Put( aItem );
+    FillItem( m_aItem );
+    rSet->Put( m_aItem );
 
     return true;
 }
@@ -486,19 +486,19 @@ void SwLabPage::Reset(const SfxItemSet* rSet)
         OUString& rStr = GetParentSwLabDlg()->Makes()[i];
         m_xMakeBox->append_text(rStr);
 
-        if ( rStr == aItem.m_aLstMake)
+        if ( rStr == m_aItem.m_aLstMake)
             nLstGroup = i;
     }
 
     m_xMakeBox->set_active( nLstGroup );
     MakeHdl(*m_xMakeBox);
 
-    aItem = static_cast<const SwLabItem&>( rSet->Get(FN_LABEL));
-    OUString sDBName  = aItem.m_sDBName;
+    m_aItem = static_cast<const SwLabItem&>( rSet->Get(FN_LABEL));
+    OUString sDBName  = m_aItem.m_sDBName;
 
-    OUString aWriting(convertLineEnd(aItem.m_aWriting, GetSystemLineEnd()));
+    OUString aWriting(convertLineEnd(m_aItem.m_aWriting, GetSystemLineEnd()));
 
-    m_xAddrBox->set_active( aItem.m_bAddr );
+    m_xAddrBox->set_active( m_aItem.m_bAddr );
     m_xWritingEdit->set_text( aWriting );
 
     for(const auto& rMake : GetParentSwLabDlg()->Makes())
@@ -507,17 +507,17 @@ void SwLabPage::Reset(const SfxItemSet* rSet)
             m_xMakeBox->append_text(rMake);
     }
 
-    m_xMakeBox->set_active_text(aItem.m_aMake);
+    m_xMakeBox->set_active_text(m_aItem.m_aMake);
     //save the current type
-    OUString sType(aItem.m_aType);
+    OUString sType(m_aItem.m_aType);
     MakeHdl(*m_xMakeBox);
-    aItem.m_aType = sType;
+    m_aItem.m_aType = sType;
     //#102806# a newly added make may not be in the type ListBox already
-    if (m_xTypeBox->find_text(aItem.m_aType) == -1 && !aItem.m_aMake.isEmpty())
-        GetParentSwLabDlg()->UpdateGroup( aItem.m_aMake );
-    if (m_xTypeBox->find_text(aItem.m_aType) != -1)
+    if (m_xTypeBox->find_text(m_aItem.m_aType) == -1 && !m_aItem.m_aMake.isEmpty())
+        GetParentSwLabDlg()->UpdateGroup( m_aItem.m_aMake );
+    if (m_xTypeBox->find_text(m_aItem.m_aType) != -1)
     {
-        m_xTypeBox->set_active_text(aItem.m_aType);
+        m_xTypeBox->set_active_text(m_aItem.m_aType);
         TypeHdl(*m_xTypeBox);
     }
     if (m_xDatabaseLB->find_text(sDBName) != -1)
@@ -526,7 +526,7 @@ void SwLabPage::Reset(const SfxItemSet* rSet)
         DatabaseHdl(*m_xDatabaseLB);
     }
 
-    if (aItem.m_bCont)
+    if (m_aItem.m_bCont)
         m_xContButton->set_active(true);
     else
         m_xSheetButton->set_active(true);
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 1992f8ad6dd5..7b7b0b33a90f 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -285,9 +285,9 @@ void SwLabPreview::UpdateItem(const SwLabItem& rItem)
 
 SwLabFormatPage::SwLabFormatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
     : SfxTabPage(pPage, pController, "modules/swriter/ui/labelformatpage.ui", "LabelFormatPage", &rSet)
-    , aPreviewIdle("SwLabFormatPage Preview")
-    , aItem(static_cast<const SwLabItem&>( rSet.Get(FN_LABEL) ))
-    , bModified(false)
+    , m_aPreviewIdle("SwLabFormatPage Preview")
+    , m_aItem(static_cast<const SwLabItem&>( rSet.Get(FN_LABEL) ))
+    , m_bModified(false)
     , m_xMakeFI(m_xBuilder->weld_label("make"))
     , m_xTypeFI(m_xBuilder->weld_label("type"))
     , m_xPreview(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreview))
@@ -332,8 +332,8 @@ SwLabFormatPage::SwLabFormatPage(weld::Container* pPage, weld::DialogController*
 
     m_xSavePB->connect_clicked( LINK (this, SwLabFormatPage, SaveHdl));
     // Set timer
-    aPreviewIdle.SetPriority(TaskPriority::LOWEST);
-    aPreviewIdle.SetInvokeHandler(LINK(this, SwLabFormatPage, PreviewHdl));
+    m_aPreviewIdle.SetPriority(TaskPriority::LOWEST);
+    m_aPreviewIdle.SetInvokeHandler(LINK(this, SwLabFormatPage, PreviewHdl));
 }
 
 SwLabFormatPage::~SwLabFormatPage()
@@ -343,23 +343,23 @@ SwLabFormatPage::~SwLabFormatPage()
 // Modify-handler of MetricFields. start preview timer
 IMPL_LINK_NOARG(SwLabFormatPage, MetricModifyHdl, weld::MetricSpinButton&, void)
 {
-    bModified = true;
-    aPreviewIdle.Start();
+    m_bModified = true;
+    m_aPreviewIdle.Start();
 }
 
 IMPL_LINK_NOARG(SwLabFormatPage, ModifyHdl, weld::SpinButton&, void)
 {
-    bModified = true;
-    aPreviewIdle.Start();
+    m_bModified = true;
+    m_aPreviewIdle.Start();
 }
 
 // Invalidate preview
 IMPL_LINK_NOARG(SwLabFormatPage, PreviewHdl, Timer *, void)
 {
-    aPreviewIdle.Stop();
+    m_aPreviewIdle.Stop();
     ChangeMinMax();
-    FillItem( aItem );
-    m_aPreview.UpdateItem(aItem);
+    FillItem( m_aItem );
+    m_aPreview.UpdateItem(m_aItem);
 }
 
 void SwLabFormatPage::ChangeMinMax()
@@ -423,7 +423,7 @@ DeactivateRC SwLabFormatPage::DeactivatePage(SfxItemSet* _pSet)
 
 void SwLabFormatPage::FillItem(SwLabItem& rItem)
 {
-    if (!bModified)
+    if (!m_bModified)
         return;
 
     rItem.m_aMake = rItem.m_aType = SwResId(STR_CUSTOM_LABEL);
@@ -444,8 +444,8 @@ void SwLabFormatPage::FillItem(SwLabItem& rItem)
 
 bool SwLabFormatPage::FillItemSet(SfxItemSet* rSet)
 {
-    FillItem(aItem);
-    rSet->Put(aItem);
+    FillItem(m_aItem);
+    rSet->Put(m_aItem);
 
     return true;
 }
@@ -453,33 +453,33 @@ bool SwLabFormatPage::FillItemSet(SfxItemSet* rSet)
 void SwLabFormatPage::Reset(const SfxItemSet* )
 {
     // Initialise fields
-    GetParentSwLabDlg()->GetLabItem(aItem);
-
-    m_xHDistField->set_max(100 * aItem.m_lHDist , FieldUnit::TWIP);
-    m_xVDistField->set_max(100 * aItem.m_lVDist , FieldUnit::TWIP);
-    m_xWidthField->set_max(100 * aItem.m_lWidth , FieldUnit::TWIP);
-    m_xHeightField->set_max(100 * aItem.m_lHeight, FieldUnit::TWIP);
-    m_xLeftField->set_max(100 * aItem.m_lLeft  , FieldUnit::TWIP);
-    m_xUpperField->set_max(100 * aItem.m_lUpper , FieldUnit::TWIP);
-    m_xPWidthField->set_max(100 * aItem.m_lPWidth , FieldUnit::TWIP);
-    m_xPHeightField->set_max(100 * aItem.m_lPHeight, FieldUnit::TWIP);
-
-    setfldval(*m_xHDistField, aItem.m_lHDist );
-    setfldval(*m_xVDistField , aItem.m_lVDist );
-    setfldval(*m_xWidthField , aItem.m_lWidth );
-    setfldval(*m_xHeightField, aItem.m_lHeight);
-    setfldval(*m_xLeftField  , aItem.m_lLeft  );
-    setfldval(*m_xUpperField , aItem.m_lUpper );
-    setfldval(*m_xPWidthField , aItem.m_lPWidth );
-    setfldval(*m_xPHeightField, aItem.m_lPHeight);
-
-    m_xColsField->set_max(aItem.m_nCols);
-    m_xRowsField->set_max(aItem.m_nRows);
-
-    m_xColsField->set_value(aItem.m_nCols);
-    m_xRowsField->set_value(aItem.m_nRows);
-    m_xMakeFI->set_label(aItem.m_aMake);
-    m_xTypeFI->set_label(aItem.m_aType);
+    GetParentSwLabDlg()->GetLabItem(m_aItem);
+
+    m_xHDistField->set_max(100 * m_aItem.m_lHDist , FieldUnit::TWIP);
+    m_xVDistField->set_max(100 * m_aItem.m_lVDist , FieldUnit::TWIP);
+    m_xWidthField->set_max(100 * m_aItem.m_lWidth , FieldUnit::TWIP);
+    m_xHeightField->set_max(100 * m_aItem.m_lHeight, FieldUnit::TWIP);
+    m_xLeftField->set_max(100 * m_aItem.m_lLeft  , FieldUnit::TWIP);
+    m_xUpperField->set_max(100 * m_aItem.m_lUpper , FieldUnit::TWIP);
+    m_xPWidthField->set_max(100 * m_aItem.m_lPWidth , FieldUnit::TWIP);
+    m_xPHeightField->set_max(100 * m_aItem.m_lPHeight, FieldUnit::TWIP);
+
+    setfldval(*m_xHDistField, m_aItem.m_lHDist );
+    setfldval(*m_xVDistField , m_aItem.m_lVDist );
+    setfldval(*m_xWidthField , m_aItem.m_lWidth );
+    setfldval(*m_xHeightField, m_aItem.m_lHeight);
+    setfldval(*m_xLeftField  , m_aItem.m_lLeft  );
+    setfldval(*m_xUpperField , m_aItem.m_lUpper );
+    setfldval(*m_xPWidthField , m_aItem.m_lPWidth );
+    setfldval(*m_xPHeightField, m_aItem.m_lPHeight);
+
+    m_xColsField->set_max(m_aItem.m_nCols);
+    m_xRowsField->set_max(m_aItem.m_nRows);
+
+    m_xColsField->set_value(m_aItem.m_nCols);
+    m_xRowsField->set_value(m_aItem.m_nRows);
+    m_xMakeFI->set_label(m_aItem.m_aMake);
+    m_xTypeFI->set_label(m_aItem.m_aType);
     PreviewHdl(nullptr);
 }
 
@@ -496,21 +496,21 @@ IMPL_LINK_NOARG(SwLabFormatPage, SaveHdl, weld::Button&, void)
     aRec.m_nRows   = static_cast< sal_Int32 >(m_xRowsField->get_value());
     aRec.m_nPWidth  = static_cast< tools::Long >(getfldval(*m_xPWidthField ));
     aRec.m_nPHeight = static_cast< tools::Long >(getfldval(*m_xPHeightField));
-    aRec.m_bCont = aItem.m_bCont;
+    aRec.m_bCont = m_aItem.m_bCont;
     SwSaveLabelDlg aSaveDlg(GetParentSwLabDlg(), aRec);
-    aSaveDlg.SetLabel(aItem.m_aLstMake, aItem.m_aLstType);
+    aSaveDlg.SetLabel(m_aItem.m_aLstMake, m_aItem.m_aLstType);
     aSaveDlg.run();
-    if (aSaveDlg.GetLabel(aItem))
+    if (aSaveDlg.GetLabel(m_aItem))
     {
-        bModified = false;
+        m_bModified = false;
         const std::vector<OUString>& rMan = GetParentSwLabDlg()->GetLabelsConfig().GetManufacturers();
         std::vector<OUString>& rMakes(GetParentSwLabDlg()->Makes());
         if(rMakes.size() < rMan.size())
         {
             rMakes = rMan;
         }
-        m_xMakeFI->set_label(aItem.m_aMake);
-        m_xTypeFI->set_label(aItem.m_aType);
+        m_xMakeFI->set_label(m_aItem.m_aMake);
+        m_xTypeFI->set_label(m_aItem.m_aType);
     }
 }
 
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index 48e513d6275c..032917948640 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -65,9 +65,9 @@ public:
 
 class SwLabFormatPage : public SfxTabPage
 {
-    Idle aPreviewIdle;
-    SwLabItem aItem;
-    bool bModified;
+    Idle m_aPreviewIdle;
+    SwLabItem m_aItem;
+    bool m_bModified;
 
     SwLabPreview m_aPreview;
 
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index be438ecb82d4..10ab6fe71579 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -26,9 +26,9 @@
 
 class SwLabPage : public SfxTabPage
 {
-    SwDBManager* pDBManager;
-    OUString sActDBName;
-    SwLabItem aItem;
+    SwDBManager* m_pDBManager;
+    OUString m_sActDBName;
+    SwLabItem m_aItem;
 
     std::unique_ptr<weld::Widget> m_xAddressFrame;
     std::unique_ptr<weld::CheckButton> m_xAddrBox;
@@ -73,8 +73,8 @@ public:
     void SetToBusinessCard();
 
     void InitDatabaseBox();
-    void SetDBManager(SwDBManager* pDBManager_) { pDBManager = pDBManager_; }
-    SwDBManager* GetDBManager() const { return pDBManager; }
+    void SetDBManager(SwDBManager* pDBManager_) { m_pDBManager = pDBManager_; }
+    SwDBManager* GetDBManager() const { return m_pDBManager; }
 };
 
 class SwPrivateDataPage : public SfxTabPage
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 1fa9e140f712..5c004207c36c 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::uno;
 SwChangeDBDlg::SwChangeDBDlg(SwView const & rVw)
     : SfxDialogController(rVw.GetViewFrame()->GetFrameWeld(), "modules/swriter/ui/exchangedatabases.ui",
                           "ExchangeDatabasesDialog")
-    , pSh(rVw.GetWrtShellPtr())
+    , m_pSh(rVw.GetWrtShellPtr())
     , m_xUsedDBTLB(m_xBuilder->weld_tree_view("inuselb"))
     , m_xAvailDBTLB(new SwDBTreeList(m_xBuilder->weld_tree_view("availablelb")))
     , m_xAddDBPB(m_xBuilder->weld_button("browse"))
@@ -56,10 +56,10 @@ SwChangeDBDlg::SwChangeDBDlg(SwView const & rVw)
     m_xUsedDBTLB->set_size_request(nWidth, nHeight);
     m_xAvailDBTLB->set_size_request(nWidth, nHeight);
 
-    m_xAvailDBTLB->SetWrtShell(*pSh);
+    m_xAvailDBTLB->SetWrtShell(*m_pSh);
     FillDBPopup();
 
-    ShowDBName(pSh->GetDBData());
+    ShowDBName(m_pSh->GetDBData());
     m_xDefineBT->connect_clicked(LINK(this, SwChangeDBDlg, ButtonHdl));
     m_xAddDBPB->connect_clicked(LINK(this, SwChangeDBDlg, AddDBHdl));
 
@@ -78,7 +78,7 @@ void SwChangeDBDlg::FillDBPopup()
 {
     Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
     Reference<XDatabaseContext> xDBContext = DatabaseContext::create(xContext);
-    const SwDBData& rDBData = pSh->GetDBData();
+    const SwDBData& rDBData = m_pSh->GetDBData();
     m_xAvailDBTLB->Select(rDBData.sDataSource, rDBData.sCommand, u"");
     TreeSelect();
 
@@ -86,7 +86,7 @@ void SwChangeDBDlg::FillDBPopup()
     auto aAllDBNames = comphelper::sequenceToContainer<std::vector<OUString>>(aDBNames);
 
     std::vector<OUString> aDBNameList;
-    pSh->GetAllUsedDB( aDBNameList, &aAllDBNames );
+    m_pSh->GetAllUsedDB( aDBNameList, &aAllDBNames );
 
     size_t nCount = aDBNameList.size();
     m_xUsedDBTLB->clear();
@@ -183,7 +183,7 @@ void SwChangeDBDlg::UpdateFields()
         return false;
     });
 
-    pSh->StartAllAction();
+    m_pSh->StartAllAction();
     OUString sTableName;
     OUString sColumnName;
     sal_Bool bIsTable = false;
@@ -195,8 +195,8 @@ void SwChangeDBDlg::UpdateFields()
         + OUString::number(bIsTable
                             ? CommandType::TABLE
                             : CommandType::QUERY);
-    pSh->ChangeDBFields( aDBNames, sTemp);
-    pSh->EndAllAction();
+    m_pSh->ChangeDBFields( aDBNames, sTemp);
+    m_pSh->EndAllAction();
 }
 
 IMPL_LINK_NOARG(SwChangeDBDlg, ButtonHdl, weld::Button&, void)
@@ -208,8 +208,8 @@ IMPL_LINK_NOARG(SwChangeDBDlg, ButtonHdl, weld::Button&, void)
     aData.sDataSource = m_xAvailDBTLB->GetDBName(sTableName, sColumnName, &bIsTable);
     aData.sCommand = sTableName;
     aData.nCommandType = bIsTable ? 0 : 1;
-    pSh->ChgDBData(aData);
-    ShowDBName(pSh->GetDBData());
+    m_pSh->ChgDBData(aData);
+    ShowDBName(m_pSh->GetDBData());
     m_xDialog->response(RET_OK);
 }
 
diff --git a/sw/source/uibase/inc/changedb.hxx b/sw/source/uibase/inc/changedb.hxx
index 0e2ffbdb5baa..f14f163dd73a 100644
--- a/sw/source/uibase/inc/changedb.hxx
+++ b/sw/source/uibase/inc/changedb.hxx
@@ -30,7 +30,7 @@ struct SwDBData;
 // exchange database at fields
 class SwChangeDBDlg final : public SfxDialogController
 {
-    SwWrtShell      *pSh;
+    SwWrtShell      *m_pSh;
 
     std::unique_ptr<weld::TreeView> m_xUsedDBTLB;
     std::unique_ptr<SwDBTreeList> m_xAvailDBTLB;
diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx
index e766e3a1a924..0076e80a6dbe 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -47,12 +47,12 @@ class SwEditRegionDlg final : public SfxDialogController
 {
     bool            m_bSubRegionsFilled;
 
-    SwWrtShell&             rSh;
+    SwWrtShell&             m_rSh;
     SectReprs_t             m_SectReprs;
-    const SwSection*        pCurrSect;
+    const SwSection*        m_pCurrSect;
     std::unique_ptr<sfx2::DocumentInserter> m_pDocInserter;
 
-    bool            bDontCheckPasswd :1;
+    bool            m_bDontCheckPasswd :1;
 
     std::unique_ptr<weld::Entry> m_xCurName;
     std::unique_ptr<weld::TreeView>  m_xTree;