sw: prefix members of SwAddPrinterTabPage, SwCaptionOptPage, ...

... SwMarkPreview and SwParaDlg

See tdf#94879 for motivation.

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

6 files changed, 71 insertions, 71 deletions

diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 149833acc8c3..f439b346d698 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -50,8 +50,8 @@ SwParaDlg::SwParaDlg(weld::Window *pParent,
                  "modules/swriter/ui/paradialog.ui",
                  "ParagraphPropertiesDialog",
                  &rCoreSet,  nullptr != pTitle)
-    , rView(rVw)
-    , bDrawParaDlg(bDraw)
+    , m_rView(rVw)
+    , m_bDrawParaDlg(bDraw)
 {
     sal_uInt16 nHtmlMode = ::GetHtmlMode(rVw.GetDocShell());
     bool bHtmlMode = (nHtmlMode & HTMLMODE_ON) == HTMLMODE_ON;
@@ -73,7 +73,7 @@ SwParaDlg::SwParaDlg(weld::Window *pParent,
     AddTabPage("labelTP_PARA_ALIGN", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH),
                                       pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH));
 
-    if (!bDrawParaDlg && (!bHtmlMode || SvxHtmlOptions::IsPrintLayoutExtension()))
+    if (!m_bDrawParaDlg && (!bHtmlMode || SvxHtmlOptions::IsPrintLayoutExtension()))
     {
         OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageCreatorFunc fail!");
         OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageRangesFunc fail!");
@@ -104,7 +104,7 @@ SwParaDlg::SwParaDlg(weld::Window *pParent,
     }
 
     // remove unwanted tabs for draw text box paragraph properties
-    if (bDrawParaDlg)
+    if (m_bDrawParaDlg)
     {
         RemoveTabPage("labelTP_NUMPARA");
         RemoveTabPage("labelTP_DROPCAPS");
@@ -148,7 +148,7 @@ SwParaDlg::~SwParaDlg()
 
 void SwParaDlg::PageCreated(const OString& rId, SfxTabPage& rPage)
 {
-    SwWrtShell& rSh = rView.GetWrtShell();
+    SwWrtShell& rSh = m_rView.GetWrtShell();
     SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
 
     // Table borders cannot get any shade in Writer
@@ -162,7 +162,7 @@ void SwParaDlg::PageCreated(const OString& rId, SfxTabPage& rPage)
         aSet.Put(SfxUInt16Item(SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH,
                             static_cast< sal_uInt16 >(rSh.GetAnyCurRect(CurRectType::PagePrt).Width()) ));
 
-        if (!bDrawParaDlg)
+        if (!m_bDrawParaDlg)
         {
             // See SvxStdParagraphTabPage::PageCreated: enable RegisterMode, AutoFirstLine, NegativeMode, ContextualMode
             constexpr tools::Long constTwips_0_5mm = o3tl::toTwips(5, o3tl::Length::mm10);
@@ -174,7 +174,7 @@ void SwParaDlg::PageCreated(const OString& rId, SfxTabPage& rPage)
     }
     else if (rId == "labelTP_PARA_ALIGN")
     {
-        if (!bDrawParaDlg)
+        if (!m_bDrawParaDlg)
         {
             aSet.Put(SfxBoolItem(SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,true));
             rPage.PageCreated(aSet);
@@ -205,7 +205,7 @@ void SwParaDlg::PageCreated(const OString& rId, SfxTabPage& rPage)
 
         static_cast<SwParagraphNumTabPage&>(rPage).EnableNewStart();
         weld::ComboBox& rBox = static_cast<SwParagraphNumTabPage&>(rPage).GetStyleBox();
-        SfxStyleSheetBasePool* pPool = rView.GetDocShell()->GetStyleSheetPool();
+        SfxStyleSheetBasePool* pPool = m_rView.GetDocShell()->GetStyleSheetPool();
         const SfxStyleSheetBase* pBase = pPool->First(SfxStyleFamily::Pseudo);
         std::set<OUString> aNames;
         while(pBase)
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 9f0531b77a67..9e3ba24a1f92 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -431,8 +431,8 @@ SwCaptionOptPage::SwCaptionOptPage(weld::Container* pPage, weld::DialogControlle
     , m_sBelow(SwResId(STR_CAPTION_BELOW))
     , m_sNone(SwResId(SW_STR_NONE))
     , m_nPrevSelectedEntry(-1)
-    , pMgr(new SwFieldMgr)
-    , bHTMLMode(false)
+    , m_pMgr(new SwFieldMgr)
+    , m_bHTMLMode(false)
     , m_aTextFilter(m_sNone)
     , m_xCheckLB(m_xBuilder->weld_tree_view("objects"))
     , m_xLbCaptionOrder(m_xBuilder->weld_combo_box("captionorder"))
@@ -468,9 +468,9 @@ SwCaptionOptPage::SwCaptionOptPage(weld::Container* pPage, weld::DialogControlle
     sal_uInt16 nSelFormat = SVX_NUM_ARABIC;
     if (pSh)
     {
-        for ( auto i = pMgr->GetFieldTypeCount(); i; )
+        for ( auto i = m_pMgr->GetFieldTypeCount(); i; )
         {
-            SwFieldType* pFieldType = pMgr->GetFieldType(SwFieldIds::Unknown, --i);
+            SwFieldType* pFieldType = m_pMgr->GetFieldType(SwFieldIds::Unknown, --i);
             if (!pFieldType->GetName().isEmpty()
                 && pFieldType->GetName() == m_xCategoryBox->get_active_text())
             {
@@ -482,11 +482,11 @@ SwCaptionOptPage::SwCaptionOptPage(weld::Container* pPage, weld::DialogControlle
         ::FillCharStyleListBox( *m_xCharStyleLB, pSh->GetView().GetDocShell(), true, true );
     }
 
-    const sal_uInt16 nCount = pMgr->GetFormatCount(SwFieldTypesEnum::Sequence, false);
+    const sal_uInt16 nCount = m_pMgr->GetFormatCount(SwFieldTypesEnum::Sequence, false);
     for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
-        const sal_uInt16 nFormatId = pMgr->GetFormatId(SwFieldTypesEnum::Sequence, i);
-        m_xFormatBox->append(OUString::number(nFormatId), pMgr->GetFormatStr(SwFieldTypesEnum::Sequence, i));
+        const sal_uInt16 nFormatId = m_pMgr->GetFormatId(SwFieldTypesEnum::Sequence, i);
+        m_xFormatBox->append(OUString::number(nFormatId), m_pMgr->GetFormatStr(SwFieldTypesEnum::Sequence, i));
         if (nFormatId == nSelFormat)
             m_xFormatBox->set_active(i);
     }
@@ -499,7 +499,7 @@ SwCaptionOptPage::SwCaptionOptPage(weld::Container* pPage, weld::DialogControlle
 
     if (pSh)
     {
-        SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(pMgr->GetFieldType(
+        SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(m_pMgr->GetFieldType(
                                             SwFieldIds::SetExp, m_xCategoryBox->get_active_text() ));
         if( pFieldType )
         {
@@ -528,7 +528,7 @@ SwCaptionOptPage::SwCaptionOptPage(weld::Container* pPage, weld::DialogControlle
 SwCaptionOptPage::~SwCaptionOptPage()
 {
     DelUserData();
-    pMgr.reset();
+    m_pMgr.reset();
     m_xPreview.reset();
 }
 
@@ -551,10 +551,10 @@ bool SwCaptionOptPage::FillItemSet( SfxItemSet* )
         if (m_xCheckLB->get_toggle(i) == TRISTATE_TRUE)
             ++nCheckCount;
         InsCaptionOpt* pData = weld::fromId<InsCaptionOpt*>(m_xCheckLB->get_id(i));
-        bRet |= pModOpt->SetCapOption(bHTMLMode, pData);
+        bRet |= pModOpt->SetCapOption(m_bHTMLMode, pData);
     }
 
-    pModOpt->SetInsWithCaption(bHTMLMode, nCheckCount > 0);
+    pModOpt->SetInsWithCaption(m_bHTMLMode, nCheckCount > 0);
 
     int nPos = m_xLbCaptionOrder->get_active();
     pModOpt->SetCaptionOrderNumberingFirst(nPos == 1);
@@ -566,7 +566,7 @@ void SwCaptionOptPage::Reset( const SfxItemSet* rSet)
 {
     if(const SfxUInt16Item* pItem = rSet->GetItemIfSet(SID_HTML_MODE, false))
     {
-        bHTMLMode = 0 != (pItem->GetValue() & HTMLMODE_ON);
+        m_bHTMLMode = 0 != (pItem->GetValue() & HTMLMODE_ON);
     }
 
     DelUserData();
@@ -622,7 +622,7 @@ void SwCaptionOptPage::SetOptions(const sal_uLong nPos,
         const SwCapObjType eObjType, const SvGlobalName *pOleId)
 {
     SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
-    const InsCaptionOpt* pOpt = pModOpt->GetCapOption(bHTMLMode, eObjType, pOleId);
+    const InsCaptionOpt* pOpt = pModOpt->GetCapOption(m_bHTMLMode, eObjType, pOleId);
 
     if (pOpt)
     {
@@ -669,11 +669,11 @@ void SwCaptionOptPage::UpdateEntry(int nSelEntry)
         m_xCategoryBox->append_text(m_sNone);
         if (pSh)
         {
-            const size_t nCount = pMgr->GetFieldTypeCount();
+            const size_t nCount = m_pMgr->GetFieldTypeCount();
 
             for (size_t i = 0; i < nCount; ++i)
             {
-                SwFieldType *pType = pMgr->GetFieldType( SwFieldIds::Unknown, i );
+                SwFieldType *pType = m_pMgr->GetFieldType( SwFieldIds::Unknown, i );
                 if( pType->Which() == SwFieldIds::SetExp &&
                     static_cast<SwSetExpFieldType *>( pType)->GetType() & nsSwGetSetExpType::GSE_SEQ )
                 {
@@ -868,7 +868,7 @@ void SwCaptionOptPage::InvalidatePreview()
             SwWrtShell *pSh = ::GetActiveWrtShell();
             if (pSh)
             {
-                SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(pMgr->GetFieldType(
+                SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(m_pMgr->GetFieldType(
                                                 SwFieldIds::SetExp, m_xCategoryBox->get_active_text() ));
                 if( pFieldType && pFieldType->GetOutlineLvl() < MAXLEVEL )
                 {
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 4374751f0f95..f6847a2f9cba 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -278,9 +278,9 @@ IMPL_LINK(SwContentOptPage, ShowOutlineContentVisibilityButtonHdl, weld::Togglea
 SwAddPrinterTabPage::SwAddPrinterTabPage(weld::Container* pPage, weld::DialogController* pController,
     const SfxItemSet& rCoreSet)
     : SfxTabPage(pPage, pController, "modules/swriter/ui/printoptionspage.ui", "PrintOptionsPage", &rCoreSet)
-    , sNone(SwResId(SW_STR_NONE))
-    , bAttrModified(false)
-    , bPreview(false)
+    , m_sNone(SwResId(SW_STR_NONE))
+    , m_bAttrModified(false)
+    , m_bPreview(false)
     , m_xGrfCB(m_xBuilder->weld_check_button("graphics"))
     , m_xCtrlFieldCB(m_xBuilder->weld_check_button("formcontrols"))
     , m_xBackgroundCB(m_xBuilder->weld_check_button("background"))
@@ -342,9 +342,9 @@ SwAddPrinterTabPage::~SwAddPrinterTabPage()
 
 void SwAddPrinterTabPage::SetPreview(bool bPrev)
 {
-    bPreview = bPrev;
-    m_xCommentsFrame->set_sensitive(!bPreview);
-    m_xPagesFrame->set_sensitive(!bPreview);
+    m_bPreview = bPrev;
+    m_xCommentsFrame->set_sensitive(!m_bPreview);
+    m_xPagesFrame->set_sensitive(!m_bPreview);
 }
 
 std::unique_ptr<SfxTabPage> SwAddPrinterTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
@@ -355,7 +355,7 @@ std::unique_ptr<SfxTabPage> SwAddPrinterTabPage::Create( weld::Container* pPage,
 
 bool    SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet )
 {
-    if ( bAttrModified )
+    if ( m_bAttrModified )
     {
         SwAddPrinterItem aAddPrinterAttr;
         aAddPrinterAttr.m_bPrintGraphic   = m_xGrfCB->get_active();
@@ -388,10 +388,10 @@ bool    SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet )
                                                         SwPostItMode::InMargins;
 
         const OUString sFax = m_xFaxLB->get_active_text();
-        aAddPrinterAttr.m_sFaxName = sNone == sFax ? OUString() : sFax;
+        aAddPrinterAttr.m_sFaxName = m_sNone == sFax ? OUString() : sFax;
         rCoreSet->Put(aAddPrinterAttr);
     }
-    return bAttrModified;
+    return m_bAttrModified;
 }
 
 void    SwAddPrinterTabPage::Reset( const SfxItemSet*  )
@@ -438,7 +438,7 @@ void    SwAddPrinterTabPage::Reset( const SfxItemSet*  )
 
 IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl, weld::Toggleable&, void)
 {
-    bAttrModified = true;
+    m_bAttrModified = true;
     bool bIsProspect = m_xProspectCB->get_active();
     if (!bIsProspect)
         m_xProspectCB_RTL->set_active( false );
@@ -452,7 +452,7 @@ IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl, weld::Toggleable&, void)
 
 void  SwAddPrinterTabPage::SetFax( const std::vector<OUString>& rFaxLst )
 {
-    m_xFaxLB->append_text(sNone);
+    m_xFaxLB->append_text(m_sNone);
     for(const auto & i : rFaxLst)
     {
         m_xFaxLB->append_text(i);
@@ -462,7 +462,7 @@ void  SwAddPrinterTabPage::SetFax( const std::vector<OUString>& rFaxLst )
 
 IMPL_LINK_NOARG(SwAddPrinterTabPage, SelectHdl, weld::ComboBox&, void)
 {
-    bAttrModified=true;
+    m_bAttrModified=true;
 }
 
 void SwAddPrinterTabPage::PageCreated( const SfxAllItemSet& aSet)
@@ -1373,7 +1373,7 @@ static sal_uInt16 aChangedAttrMap[] = { 0, 1, 2, 3, 4, 6, 7, 8, 9, 10 };
 SwMarkPreview::SwMarkPreview()
     : m_aTransCol(COL_TRANSPARENT)
     , m_aMarkCol(COL_LIGHTRED)
-    , nMarkPos(0)
+    , m_nMarkPos(0)
 
 {
     InitColors();
@@ -1402,10 +1402,10 @@ void SwMarkPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Recta
     const Size aSz(GetOutputSizePixel());
 
     // Page
-    aPage.SetSize(Size(aSz.Width() - 3, aSz.Height() - 3));
+    m_aPage.SetSize(Size(aSz.Width() - 3, aSz.Height() - 3));
 
-    const tools::Long nOutWPix = aPage.GetWidth();
-    const tools::Long nOutHPix = aPage.GetHeight();
+    const tools::Long nOutWPix = m_aPage.GetWidth();
+    const tools::Long nOutHPix = m_aPage.GetHeight();
 
     // PrintArea
     const tools::Long nLBorder = 8;
@@ -1413,50 +1413,50 @@ void SwMarkPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Recta
     const tools::Long nTBorder = 4;
     const tools::Long nBBorder = 4;
 
-    aLeftPagePrtArea = tools::Rectangle(Point(nLBorder, nTBorder), Point((nOutWPix - 1) - nRBorder, (nOutHPix - 1) - nBBorder));
-    const tools::Long nWidth = aLeftPagePrtArea.GetWidth();
+    m_aLeftPagePrtArea = tools::Rectangle(Point(nLBorder, nTBorder), Point((nOutWPix - 1) - nRBorder, (nOutHPix - 1) - nBBorder));
+    const tools::Long nWidth = m_aLeftPagePrtArea.GetWidth();
     const tools::Long nCorr = (nWidth & 1) != 0 ? 0 : 1;
-    aLeftPagePrtArea.SetSize(Size(nWidth / 2 - (nLBorder + nRBorder) / 2 + nCorr, aLeftPagePrtArea.GetHeight()));
+    m_aLeftPagePrtArea.SetSize(Size(nWidth / 2 - (nLBorder + nRBorder) / 2 + nCorr, m_aLeftPagePrtArea.GetHeight()));
 
-    aRightPagePrtArea = aLeftPagePrtArea;
-    aRightPagePrtArea.Move(aLeftPagePrtArea.GetWidth() + nLBorder + nRBorder + 1, 0);
+    m_aRightPagePrtArea = m_aLeftPagePrtArea;
+    m_aRightPagePrtArea.Move(m_aLeftPagePrtArea.GetWidth() + nLBorder + nRBorder + 1, 0);
 
     // draw shadow
-    tools::Rectangle aShadow(aPage);
+    tools::Rectangle aShadow(m_aPage);
     aShadow += Point(3, 3);
     drawRect(rRenderContext, aShadow, m_aShadowCol, m_aTransCol);
 
     // draw page
-    drawRect(rRenderContext, aPage, m_aBgCol, m_aLineCol);
+    drawRect(rRenderContext, m_aPage, m_aBgCol, m_aLineCol);
 
     // draw separator
-    tools::Rectangle aPageSeparator(aPage);
+    tools::Rectangle aPageSeparator(m_aPage);
     aPageSeparator.SetSize(Size(2, aPageSeparator.GetHeight()));
-    aPageSeparator.Move(aPage.GetWidth() / 2 - 1, 0);
+    aPageSeparator.Move(m_aPage.GetWidth() / 2 - 1, 0);
     drawRect(rRenderContext, aPageSeparator, m_aLineCol, m_aTransCol);
 
-    PaintPage(rRenderContext, aLeftPagePrtArea);
-    PaintPage(rRenderContext, aRightPagePrtArea);
+    PaintPage(rRenderContext, m_aLeftPagePrtArea);
+    PaintPage(rRenderContext, m_aRightPagePrtArea);
 
-    tools::Rectangle aLeftMark(Point(aPage.Left() + 2, aLeftPagePrtArea.Top() + 4), Size(aLeftPagePrtArea.Left() - 4, 2));
-    tools::Rectangle aRightMark(Point(aRightPagePrtArea.Right() + 2, aRightPagePrtArea.Bottom() - 6), Size(aLeftPagePrtArea.Left() - 4, 2));
+    tools::Rectangle aLeftMark(Point(m_aPage.Left() + 2, m_aLeftPagePrtArea.Top() + 4), Size(m_aLeftPagePrtArea.Left() - 4, 2));
+    tools::Rectangle aRightMark(Point(m_aRightPagePrtArea.Right() + 2, m_aRightPagePrtArea.Bottom() - 6), Size(m_aLeftPagePrtArea.Left() - 4, 2));
 
-    switch (nMarkPos)
+    switch (m_nMarkPos)
     {
         case 1:     // left
-            aRightMark.SetPos(Point(aRightPagePrtArea.Left() - 2 - aRightMark.GetWidth(), aRightMark.Top()));
+            aRightMark.SetPos(Point(m_aRightPagePrtArea.Left() - 2 - aRightMark.GetWidth(), aRightMark.Top()));
             break;
 
         case 2:     // right
-            aLeftMark.SetPos(Point(aLeftPagePrtArea.Right() + 2, aLeftMark.Top()));
+            aLeftMark.SetPos(Point(m_aLeftPagePrtArea.Right() + 2, aLeftMark.Top()));
             break;
 
         case 3:     // outside
             break;
 
         case 4:     // inside
-            aLeftMark.SetPos(Point(aLeftPagePrtArea.Right() + 2, aLeftMark.Top()));
-            aRightMark.SetPos(Point(aRightPagePrtArea.Left() - 2 - aRightMark.GetWidth(), aRightMark.Top()));
+            aLeftMark.SetPos(Point(m_aLeftPagePrtArea.Right() + 2, aLeftMark.Top()));
+            aRightMark.SetPos(Point(m_aRightPagePrtArea.Left() - 2 - aRightMark.GetWidth(), aRightMark.Top()));
             break;
 
         case 0:     // none
@@ -1489,7 +1489,7 @@ void SwMarkPreview::PaintPage(vcl::RenderContext& rRenderContext, const tools::R
         if (i == (nLines - 1))
             aTextLine.SetSize(Size(aTextLine.GetWidth() / 2, aTextLine.GetHeight()));
 
-        if (aPage.Contains(aTextLine))
+        if (m_aPage.Contains(aTextLine))
             drawRect(rRenderContext, aTextLine, m_aTextCol, m_aTransCol);
 
         aTextLine.Move(0, nStep);
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index 17964daa63ef..79a3b6f463a7 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -136,8 +136,8 @@ private:
 
     int m_nPrevSelectedEntry;
 
-    std::unique_ptr<SwFieldMgr> pMgr;
-    bool bHTMLMode;
+    std::unique_ptr<SwFieldMgr> m_pMgr;
+    bool m_bHTMLMode;
 
     TextFilterAutoConvert m_aTextFilter;
 
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index 7bb77695140f..3b252d455990 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -76,9 +76,9 @@ public:
 // TabPage printer settings additions
 class SwAddPrinterTabPage final : public SfxTabPage
 {
-    OUString sNone;
-    bool bAttrModified;
-    bool bPreview;
+    OUString m_sNone;
+    bool m_bAttrModified;
+    bool m_bPreview;
 
     std::unique_ptr<weld::CheckButton>  m_xGrfCB;
     std::unique_ptr<weld::CheckButton>  m_xCtrlFieldCB;
@@ -268,11 +268,11 @@ class SwMarkPreview final : public weld::CustomWidgetController
     Color m_aTextCol;    // text
     Color m_aPrintAreaCol; // frame for print area
 
-    tools::Rectangle aPage;
-    tools::Rectangle aLeftPagePrtArea;
-    tools::Rectangle aRightPagePrtArea;
+    tools::Rectangle m_aPage;
+    tools::Rectangle m_aLeftPagePrtArea;
+    tools::Rectangle m_aRightPagePrtArea;
 
-    sal_uInt16 nMarkPos;
+    sal_uInt16 m_nMarkPos;
 
     virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
     void PaintPage(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect);
@@ -284,7 +284,7 @@ public:
     virtual ~SwMarkPreview() override;
 
     void SetColor(const Color& rCol) { m_aMarkCol = rCol; }
-    void SetMarkPos(sal_uInt16 nPos) { nMarkPos = nPos; }
+    void SetMarkPos(sal_uInt16 nPos) { m_nMarkPos = nPos; }
 };
 
 // redlining options
diff --git a/sw/source/uibase/inc/swuipardlg.hxx b/sw/source/uibase/inc/swuipardlg.hxx
index de5e83828a91..c6887dc9d57b 100644
--- a/sw/source/uibase/inc/swuipardlg.hxx
+++ b/sw/source/uibase/inc/swuipardlg.hxx
@@ -25,8 +25,8 @@
 
 class SwParaDlg final : public SfxTabDialogController
 {
-    SwView& rView;
-    bool bDrawParaDlg;
+    SwView& m_rView;
+    bool m_bDrawParaDlg;
 
     void PageCreated(const OString& rId, SfxTabPage& rPage) override;