include/svx/ctredlin.hxx | 38 +++++++++++++-------------- svx/source/dialog/ctredlin.cxx | 56 ++++++++++++++++++++--------------------- 2 files changed, 47 insertions(+), 47 deletions(-)
New commits: commit 9464a07502992acc0aeddcd02f04a0286d3da69c Author: Miklos Vajna <[email protected]> AuthorDate: Mon Nov 24 09:17:47 2025 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Nov 24 10:32:43 2025 +0100 svx: prefix members of SvxTPView See tdf#94879 for motivation. Change-Id: I1fe7570e1ac6a8b729d8d6374cfec0775d215684 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194411 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 486cf30fcd62..b6b863fde841 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -259,22 +259,22 @@ public: class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxTPView final : public SvxTPage { private: - Link<SvxTPView*,void> AcceptClickLk; - Link<SvxTPView*,void> AcceptAllClickLk; - Link<SvxTPView*,void> RejectClickLk; - Link<SvxTPView*,void> RejectAllClickLk; - Link<SvxTPView*,void> UndoClickLk; + Link<SvxTPView*,void> m_AcceptClickLk; + Link<SvxTPView*,void> m_AcceptAllClickLk; + Link<SvxTPView*,void> m_RejectClickLk; + Link<SvxTPView*,void> m_RejectAllClickLk; + Link<SvxTPView*,void> m_UndoClickLk; - Link<SvxTPView*,void> SortByComboBoxChangedLk; + Link<SvxTPView*,void> m_SortByComboBoxChangedLk; - bool bEnableAccept; - bool bEnableAcceptAll; - bool bEnableReject; - bool bEnableRejectAll; - bool bEnableUndo; + bool m_bEnableAccept; + bool m_bEnableAcceptAll; + bool m_bEnableReject; + bool m_bEnableRejectAll; + bool m_bEnableUndo; - bool bEnableClearFormat; - bool bEnableClearFormatAll; + bool m_bEnableClearFormat; + bool m_bEnableClearFormatAll; std::unique_ptr<weld::Button> m_xAccept; std::unique_ptr<weld::Button> m_xReject; @@ -305,19 +305,19 @@ public: void DisableUndo() {EnableUndo(false);} void ShowUndo(); - void SetAcceptClickHdl( const Link<SvxTPView*,void>& rLink ) { AcceptClickLk = rLink; } + void SetAcceptClickHdl( const Link<SvxTPView*,void>& rLink ) { m_AcceptClickLk = rLink; } - void SetAcceptAllClickHdl( const Link<SvxTPView*,void>& rLink ) { AcceptAllClickLk = rLink; } + void SetAcceptAllClickHdl( const Link<SvxTPView*,void>& rLink ) { m_AcceptAllClickLk = rLink; } - void SetRejectClickHdl( const Link<SvxTPView*,void>& rLink ) { RejectClickLk = rLink; } + void SetRejectClickHdl( const Link<SvxTPView*,void>& rLink ) { m_RejectClickLk = rLink; } - void SetRejectAllClickHdl( const Link<SvxTPView*,void>& rLink ) { RejectAllClickLk = rLink; } + void SetRejectAllClickHdl( const Link<SvxTPView*,void>& rLink ) { m_RejectAllClickLk = rLink; } - void SetUndoClickHdl( const Link<SvxTPView*,void>& rLink ) { UndoClickLk = rLink; } + void SetUndoClickHdl( const Link<SvxTPView*,void>& rLink ) { m_UndoClickLk = rLink; } void SetSortByComboBoxChangedHdl(const Link<SvxTPView*, void>& rLink) { - SortByComboBoxChangedLk = rLink; + m_SortByComboBoxChangedLk = rLink; } virtual void ActivatePage() override; diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 5ea339f67711..0c884b749846 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -299,13 +299,13 @@ void SvxTPage::ActivatePage() SvxTPView::SvxTPView(weld::Container* pParent) : SvxTPage(pParent, u"svx/ui/redlineviewpage.ui"_ustr, u"RedlineViewPage"_ustr) - , bEnableAccept(true) - , bEnableAcceptAll(true) - , bEnableReject(true) - , bEnableRejectAll(true) - , bEnableUndo(true) - , bEnableClearFormat(false) - , bEnableClearFormatAll(false) + , m_bEnableAccept(true) + , m_bEnableAcceptAll(true) + , m_bEnableReject(true) + , m_bEnableRejectAll(true) + , m_bEnableUndo(true) + , m_bEnableClearFormat(false) + , m_bEnableClearFormatAll(false) , m_xAccept(m_xBuilder->weld_button(u"accept"_ustr)) , m_xReject(m_xBuilder->weld_button(u"reject"_ustr)) , m_xAcceptAll(m_xBuilder->weld_button(u"acceptall"_ustr)) @@ -329,11 +329,11 @@ SvxTPView::SvxTPView(weld::Container* pParent) void SvxTPView::ActivatePage() { - m_xAccept->set_sensitive(bEnableAccept); - m_xReject->set_sensitive(bEnableReject); - m_xAcceptAll->set_sensitive(bEnableAcceptAll); - m_xRejectAll->set_sensitive(bEnableRejectAll); - m_xUndo->set_sensitive(bEnableUndo); + m_xAccept->set_sensitive(m_bEnableAccept); + m_xReject->set_sensitive(m_bEnableReject); + m_xAcceptAll->set_sensitive(m_bEnableAcceptAll); + m_xRejectAll->set_sensitive(m_bEnableRejectAll); + m_xUndo->set_sensitive(m_bEnableUndo); } void SvxTPView::DeactivatePage() @@ -392,40 +392,40 @@ void SvxRedlinTable::SetCalcView() void SvxTPView::EnableAccept(bool bFlag) { - bEnableAccept = bFlag; + m_bEnableAccept = bFlag; m_xAccept->set_sensitive(bFlag); } void SvxTPView::EnableAcceptAll(bool bFlag) { - bEnableAcceptAll = bFlag; + m_bEnableAcceptAll = bFlag; m_xAcceptAll->set_sensitive(bFlag); } void SvxTPView::EnableReject(bool bFlag) { - bEnableReject = bFlag; + m_bEnableReject = bFlag; m_xReject->set_sensitive(bFlag); } void SvxTPView::EnableRejectAll(bool bFlag) { - bEnableRejectAll = bFlag; + m_bEnableRejectAll = bFlag; m_xRejectAll->set_sensitive(bFlag); } void SvxTPView::EnableClearFormat(bool bFlag) { - if (bEnableClearFormat == bFlag) + if (m_bEnableClearFormat == bFlag) return; - bEnableClearFormat = bFlag; + m_bEnableClearFormat = bFlag; } void SvxTPView::EnableClearFormatAll(bool bFlag) { - if (bEnableClearFormatAll == bFlag) + if (m_bEnableClearFormatAll == bFlag) return; - bEnableClearFormatAll = bFlag; + m_bEnableClearFormatAll = bFlag; } void SvxTPView::ShowUndo() @@ -435,37 +435,37 @@ void SvxTPView::ShowUndo() void SvxTPView::EnableUndo(bool bFlag) { - bEnableUndo = bFlag; + m_bEnableUndo = bFlag; m_xUndo->set_sensitive(bFlag); } IMPL_LINK_NOARG(SvxTPView, SortByComboBoxChangedHdl, weld::ComboBox&, void) { - if (SortByComboBoxChangedLk.IsSet()) - SortByComboBoxChangedLk.Call(this); + if (m_SortByComboBoxChangedLk.IsSet()) + m_SortByComboBoxChangedLk.Call(this); } IMPL_LINK( SvxTPView, PbClickHdl, weld::Button&, rPushB, void) { if (&rPushB == m_xAccept.get()) { - AcceptClickLk.Call(this); + m_AcceptClickLk.Call(this); } else if (&rPushB == m_xAcceptAll.get()) { - AcceptAllClickLk.Call(this); + m_AcceptAllClickLk.Call(this); } else if (&rPushB == m_xReject.get()) { - RejectClickLk.Call(this); + m_RejectClickLk.Call(this); } else if (&rPushB == m_xRejectAll.get()) { - RejectAllClickLk.Call(this); + m_RejectAllClickLk.Call(this); } else if (&rPushB == m_xUndo.get()) { - UndoClickLk.Call(this); + m_UndoClickLk.Call(this); } }
