include/svx/relfld.hxx | 24 ++++++++++---------- svx/source/dialog/relfld.cxx | 50 +++++++++++++++++++++---------------------- 2 files changed, 37 insertions(+), 37 deletions(-)
New commits: commit 8b7d0c8a93a4da75dcbda6b1cb30d3a86bd8e8a2 Author: Miklos Vajna <[email protected]> AuthorDate: Mon Jan 5 08:37:09 2026 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Jan 5 10:22:08 2026 +0100 svx: prefix members of SvxRelativeField See tdf#94879 for motivation. Change-Id: I5607196a2a0390d92963f8386bd44d61622fbc0e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196529 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx index 389bce0cdb6e..21f1125e2795 100644 --- a/include/svx/relfld.hxx +++ b/include/svx/relfld.hxx @@ -31,14 +31,14 @@ class SVX_DLLPUBLIC SvxRelativeField private: std::unique_ptr<weld::MetricSpinButton> m_xSpinButton; - FieldUnit eAbsoluteFieldUnit = FieldUnit::NONE; - FieldUnit eFontRelativeFieldUnit = FieldUnit::NONE; - sal_uInt16 nRelMin; - sal_uInt16 nRelMax; - bool bRelativeMode; - bool bRelative; - bool bNegativeEnabled; - bool bFontRelativeMode; + FieldUnit m_eAbsoluteFieldUnit = FieldUnit::NONE; + FieldUnit m_eFontRelativeFieldUnit = FieldUnit::NONE; + sal_uInt16 m_nRelMin; + sal_uInt16 m_nRelMax; + bool m_bRelativeMode; + bool m_bRelative; + bool m_bNegativeEnabled; + bool m_bFontRelativeMode; DECL_DLLPRIVATE_LINK(ModifyHdl, weld::Entry&, void); @@ -49,9 +49,9 @@ public: void EnableFontRelativeMode(); void SetRelative( bool bRelative ); void SetFontRelative(FieldUnit eNewRelativeUnit); - bool IsRelative() const { return bRelative; } - void EnableNegativeMode() {bNegativeEnabled = true;} - FieldUnit GetCurrentUnit() const { return eFontRelativeFieldUnit; } + bool IsRelative() const { return m_bRelative; } + void EnableNegativeMode() {m_bNegativeEnabled = true;} + FieldUnit GetCurrentUnit() const { return m_eFontRelativeFieldUnit; } void set_sensitive(bool sensitive) { m_xSpinButton->set_sensitive(sensitive); } bool get_sensitive() const { return m_xSpinButton->get_sensitive(); } @@ -73,7 +73,7 @@ public: void SetFieldUnit(FieldUnit eUnit, bool bAll = false) { ::SetFieldUnit(*m_xSpinButton, eUnit, bAll); - eAbsoluteFieldUnit = m_xSpinButton->get_unit(); + m_eAbsoluteFieldUnit = m_xSpinButton->get_unit(); } void SetMetricValue(sal_Int64 lCoreValue, MapUnit eUnit) { ::SetMetricValue(*m_xSpinButton, lCoreValue, eUnit); } }; diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index 77da81b0c77b..f8ac1843621b 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -22,12 +22,12 @@ SvxRelativeField::SvxRelativeField(std::unique_ptr<weld::MetricSpinButton> pControl) : m_xSpinButton(std::move(pControl)) - , nRelMin(0) - , nRelMax(0) - , bRelativeMode(false) - , bRelative(false) - , bNegativeEnabled(false) - , bFontRelativeMode(false) + , m_nRelMin(0) + , m_nRelMax(0) + , m_bRelativeMode(false) + , m_bRelative(false) + , m_bNegativeEnabled(false) + , m_bFontRelativeMode(false) { weld::SpinButton& rSpinButton = m_xSpinButton->get_widget(); rSpinButton.connect_changed(LINK(this, SvxRelativeField, ModifyHdl)); @@ -35,12 +35,12 @@ SvxRelativeField::SvxRelativeField(std::unique_ptr<weld::MetricSpinButton> pCont IMPL_LINK_NOARG(SvxRelativeField, ModifyHdl, weld::Entry&, void) { - if (bRelativeMode) + if (m_bRelativeMode) { OUString aStr = m_xSpinButton->get_text(); - bool bNewMode = bRelative; + bool bNewMode = m_bRelative; - if (bRelative) + if (m_bRelative) { const sal_Unicode* pStr = aStr.getStr(); @@ -60,11 +60,11 @@ IMPL_LINK_NOARG(SvxRelativeField, ModifyHdl, weld::Entry&, void) bNewMode = true; } - if (bNewMode != bRelative) + if (bNewMode != m_bRelative) SetRelative(bNewMode); } - if (bFontRelativeMode) + if (m_bFontRelativeMode) { OUString aStr = m_xSpinButton->get_text(); FieldUnit eNewFieldUnit = vcl::GetTextMetricUnit(aStr); @@ -81,7 +81,7 @@ IMPL_LINK_NOARG(SvxRelativeField, ModifyHdl, weld::Entry&, void) break; } - if (eNewFieldUnit != eFontRelativeFieldUnit) + if (eNewFieldUnit != m_eFontRelativeFieldUnit) { SetFontRelative(eNewFieldUnit); } @@ -90,13 +90,13 @@ IMPL_LINK_NOARG(SvxRelativeField, ModifyHdl, weld::Entry&, void) void SvxRelativeField::EnableRelativeMode(sal_uInt16 nMin, sal_uInt16 nMax) { - bRelativeMode = true; - nRelMin = nMin; - nRelMax = nMax; + m_bRelativeMode = true; + m_nRelMin = nMin; + m_nRelMax = nMax; m_xSpinButton->set_unit(FieldUnit::CM); } -void SvxRelativeField::EnableFontRelativeMode() { bFontRelativeMode = true; } +void SvxRelativeField::EnableFontRelativeMode() { m_bFontRelativeMode = true; } void SvxRelativeField::SetRelative( bool bNewRelative ) { @@ -106,20 +106,20 @@ void SvxRelativeField::SetRelative( bool bNewRelative ) rSpinButton.get_selection_bounds(nStartPos, nEndPos); OUString aStr = rSpinButton.get_text(); - eFontRelativeFieldUnit = FieldUnit::NONE; + m_eFontRelativeFieldUnit = FieldUnit::NONE; if ( bNewRelative ) { - bRelative = true; + m_bRelative = true; m_xSpinButton->set_digits(0); - m_xSpinButton->set_range(nRelMin, nRelMax, FieldUnit::NONE); + m_xSpinButton->set_range(m_nRelMin, m_nRelMax, FieldUnit::NONE); m_xSpinButton->set_unit(FieldUnit::PERCENT); } else { - bRelative = false; + m_bRelative = false; m_xSpinButton->set_digits(2); - m_xSpinButton->set_range(bNegativeEnabled ? -9999 : 0, 9999, FieldUnit::NONE); + m_xSpinButton->set_range(m_bNegativeEnabled ? -9999 : 0, 9999, FieldUnit::NONE); m_xSpinButton->set_unit(FieldUnit::CM); } @@ -135,14 +135,14 @@ void SvxRelativeField::SetFontRelative(FieldUnit eNewRelativeUnit) rSpinButton.get_selection_bounds(nStartPos, nEndPos); OUString aStr = rSpinButton.get_text(); - bRelative = false; - eFontRelativeFieldUnit = eNewRelativeUnit; + m_bRelative = false; + m_eFontRelativeFieldUnit = eNewRelativeUnit; m_xSpinButton->set_digits(2); - m_xSpinButton->set_range(bNegativeEnabled ? -9999 : 0, 9999, FieldUnit::NONE); + m_xSpinButton->set_range(m_bNegativeEnabled ? -9999 : 0, 9999, FieldUnit::NONE); if (eNewRelativeUnit == FieldUnit::NONE) { - m_xSpinButton->set_unit(eAbsoluteFieldUnit); + m_xSpinButton->set_unit(m_eAbsoluteFieldUnit); } else {
