sw/source/ui/config/optpage.cxx | 8 ++--- sw/source/ui/dialog/docstdlg.cxx | 4 +- sw/source/ui/envelp/envfmt.cxx | 20 +++++++------- sw/source/ui/envelp/envlop1.cxx | 38 +++++++++++++-------------- sw/source/ui/envelp/envprt.cxx | 4 +- sw/source/ui/misc/outline.cxx | 52 +++++++++++++++++++------------------- sw/source/uibase/inc/docstdlg.hxx | 2 - sw/source/uibase/inc/envlop.hxx | 10 +++---- sw/source/uibase/inc/numprevw.hxx | 32 +++++++++++------------ sw/source/uibase/inc/optpage.hxx | 2 - 10 files changed, 86 insertions(+), 86 deletions(-)
New commits: commit bc209dd6689816c2c1fa93c1bab289465b7419a8 Author: Miklos Vajna <[email protected]> AuthorDate: Mon Aug 22 08:10:08 2022 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Aug 22 10:48:20 2022 +0200 sw: prefix members of NumberingPreview, SwDocStatPage, SwEnvDlg and ... ... SwTestTabPage See tdf#94879 for motivation. Change-Id: Ie60001ada507d5355715ebaaed3897de9854f7d4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138655 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index f6847a2f9cba..d0ecb19a357e 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -2103,7 +2103,7 @@ IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl, weld::Toggleable&, void) SwTestTabPage::SwTestTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet) : SfxTabPage(pPage, pController, "modules/swriter/ui/opttestpage.ui", "OptTestPage", &rCoreSet) - , bAttrModified( false ) + , m_bAttrModified( false ) , m_xTest1CBox(m_xBuilder->weld_check_button("unused")) , m_xTest2CBox(m_xBuilder->weld_check_button("dynamic")) , m_xTest3CBox(m_xBuilder->weld_check_button("nocalm")) @@ -2131,7 +2131,7 @@ std::unique_ptr<SfxTabPage> SwTestTabPage::Create( weld::Container* pPage, weld: bool SwTestTabPage::FillItemSet( SfxItemSet* rCoreSet ) { - if ( bAttrModified ) + if ( m_bAttrModified ) { SwTestItem aTestItem; aTestItem.m_bTest1=m_xTest1CBox->get_active(); @@ -2146,7 +2146,7 @@ bool SwTestTabPage::FillItemSet( SfxItemSet* rCoreSet ) aTestItem.m_bTest10=m_xTest10CBox->get_active(); rCoreSet->Put(aTestItem); } - return bAttrModified; + return m_bAttrModified; } void SwTestTabPage::Reset( const SfxItemSet* ) @@ -2186,7 +2186,7 @@ void SwTestTabPage::Init() IMPL_LINK_NOARG(SwTestTabPage, AutoClickHdl, weld::Toggleable&, void) { - bAttrModified = true; + m_bAttrModified = true; } #endif diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 86672990f308..2701ec015e6c 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -108,10 +108,10 @@ void SwDocStatPage::Update() SwWait aWait( *pSh->GetDoc()->GetDocShell(), true ); pSh->StartAction(); - aDocStat = pSh->GetDoc()->getIDocumentStatistics().GetUpdatedDocStat( false, true ); + m_aDocStat = pSh->GetDoc()->getIDocumentStatistics().GetUpdatedDocStat( false, true ); pSh->EndAction(); - SetData(aDocStat); + SetData(m_aDocStat); } IMPL_LINK_NOARG(SwDocStatPage, UpdateHdl, weld::Button&, void) diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 26cd00923873..fd0ad0915249 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -150,7 +150,7 @@ IMPL_LINK( SwEnvFormatPage, ModifyHdl, weld::MetricSpinButton&, rEdit, void ) } else { - FillItem(GetParentSwEnvDlg()->aEnvItem); + FillItem(GetParentSwEnvDlg()->m_aEnvItem); SetMinMax(); m_xPreview->queue_draw(); } @@ -168,7 +168,7 @@ IMPL_LINK(SwEnvFormatPage, SendEditHdl, const OString&, rIdent, void) void SwEnvFormatPage::Edit(std::string_view rIdent, bool bSender) { - SwWrtShell* pSh = GetParentSwEnvDlg()->pSh; + SwWrtShell* pSh = GetParentSwEnvDlg()->m_pSh; OSL_ENSURE(pSh, "Shell missing"); SwTextFormatColl* pColl = pSh->GetTextCollFromPool( static_cast< sal_uInt16 >( @@ -250,7 +250,7 @@ void SwEnvFormatPage::Edit(std::string_view rIdent, bool bSender) // A temporary Itemset that gets discarded at abort SfxItemSet *SwEnvFormatPage::GetCollItemSet(SwTextFormatColl const * pColl, bool bSender) { - std::unique_ptr<SfxItemSet>& pAddrSet = bSender ? GetParentSwEnvDlg()->pSenderSet : GetParentSwEnvDlg()->pAddresseeSet; + std::unique_ptr<SfxItemSet>& pAddrSet = bSender ? GetParentSwEnvDlg()->m_pSenderSet : GetParentSwEnvDlg()->m_pAddresseeSet; if (!pAddrSet) { // determine range (merge both Itemsets' ranges) @@ -267,7 +267,7 @@ SfxItemSet *SwEnvFormatPage::GetCollItemSet(SwTextFormatColl const * pColl, bool SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER >); - pAddrSet.reset(new SfxItemSet(GetParentSwEnvDlg()->pSh->GetView().GetCurShell()->GetPool(), + pAddrSet.reset(new SfxItemSet(GetParentSwEnvDlg()->m_pSh->GetView().GetCurShell()->GetPool(), pRanges)); for (const auto& rPair : aRanges) pAddrSet->MergeRange(rPair.first, rPair.second); @@ -314,7 +314,7 @@ IMPL_LINK_NOARG(SwEnvFormatPage, FormatHdl, weld::ComboBox&, void) SetMinMax(); - FillItem(GetParentSwEnvDlg()->aEnvItem); + FillItem(GetParentSwEnvDlg()->m_aEnvItem); m_xPreview->queue_draw(); } @@ -345,7 +345,7 @@ std::unique_ptr<SfxTabPage> SwEnvFormatPage::Create(weld::Container* pPage, weld void SwEnvFormatPage::ActivatePage(const SfxItemSet& rSet) { SfxItemSet aSet(rSet); - aSet.Put(GetParentSwEnvDlg()->aEnvItem); + aSet.Put(GetParentSwEnvDlg()->m_aEnvItem); Reset(&aSet); } @@ -382,8 +382,8 @@ void SwEnvFormatPage::FillItem(SwEnvItem& rItem) bool SwEnvFormatPage::FillItemSet(SfxItemSet* rSet) { - FillItem(GetParentSwEnvDlg()->aEnvItem); - rSet->Put(GetParentSwEnvDlg()->aEnvItem); + FillItem(GetParentSwEnvDlg()->m_aEnvItem); + rSet->Put(GetParentSwEnvDlg()->m_aEnvItem); return true; } @@ -407,8 +407,8 @@ void SwEnvFormatPage::Reset(const SfxItemSet* rSet) setfieldval(*m_xSizeHeightField , std::min(rItem.m_nWidth, rItem.m_nHeight)); SetMinMax(); - GetParentSwEnvDlg()->pSenderSet.reset(); - GetParentSwEnvDlg()->pAddresseeSet.reset(); + GetParentSwEnvDlg()->m_pSenderSet.reset(); + GetParentSwEnvDlg()->m_pAddresseeSet.reset(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 5e27412aca59..b8c990cb30a8 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -59,7 +59,7 @@ void SwEnvPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectan rRenderContext.SetBackground(rRenderContext.GetSettings().GetStyleSettings().GetDialogColor()); rRenderContext.Erase(); - const SwEnvItem& rItem = m_pDialog->aEnvItem; + const SwEnvItem& rItem = m_pDialog->m_aEnvItem; const tools::Long nPageW = std::max(rItem.m_nWidth, rItem.m_nHeight); const tools::Long nPageH = std::min(rItem.m_nWidth, rItem.m_nHeight); @@ -119,9 +119,9 @@ void SwEnvPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectan SwEnvDlg::SwEnvDlg(weld::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert) : SfxTabDialogController(pParent, "modules/swriter/ui/envdialog.ui", "EnvDialog", &rSet) - , aEnvItem(static_cast<const SwEnvItem&>( rSet.Get(FN_ENVELOP))) - , pSh(pWrtSh) - , pPrinter(pPrt) + , m_aEnvItem(static_cast<const SwEnvItem&>( rSet.Get(FN_ENVELOP))) + , m_pSh(pWrtSh) + , m_pPrinter(pPrt) , m_xModify(m_xBuilder->weld_button("modify")) { if (!bInsert) @@ -136,15 +136,15 @@ SwEnvDlg::SwEnvDlg(weld::Window* pParent, const SfxItemSet& rSet, SwEnvDlg::~SwEnvDlg() { - pAddresseeSet.reset(); - pSenderSet.reset(); + m_pAddresseeSet.reset(); + m_pSenderSet.reset(); } void SwEnvDlg::PageCreated(const OString& rId, SfxTabPage &rPage) { if (rId == "printer") { - static_cast<SwEnvPrtPage*>(&rPage)->SetPrt(pPrinter); + static_cast<SwEnvPrtPage*>(&rPage)->SetPrt(m_pPrinter); } else if (rId == "envelope") { @@ -162,15 +162,15 @@ short SwEnvDlg::Ok() if (nRet == RET_OK || nRet == RET_USER) { - if (pAddresseeSet) + if (m_pAddresseeSet) { - SwTextFormatColl* pColl = pSh->GetTextCollFromPool(RES_POOLCOLL_ENVELOPE_ADDRESS); - pColl->SetFormatAttr(*pAddresseeSet); + SwTextFormatColl* pColl = m_pSh->GetTextCollFromPool(RES_POOLCOLL_ENVELOPE_ADDRESS); + pColl->SetFormatAttr(*m_pAddresseeSet); } - if (pSenderSet) + if (m_pSenderSet) { - SwTextFormatColl* pColl = pSh->GetTextCollFromPool(RES_POOLCOLL_SEND_ADDRESS); - pColl->SetFormatAttr(*pSenderSet); + SwTextFormatColl* pColl = m_pSh->GetTextCollFromPool(RES_POOLCOLL_SEND_ADDRESS); + pColl->SetFormatAttr(*m_pSenderSet); } } @@ -207,7 +207,7 @@ SwEnvPage::SwEnvPage(weld::Container* pPage, weld::DialogController* pController void SwEnvPage::Init(SwEnvDlg* pDialog) { m_pDialog = pDialog; - m_pSh = m_pDialog->pSh; + m_pSh = m_pDialog->m_pSh; m_aPreview.SetDialog(pDialog); // Install handlers @@ -259,7 +259,7 @@ IMPL_LINK_NOARG(SwEnvPage, FieldHdl, weld::Button&, void) IMPL_LINK_NOARG(SwEnvPage, SenderHdl, weld::Toggleable&, void) { const bool bEnable = m_xSenderBox->get_active(); - GetParentSwEnvDlg()->aEnvItem.m_bSend = bEnable; + GetParentSwEnvDlg()->m_aEnvItem.m_bSend = bEnable; m_xSenderEdit->set_sensitive(bEnable); if (bEnable) { @@ -302,13 +302,13 @@ std::unique_ptr<SfxTabPage> SwEnvPage::Create(weld::Container* pPage, weld::Dial void SwEnvPage::ActivatePage(const SfxItemSet& rSet) { SfxItemSet aSet(rSet); - aSet.Put(GetParentSwEnvDlg()->aEnvItem); + aSet.Put(GetParentSwEnvDlg()->m_aEnvItem); Reset(&aSet); } DeactivateRC SwEnvPage::DeactivatePage(SfxItemSet* _pSet) { - FillItem(GetParentSwEnvDlg()->aEnvItem); + FillItem(GetParentSwEnvDlg()->m_aEnvItem); if( _pSet ) FillItemSet(_pSet); return DeactivateRC::LeavePage; @@ -323,8 +323,8 @@ void SwEnvPage::FillItem(SwEnvItem& rItem) bool SwEnvPage::FillItemSet(SfxItemSet* rSet) { - FillItem(GetParentSwEnvDlg()->aEnvItem); - rSet->Put(GetParentSwEnvDlg()->aEnvItem); + FillItem(GetParentSwEnvDlg()->m_aEnvItem); + rSet->Put(GetParentSwEnvDlg()->m_aEnvItem); return true; } diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index a55ef0d526a2..d08f718e1f37 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -163,8 +163,8 @@ void SwEnvPrtPage::FillItem(SwEnvItem& rItem) bool SwEnvPrtPage::FillItemSet(SfxItemSet* rSet) { - FillItem(GetParentSwEnvDlg()->aEnvItem); - rSet->Put(GetParentSwEnvDlg()->aEnvItem); + FillItem(GetParentSwEnvDlg()->m_aEnvItem); + rSet->Put(GetParentSwEnvDlg()->m_aEnvItem); return true; } diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 533028ebe09b..bc9da0c73231 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -881,13 +881,13 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Re pVDev->SetLineColor(SwViewOption::GetDocBoundariesColor()); pVDev->DrawRect(tools::Rectangle(Point(0,0), aSize)); - if (pActNum) + if (m_pActNum) { tools::Long nWidthRelation = 30; // chapter dialog - if(nPageWidth) + if(m_nPageWidth) { - nWidthRelation = nPageWidth / aSize.Width(); - if(bPosition) + nWidthRelation = m_nPageWidth / aSize.Width(); + if(m_bPosition) nWidthRelation = nWidthRelation * 2 / 3; else nWidthRelation = nWidthRelation / 4; @@ -897,24 +897,24 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Re const tools::Long nXStep = aSize.Width() / (3 * MAXLEVEL * ((MAXLEVEL < 10) ? 2 : 1)); const tools::Long nYStep = (aSize.Height() - 6)/ MAXLEVEL; tools::Long nYStart = 4; - aStdFont = OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS, GetAppLanguage(), + m_aStdFont = OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS, GetAppLanguage(), GetDefaultFontFlags::OnlyOne, &rRenderContext); if (svtools::ColorConfig().GetColorValue(svtools::FONTCOLOR, false).nColor == COL_AUTO) - aStdFont.SetColor( SwViewOption::GetDocColor().IsDark() ? COL_WHITE : COL_BLACK ); + m_aStdFont.SetColor( SwViewOption::GetDocColor().IsDark() ? COL_WHITE : COL_BLACK ); else - aStdFont.SetColor( SwViewOption::GetFontColor() ); + m_aStdFont.SetColor( SwViewOption::GetFontColor() ); - const tools::Long nFontHeight = nYStep * ( bPosition ? 15 : 6 ) / 10; - aStdFont.SetFontSize(Size( 0, nFontHeight )); + const tools::Long nFontHeight = nYStep * ( m_bPosition ? 15 : 6 ) / 10; + m_aStdFont.SetFontSize(Size( 0, nFontHeight )); - tools::Long nPreNum = pActNum->Get(0).GetStart(); + tools::Long nPreNum = m_pActNum->Get(0).GetStart(); - if (bPosition) + if (m_bPosition) { const tools::Long nLineHeight = nFontHeight * 8 / 7; sal_uInt8 nStart = 0; - while (!(nActLevel & (1 << nStart))) + while (!(m_nActLevel & (1 << nStart))) { nStart++; } @@ -925,7 +925,7 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Re sal_uInt8 nEnd = std::min(sal_uInt8(nStart + 3), MAXLEVEL); for (sal_uInt8 nLevel = nStart; nLevel < nEnd; ++nLevel) { - const SwNumFormat &rFormat = pActNum->Get(nLevel); + const SwNumFormat &rFormat = m_pActNum->Get(nLevel); aNumVector.push_back(rFormat.GetStart()); tools::Long nXStart( 0 ); @@ -958,14 +958,14 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Re else if (SVX_NUM_CHAR_SPECIAL == rFormat.GetNumberingType()) { nBulletWidth = lcl_DrawBullet(pVDev.get(), rFormat, nNumberXPos, - nYStart, aStdFont.GetFontSize()); + nYStart, m_aStdFont.GetFontSize()); } else { - pVDev->SetFont(aStdFont); - if(pActNum->IsContinusNum()) + pVDev->SetFont(m_aStdFont); + if(m_pActNum->IsContinusNum()) aNumVector[nLevel] = nPreNum; - OUString aText(pActNum->MakeNumString( aNumVector )); + OUString aText(m_pActNum->MakeNumString( aNumVector )); pVDev->DrawText( Point(nNumberXPos, nYStart), aText ); nBulletWidth = pVDev->GetTextWidth(aText); nPreNum++; @@ -973,7 +973,7 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Re if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT && rFormat.GetLabelFollowedBy() == SvxNumberFormat::SPACE ) { - pVDev->SetFont(aStdFont); + pVDev->SetFont(m_aStdFont); OUString aText(' '); pVDev->DrawText( Point(nNumberXPos, nYStart), aText ); nBulletWidth += pVDev->GetTextWidth(aText); @@ -1028,7 +1028,7 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Re const tools::Long nLineHeight = nFontHeight * 3 / 2; for (sal_uInt8 nLevel = 0; nLevel < MAXLEVEL; ++nLevel, nYStart = nYStart + nYStep) { - const SwNumFormat &rFormat = pActNum->Get(nLevel); + const SwNumFormat &rFormat = m_pActNum->Get(nLevel); aNumVector.push_back(rFormat.GetStart()); tools::Long nXStart(0); if (rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION) @@ -1050,25 +1050,25 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Re } else if (SVX_NUM_CHAR_SPECIAL == rFormat.GetNumberingType()) { - nTextOffset = lcl_DrawBullet(pVDev.get(), rFormat, nXStart, nYStart, aStdFont.GetFontSize()); + nTextOffset = lcl_DrawBullet(pVDev.get(), rFormat, nXStart, nYStart, m_aStdFont.GetFontSize()); nTextOffset += nXStep; } else { - pVDev->SetFont(aStdFont); - if (pActNum->IsContinusNum()) + pVDev->SetFont(m_aStdFont); + if (m_pActNum->IsContinusNum()) aNumVector[nLevel] = nPreNum; - OUString aText(pActNum->MakeNumString( aNumVector )); + OUString aText(m_pActNum->MakeNumString( aNumVector )); pVDev->DrawText( Point(nXStart, nYStart), aText ); nTextOffset = pVDev->GetTextWidth(aText) + nXStep; nPreNum++; } - pVDev->SetFont(aStdFont); + pVDev->SetFont(m_aStdFont); pVDev->DrawText( Point(nXStart + nTextOffset, nYStart), - (pOutlineNames == nullptr + (m_pOutlineNames == nullptr ? utl::ConfigManager::getProductName() - : pOutlineNames[nLevel])); + : m_pOutlineNames[nLevel])); } } } diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx index 56119d057fbd..3642b9fd7175 100644 --- a/sw/source/uibase/inc/docstdlg.hxx +++ b/sw/source/uibase/inc/docstdlg.hxx @@ -49,7 +49,7 @@ private: std::unique_ptr<weld::Label> m_xLineNo; std::unique_ptr<weld::Button> m_xUpdatePB; - SwDocStat aDocStat; + SwDocStat m_aDocStat; void Update(); diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 49a1d9429578..6a527b46c206 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -63,11 +63,11 @@ class SwEnvDlg final : public SfxTabDialogController friend class SwEnvPrtPage; friend class SwEnvPreview; - SwEnvItem aEnvItem; - SwWrtShell* pSh; - VclPtr<Printer> pPrinter; - std::unique_ptr<SfxItemSet> pAddresseeSet; - std::unique_ptr<SfxItemSet> pSenderSet; + SwEnvItem m_aEnvItem; + SwWrtShell* m_pSh; + VclPtr<Printer> m_pPrinter; + std::unique_ptr<SfxItemSet> m_pAddresseeSet; + std::unique_ptr<SfxItemSet> m_pSenderSet; std::unique_ptr<weld::Button> m_xModify; diff --git a/sw/source/uibase/inc/numprevw.hxx b/sw/source/uibase/inc/numprevw.hxx index 3c9059c06cec..2f858be6fd4e 100644 --- a/sw/source/uibase/inc/numprevw.hxx +++ b/sw/source/uibase/inc/numprevw.hxx @@ -27,39 +27,39 @@ namespace rtl { class OUString; } class NumberingPreview final : public weld::CustomWidgetController { - const SwNumRule* pActNum; - vcl::Font aStdFont; - tools::Long nPageWidth; - const OUString* pOutlineNames; - bool bPosition; - sal_uInt16 nActLevel; + const SwNumRule* m_pActNum; + vcl::Font m_aStdFont; + tools::Long m_nPageWidth; + const OUString* m_pOutlineNames; + bool m_bPosition; + sal_uInt16 m_nActLevel; private: virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; public: NumberingPreview() - : pActNum(nullptr) - , nPageWidth(0) - , pOutlineNames(nullptr) - , bPosition(false) - , nActLevel(USHRT_MAX) + : m_pActNum(nullptr) + , m_nPageWidth(0) + , m_pOutlineNames(nullptr) + , m_bPosition(false) + , m_nActLevel(USHRT_MAX) { } void SetNumRule(const SwNumRule* pNum) { - pActNum = pNum; + m_pActNum = pNum; Invalidate(); } void SetPageWidth(tools::Long nPgWidth) - {nPageWidth = nPgWidth;} + {m_nPageWidth = nPgWidth;} void SetOutlineNames(const OUString* pNames) - {pOutlineNames = pNames;} + {m_pOutlineNames = pNames;} void SetPositionMode() - { bPosition = true;} - void SetLevel(sal_uInt16 nSet) {nActLevel = nSet;} + { m_bPosition = true;} + void SetLevel(sal_uInt16 nSet) {m_nActLevel = nSet;} }; #endif diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 3b252d455990..b83d2f5abd61 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -344,7 +344,7 @@ public: virtual void Reset( const SfxItemSet* rSet ) override; private: - bool bAttrModified; + bool m_bAttrModified; std::unique_ptr<weld::CheckButton> m_xTest1CBox; std::unique_ptr<weld::CheckButton> m_xTest2CBox;
