sw/source/ui/fldui/fldref.cxx | 30 +++++++++++++++---------------
sw/source/ui/fldui/fldref.hxx | 10 +++++-----
sw/source/ui/fldui/fldvar.cxx | 32 ++++++++++++++++----------------
sw/source/ui/fldui/fldvar.hxx | 8 ++++----
sw/source/ui/frmdlg/frmpage.cxx | 36 ++++++++++++++++++------------------
sw/source/ui/misc/pgfnote.cxx | 20 ++++++++++----------
sw/source/uibase/inc/bmpwin.hxx | 14 +++++++-------
sw/source/uibase/inc/pgfnote.hxx | 2 +-
8 files changed, 76 insertions(+), 76 deletions(-)
New commits:
commit 3b37482bf1fecd9e28bef454bc6a49a5c66c716d
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Nov 3 07:58:28 2022 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Nov 3 09:08:00 2022 +0100
sw: prefix members of BmpWindow, SwFieldRefPage, SwFieldVarPage and ...
... SwFootNotePage
See tdf#94879 for motivation.
Change-Id: Ie665eca504a7092db68591942a527c671a151c3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142191
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index bae2557f173d..b7a30d589196 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -76,12 +76,12 @@ SwFieldRefPage::SwFieldRefPage(weld::Container* pPage,
weld::DialogController* p
m_xFormatLB->append_text(SwResId(FLD_REF_PAGE_TYPES[i]));
}
- sBookmarkText = m_xTypeLB->get_text(0);
- sFootnoteText = m_xTypeLB->get_text(1);
- sEndnoteText = m_xTypeLB->get_text(2);
+ m_sBookmarkText = m_xTypeLB->get_text(0);
+ m_sFootnoteText = m_xTypeLB->get_text(1);
+ m_sEndnoteText = m_xTypeLB->get_text(2);
// #i83479#
- sHeadingText = m_xTypeLB->get_text(3);
- sNumItemText = m_xTypeLB->get_text(4);
+ m_sHeadingText = m_xTypeLB->get_text(3);
+ m_sNumItemText = m_xTypeLB->get_text(4);
auto nHeight = m_xTypeLB->get_height_rows(8);
auto nWidth = m_xTypeLB->get_approximate_digit_width() *
FIELD_COLUMN_WIDTH;
@@ -191,8 +191,8 @@ void SwFieldRefPage::Reset(const SfxItemSet* )
// #i83479#
// entries for headings and numbered items
- m_xTypeLB->append(OUString::number(REFFLDFLAG_HEADING), sHeadingText);
- m_xTypeLB->append(OUString::number(REFFLDFLAG_NUMITEM), sNumItemText);
+ m_xTypeLB->append(OUString::number(REFFLDFLAG_HEADING), m_sHeadingText);
+ m_xTypeLB->append(OUString::number(REFFLDFLAG_NUMITEM), m_sNumItemText);
// fill up with the sequence types
SwWrtShell *pSh = GetWrtShell();
@@ -226,18 +226,18 @@ void SwFieldRefPage::Reset(const SfxItemSet* )
}
// text marks - now always (because of globaldocuments)
- m_xTypeLB->append(OUString::number(REFFLDFLAG_BOOKMARK), sBookmarkText);
+ m_xTypeLB->append(OUString::number(REFFLDFLAG_BOOKMARK), m_sBookmarkText);
// footnotes:
if( pSh->HasFootnotes() )
{
- m_xTypeLB->append(OUString::number(REFFLDFLAG_FOOTNOTE),
sFootnoteText);
+ m_xTypeLB->append(OUString::number(REFFLDFLAG_FOOTNOTE),
m_sFootnoteText);
}
// endnotes:
if ( pSh->HasFootnotes(true) )
{
- m_xTypeLB->append(OUString::number(REFFLDFLAG_ENDNOTE), sEndnoteText);
+ m_xTypeLB->append(OUString::number(REFFLDFLAG_ENDNOTE),
m_sEndnoteText);
}
m_xTypeLB->thaw();
@@ -315,30 +315,30 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, weld::TreeView&,
void)
if ( pRefField &&
pRefField->IsRefToHeadingCrossRefBookmark() )
{
- sName = sHeadingText;
+ sName = m_sHeadingText;
nFlag = REFFLDFLAG_HEADING;
}
else if ( pRefField &&
pRefField->IsRefToNumItemCrossRefBookmark() )
{
- sName = sNumItemText;
+ sName = m_sNumItemText;
nFlag = REFFLDFLAG_NUMITEM;
}
else
{
- sName = sBookmarkText;
+ sName = m_sBookmarkText;
nFlag = REFFLDFLAG_BOOKMARK;
}
}
break;
case REF_FOOTNOTE:
- sName = sFootnoteText;
+ sName = m_sFootnoteText;
nFlag = REFFLDFLAG_FOOTNOTE;
break;
case REF_ENDNOTE:
- sName = sEndnoteText;
+ sName = m_sEndnoteText;
nFlag = REFFLDFLAG_ENDNOTE;
break;
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index 8dc9a311bcfe..68dc6f6480be 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -28,12 +28,12 @@ class SwTextNode;
class SwFieldRefPage : public SwFieldPage
{
- OUString sBookmarkText;
- OUString sFootnoteText;
- OUString sEndnoteText;
+ OUString m_sBookmarkText;
+ OUString m_sFootnoteText;
+ OUString m_sEndnoteText;
// #i83479#
- OUString sHeadingText;
- OUString sNumItemText;
+ OUString m_sHeadingText;
+ OUString m_sNumItemText;
IDocumentOutlineNodes::tSortedOutlineNodeList maOutlineNodes;
IDocumentListItems::tSortedNodeNumList maNumItems;
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 13621af7066e..5116ae438780 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -58,8 +58,8 @@ SwFieldVarPage::SwFieldVarPage(weld::Container* pPage,
weld::DialogController* p
, m_xSeparatorED(m_xBuilder->weld_entry("separator"))
, m_xNewPB(m_xBuilder->weld_button("apply"))
, m_xDelPB(m_xBuilder->weld_button("delete"))
- , nOldFormat(0)
- , bInit(true)
+ , m_nOldFormat(0)
+ , m_bInit(true)
{
FillFieldSelect(*m_xTypeLB);
m_xSelectionLB->make_sorted();
@@ -71,8 +71,8 @@ SwFieldVarPage::SwFieldVarPage(weld::Container* pPage,
weld::DialogController* p
m_xSelectionLB->set_size_request(nWidth, nHeight);
m_xFormatLB->set_size_request(nWidth, nHeight/2);
- sOldValueFT = m_xValueFT->get_label();
- sOldNameFT = m_xNameFT->get_label();
+ m_sOldValueFT = m_xValueFT->get_label();
+ m_sOldNameFT = m_xNameFT->get_label();
for (sal_uInt16 i = 1; i <= MAXLEVEL; i++)
m_xChapterLevelLB->append_text(OUString::number(i));
@@ -181,7 +181,7 @@ void SwFieldVarPage::Reset(const SfxItemSet* )
{
m_xSelectionLB->save_value();
m_xFormatLB->save_value();
- nOldFormat = m_xNumFormatLB->GetFormat();
+ m_nOldFormat = m_xNumFormatLB->GetFormat();
m_xNameED->save_value();
m_xValueED->save_value();
m_xInvisibleCB->save_state();
@@ -206,7 +206,7 @@ IMPL_LINK_NOARG(SwFieldVarPage, TypeHdl, weld::TreeView&,
void)
if (nOld != GetTypeSel() || nOld == -1)
{
- bInit = true;
+ m_bInit = true;
if (nOld != -1)
{
m_xNameED->set_text(OUString());
@@ -217,7 +217,7 @@ IMPL_LINK_NOARG(SwFieldVarPage, TypeHdl, weld::TreeView&,
void)
UpdateSubType(); // initialise selection-listboxes
}
- bInit = false;
+ m_bInit = false;
}
IMPL_LINK( SwFieldVarPage, SubTypeListBoxHdl, weld::TreeView&, rBox, void )
@@ -234,7 +234,7 @@ void SwFieldVarPage::SubTypeHdl(const weld::TreeView* pBox)
if (nSelPos != -1)
nSelData = m_xSelectionLB->get_id(nSelPos).toUInt32();
- if (IsFieldEdit() && (!pBox || bInit))
+ if (IsFieldEdit() && (!pBox || m_bInit))
{
if (nTypeId != SwFieldTypesEnum::Formel)
m_xNameED->set_text(GetFieldMgr().GetCurFieldPar1());
@@ -242,10 +242,10 @@ void SwFieldVarPage::SubTypeHdl(const weld::TreeView*
pBox)
m_xValueED->set_text(GetFieldMgr().GetCurFieldPar2());
}
- if (m_xNameFT->get_label() != sOldNameFT)
- m_xNameFT->set_label(sOldNameFT);
- if (m_xValueFT->get_label() != sOldValueFT)
- m_xValueFT->set_label(sOldValueFT);
+ if (m_xNameFT->get_label() != m_sOldNameFT)
+ m_xNameFT->set_label(m_sOldNameFT);
+ if (m_xValueFT->get_label() != m_sOldValueFT)
+ m_xValueFT->set_label(m_sOldValueFT);
FillFormatLB(nTypeId);
@@ -267,7 +267,7 @@ void SwFieldVarPage::SubTypeHdl(const weld::TreeView* pBox)
{
if (!IsFieldEdit())
{
- if (pBox || (bInit && !IsRefresh())) // only when
interacting via mouse
+ if (pBox || (m_bInit && !IsRefresh())) // only when
interacting via mouse
{
m_xNameED->set_text(pType->GetName());
@@ -420,7 +420,7 @@ void SwFieldVarPage::SubTypeHdl(const weld::TreeView* pBox)
m_xNumFormatLB->select(0);
}
}
- if (GetCurField() && IsFieldEdit() && (!pBox || bInit) )
+ if (GetCurField() && IsFieldEdit() && (!pBox || m_bInit) )
m_xValueED->set_text(static_cast<SwSetExpField*>(GetCurField())->GetPromptText());
}
else // USERFLD
@@ -541,7 +541,7 @@ void SwFieldVarPage::SubTypeHdl(const weld::TreeView* pBox)
IMPL_LINK(SwFieldVarPage, SubTypeInsertHdl, weld::TreeView&, rBox, bool)
{
- if (!bInit)
+ if (!m_bInit)
{
SwFieldTypesEnum nTypeId =
static_cast<SwFieldTypesEnum>(m_xTypeLB->get_id(GetTypeSel()).toUInt32());
if (nTypeId == SwFieldTypesEnum::Formel)
@@ -1210,7 +1210,7 @@ bool SwFieldVarPage::FillItemSet(SfxItemSet* )
m_xValueED->get_value_changed_from_saved() ||
m_xSelectionLB->get_value_changed_from_saved() ||
m_xFormatLB->get_value_changed_from_saved() ||
- nOldFormat != m_xNumFormatLB->GetFormat() ||
+ m_nOldFormat != m_xNumFormatLB->GetFormat() ||
m_xInvisibleCB->get_state_changed_from_saved() ||
m_xChapterLevelLB->get_value_changed_from_saved() ||
m_xSeparatorED->get_value_changed_from_saved())
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index b214e5adf0c5..3eedfbf2cc71 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -47,11 +47,11 @@ class SwFieldVarPage : public SwFieldPage
std::unique_ptr<weld::Button> m_xNewPB;
std::unique_ptr<weld::Button> m_xDelPB;
- OUString sOldValueFT;
- OUString sOldNameFT;
+ OUString m_sOldValueFT;
+ OUString m_sOldNameFT;
- sal_uInt32 nOldFormat;
- bool bInit;
+ sal_uInt32 m_nOldFormat;
+ bool m_bInit;
DECL_LINK( TypeHdl, weld::TreeView&, void );
DECL_LINK( SubTypeListBoxHdl, weld::TreeView&, void );
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 11955b5beb42..392e1cc6ba90 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2573,9 +2573,9 @@ IMPL_LINK_NOARG(SwGrfExtPage, MirrorHdl,
weld::Toggleable&, void)
// example window
BmpWindow::BmpWindow()
- : bHorz(false)
- , bVert(false)
- , bGraphic(false)
+ : m_bHorz(false)
+ , m_bVert(false)
+ , m_bGraphic(false)
{
}
@@ -2600,11 +2600,11 @@ void BmpWindow::Paint(vcl::RenderContext&
rRenderContext, const tools::Rectangle
Point aPntPos;
Size aPntSz(GetOutputSizePixel());
Size aGrfSize;
- if (bGraphic)
- aGrfSize = ::GetGraphicSizeTwip(aGraphic, &rRenderContext);
+ if (m_bGraphic)
+ aGrfSize = ::GetGraphicSizeTwip(m_aGraphic, &rRenderContext);
//it should show the default bitmap also if no graphic can be found
if (!aGrfSize.Width() && !aGrfSize.Height())
- aGrfSize = rRenderContext.PixelToLogic(aBmp.GetSizePixel());
+ aGrfSize = rRenderContext.PixelToLogic(m_aBmp.GetSizePixel());
tools::Long nRelGrf = aGrfSize.Width() * 100 / aGrfSize.Height();
tools::Long nRelWin = aPntSz.Width() * 100 / aPntSz.Height();
@@ -2612,7 +2612,7 @@ void BmpWindow::Paint(vcl::RenderContext& rRenderContext,
const tools::Rectangle
{
const tools::Long nWidth = aPntSz.Width();
// if we use a replacement preview, try to draw at original size
- if (!bGraphic && (aGrfSize.Width() <= aPntSz.Width())
+ if (!m_bGraphic && (aGrfSize.Width() <= aPntSz.Width())
&& (aGrfSize.Height() <= aPntSz.Height()))
{
const tools::Long nHeight = aPntSz.Height();
@@ -2629,24 +2629,24 @@ void BmpWindow::Paint(vcl::RenderContext&
rRenderContext, const tools::Rectangle
// #i119307# clear window background, the graphic might have transparency
rRenderContext.DrawRect(tools::Rectangle(aPntPos, aPntSz));
- if (bHorz || bVert)
+ if (m_bHorz || m_bVert)
{
- BitmapEx aTmpBmp(bGraphic ? aGraphic.GetBitmapEx() : aBmp);
+ BitmapEx aTmpBmp(m_bGraphic ? m_aGraphic.GetBitmapEx() : m_aBmp);
BmpMirrorFlags nMirrorFlags(BmpMirrorFlags::NONE);
- if (bHorz)
+ if (m_bHorz)
nMirrorFlags |= BmpMirrorFlags::Vertical;
- if (bVert)
+ if (m_bVert)
nMirrorFlags |= BmpMirrorFlags::Horizontal;
aTmpBmp.Mirror(nMirrorFlags);
rRenderContext.DrawBitmapEx(aPntPos, aPntSz, aTmpBmp);
}
- else if (bGraphic) //draw unmirrored preview graphic
+ else if (m_bGraphic) //draw unmirrored preview graphic
{
- aGraphic.Draw(rRenderContext, aPntPos, aPntSz);
+ m_aGraphic.Draw(rRenderContext, aPntPos, aPntSz);
}
else //draw unmirrored stock sample image
{
- rRenderContext.DrawBitmapEx(aPntPos, aPntSz, aBmp);
+ rRenderContext.DrawBitmapEx(aPntPos, aPntSz, m_aBmp);
}
}
@@ -2656,15 +2656,15 @@ BmpWindow::~BmpWindow()
void BmpWindow::SetGraphic(const Graphic& rGraphic)
{
- aGraphic = rGraphic;
- Size aSize = aGraphic.GetPrefSize();
- bGraphic = aSize.Width() && aSize.Height();
+ m_aGraphic = rGraphic;
+ Size aSize = m_aGraphic.GetPrefSize();
+ m_bGraphic = aSize.Width() && aSize.Height();
Invalidate();
}
void BmpWindow::SetBitmapEx(const BitmapEx& rBmp)
{
- aBmp = rBmp;
+ m_aBmp = rBmp;
Invalidate();
}
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index fa94ea19e2bd..650216031f04 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -60,19 +60,19 @@ IMPL_LINK_NOARG(SwFootNotePage, HeightMetric,
weld::Toggleable&, void)
// handler limit values
IMPL_LINK_NOARG(SwFootNotePage, HeightModify, weld::MetricSpinButton&, void)
{
- m_xMaxHeightEdit->set_max(m_xMaxHeightEdit->normalize(lMaxHeight -
+ m_xMaxHeightEdit->set_max(m_xMaxHeightEdit->normalize(m_lMaxHeight -
(m_xDistEdit->denormalize(m_xDistEdit->get_value(FieldUnit::TWIP))
+
m_xLineDistEdit->denormalize(m_xLineDistEdit->get_value(FieldUnit::TWIP)))),
FieldUnit::TWIP);
if (m_xMaxHeightEdit->get_value(FieldUnit::NONE) < 0)
m_xMaxHeightEdit->set_value(0, FieldUnit::NONE);
- m_xDistEdit->set_max(m_xDistEdit->normalize(lMaxHeight -
+ m_xDistEdit->set_max(m_xDistEdit->normalize(m_lMaxHeight -
(m_xMaxHeightEdit->denormalize(m_xMaxHeightEdit->get_value(FieldUnit::TWIP)) +
m_xLineDistEdit->denormalize(m_xLineDistEdit->get_value(FieldUnit::TWIP)))),
FieldUnit::TWIP);
if (m_xDistEdit->get_value(FieldUnit::NONE) < 0)
m_xDistEdit->set_value(0, FieldUnit::NONE);
- m_xLineDistEdit->set_max(m_xLineDistEdit->normalize(lMaxHeight -
+ m_xLineDistEdit->set_max(m_xLineDistEdit->normalize(m_lMaxHeight -
(m_xMaxHeightEdit->denormalize(m_xMaxHeightEdit->get_value(FieldUnit::TWIP)) +
m_xDistEdit->denormalize(m_xDistEdit->get_value(FieldUnit::TWIP)))),
FieldUnit::TWIP);
@@ -95,7 +95,7 @@ IMPL_LINK(SwFootNotePage, LineColorSelected_Impl,
ColorListBox&, rColorBox, void
SwFootNotePage::SwFootNotePage(weld::Container* pPage, weld::DialogController*
pController, const SfxItemSet &rSet)
: SfxTabPage(pPage, pController, "modules/swriter/ui/footnoteareapage.ui",
"FootnoteAreaPage", &rSet)
- , lMaxHeight(0)
+ , m_lMaxHeight(0)
, m_xMaxHeightPageBtn(m_xBuilder->weld_radio_button("maxheightpage"))
, m_xMaxHeightBtn(m_xBuilder->weld_radio_button("maxheight"))
, m_xMaxHeightEdit(m_xBuilder->weld_metric_spin_button("maxheightsb",
FieldUnit::CM))
@@ -260,7 +260,7 @@ bool SwFootNotePage::FillItemSet(SfxItemSet *rSet)
void SwFootNotePage::ActivatePage(const SfxItemSet& rSet)
{
auto const & rSize = rSet.Get( RES_FRM_SIZE );
- lMaxHeight = rSize.GetHeight();
+ m_lMaxHeight = rSize.GetHeight();
if( const SvxSetItem* pHeaderSetItem = rSet.GetItemIfSet(
rSet.GetPool()->GetWhich( SID_ATTR_PAGE_HEADERSET), false ) )
{
@@ -272,7 +272,7 @@ void SwFootNotePage::ActivatePage(const SfxItemSet& rSet)
{
const SvxSizeItem& rSizeItem =
rHeaderSet.Get(rSet.GetPool()->GetWhich(SID_ATTR_PAGE_SIZE));
- lMaxHeight -= rSizeItem.GetSize().Height();
+ m_lMaxHeight -= rSizeItem.GetSize().Height();
}
}
@@ -286,17 +286,17 @@ void SwFootNotePage::ActivatePage(const SfxItemSet& rSet)
{
const SvxSizeItem& rSizeItem =
rFooterSet.Get( rSet.GetPool()->GetWhich( SID_ATTR_PAGE_SIZE )
);
- lMaxHeight -= rSizeItem.GetSize().Height();
+ m_lMaxHeight -= rSizeItem.GetSize().Height();
}
}
if ( const SvxULSpaceItem* pSpaceItem = rSet.GetItemIfSet( RES_UL_SPACE ,
false ) )
{
- lMaxHeight -= pSpaceItem->GetUpper() + pSpaceItem->GetLower();
+ m_lMaxHeight -= pSpaceItem->GetUpper() + pSpaceItem->GetLower();
}
- lMaxHeight *= 8;
- lMaxHeight /= 10;
+ m_lMaxHeight *= 8;
+ m_lMaxHeight /= 10;
// set maximum values
HeightModify(*m_xMaxHeightEdit);
diff --git a/sw/source/uibase/inc/bmpwin.hxx b/sw/source/uibase/inc/bmpwin.hxx
index 20d31100b83b..b05700a9647c 100644
--- a/sw/source/uibase/inc/bmpwin.hxx
+++ b/sw/source/uibase/inc/bmpwin.hxx
@@ -28,12 +28,12 @@
class BmpWindow final : public weld::CustomWidgetController
{
private:
- Graphic aGraphic;
- BitmapEx aBmp;
+ Graphic m_aGraphic;
+ BitmapEx m_aBmp;
- bool bHorz : 1;
- bool bVert : 1;
- bool bGraphic : 1;
+ bool m_bHorz : 1;
+ bool m_bVert : 1;
+ bool m_bGraphic : 1;
virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const
tools::Rectangle& rRect) override;
@@ -42,8 +42,8 @@ private:
public:
BmpWindow();
virtual ~BmpWindow() override;
- void MirrorVert(bool bMirror) { bVert = bMirror; Invalidate(); }
- void MirrorHorz(bool bMirror) { bHorz = bMirror; Invalidate(); }
+ void MirrorVert(bool bMirror) { m_bVert = bMirror; Invalidate(); }
+ void MirrorHorz(bool bMirror) { m_bHorz = bMirror; Invalidate(); }
void SetGraphic(const Graphic& rGrf);
void SetBitmapEx(const BitmapEx& rGrf);
};
diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx
index c55a9f9c723d..f8f7cb097d87 100644
--- a/sw/source/uibase/inc/pgfnote.hxx
+++ b/sw/source/uibase/inc/pgfnote.hxx
@@ -39,7 +39,7 @@ public:
private:
- tools::Long lMaxHeight;
+ tools::Long m_lMaxHeight;
std::unique_ptr<weld::RadioButton> m_xMaxHeightPageBtn;
std::unique_ptr<weld::RadioButton> m_xMaxHeightBtn;
