sw/source/filter/html/swhtml.hxx | 18 +++++++++--------- sw/source/ui/vba/vbacontentcontrollistentries.cxx | 10 +++++----- sw/source/ui/vba/vbacontentcontrols.cxx | 10 +++++----- sw/source/ui/vba/vbaformfielddropdownlistentries.cxx | 10 +++++----- 4 files changed, 24 insertions(+), 24 deletions(-)
New commits: commit 4b909c61ccf76f437d98000838d3791a495cc68c Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Mon Dec 19 08:04:10 2022 +0100 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Mon Dec 19 11:27:54 2022 +0000 sw: prefix members of ContentControlListEntriesEnumWrapper, ... ... ContentControlsEnumWrapper, ListEntriesEnumWrapper and SwHTMLTextFootnote See tdf#94879 for motivation. Change-Id: I1efbf1d7e3def37868ef0e36aeb4ec184d31eb46 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144445 Reviewed-by: Miklos Vajna <vmik...@collabora.com> Tested-by: Jenkins diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 67b4a76738fe..1f37be2b45a3 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -1031,25 +1031,25 @@ class SwTextFootnote; class SwHTMLTextFootnote { private: - OUString sName; - SwTextFootnote* pTextFootnote; - std::unique_ptr<SvtDeleteListener> xDeleteListener; + OUString m_sName; + SwTextFootnote* m_pTextFootnote; + std::unique_ptr<SvtDeleteListener> m_xDeleteListener; public: SwHTMLTextFootnote(OUString rName, SwTextFootnote* pInTextFootnote) - : sName(std::move(rName)) - , pTextFootnote(pInTextFootnote) - , xDeleteListener(new SvtDeleteListener(static_cast<SwFormatFootnote&>(pInTextFootnote->GetAttr()).GetNotifier())) + : m_sName(std::move(rName)) + , m_pTextFootnote(pInTextFootnote) + , m_xDeleteListener(new SvtDeleteListener(static_cast<SwFormatFootnote&>(pInTextFootnote->GetAttr()).GetNotifier())) { } const OUString& GetName() const { - return sName; + return m_sName; } const SwNodeIndex* GetStartNode() const { - if (xDeleteListener->WasDeleted()) + if (m_xDeleteListener->WasDeleted()) return nullptr; - return pTextFootnote->GetStartNode(); + return m_pTextFootnote->GetStartNode(); } }; diff --git a/sw/source/ui/vba/vbacontentcontrollistentries.cxx b/sw/source/ui/vba/vbacontentcontrollistentries.cxx index dcf71afb9337..40684e04ab60 100644 --- a/sw/source/ui/vba/vbacontentcontrollistentries.cxx +++ b/sw/source/ui/vba/vbacontentcontrollistentries.cxx @@ -17,26 +17,26 @@ namespace class ContentControlListEntriesEnumWrapper : public EnumerationHelper_BASE { uno::Reference<container::XIndexAccess> mxIndexAccess; - sal_Int32 nIndex; + sal_Int32 mnIndex; public: explicit ContentControlListEntriesEnumWrapper( uno::Reference<container::XIndexAccess> xIndexAccess) : mxIndexAccess(xIndexAccess) - , nIndex(0) + , mnIndex(0) { } virtual sal_Bool SAL_CALL hasMoreElements() override { - return (nIndex < mxIndexAccess->getCount()); + return (mnIndex < mxIndexAccess->getCount()); } virtual uno::Any SAL_CALL nextElement() override { - if (nIndex < mxIndexAccess->getCount()) + if (mnIndex < mxIndexAccess->getCount()) { - return mxIndexAccess->getByIndex(nIndex++); + return mxIndexAccess->getByIndex(mnIndex++); } throw container::NoSuchElementException(); } diff --git a/sw/source/ui/vba/vbacontentcontrols.cxx b/sw/source/ui/vba/vbacontentcontrols.cxx index e39094df357a..da0033487aee 100644 --- a/sw/source/ui/vba/vbacontentcontrols.cxx +++ b/sw/source/ui/vba/vbacontentcontrols.cxx @@ -92,22 +92,22 @@ namespace class ContentControlsEnumWrapper : public EnumerationHelper_BASE { uno::Reference<container::XIndexAccess> mxIndexAccess; - sal_Int32 nIndex; + sal_Int32 mnIndex; public: explicit ContentControlsEnumWrapper(uno::Reference<container::XIndexAccess> xIndexAccess) : mxIndexAccess(std::move(xIndexAccess)) - , nIndex(0) + , mnIndex(0) { } - sal_Bool SAL_CALL hasMoreElements() override { return (nIndex < mxIndexAccess->getCount()); } + sal_Bool SAL_CALL hasMoreElements() override { return (mnIndex < mxIndexAccess->getCount()); } uno::Any SAL_CALL nextElement() override { - if (nIndex < mxIndexAccess->getCount()) + if (mnIndex < mxIndexAccess->getCount()) { - return mxIndexAccess->getByIndex(nIndex++); + return mxIndexAccess->getByIndex(mnIndex++); } throw container::NoSuchElementException(); } diff --git a/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx b/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx index 9000736b0c72..f06ff3d50870 100644 --- a/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx +++ b/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx @@ -26,22 +26,22 @@ namespace class ListEntriesEnumWrapper : public EnumerationHelper_BASE { uno::Reference<container::XIndexAccess> mxIndexAccess; - sal_Int32 nIndex; + sal_Int32 mnIndex; public: explicit ListEntriesEnumWrapper(uno::Reference<container::XIndexAccess> xIndexAccess) : mxIndexAccess(xIndexAccess) - , nIndex(0) + , mnIndex(0) { } - sal_Bool SAL_CALL hasMoreElements() override { return (nIndex < mxIndexAccess->getCount()); } + sal_Bool SAL_CALL hasMoreElements() override { return (mnIndex < mxIndexAccess->getCount()); } uno::Any SAL_CALL nextElement() override { - if (nIndex < mxIndexAccess->getCount()) + if (mnIndex < mxIndexAccess->getCount()) { - return mxIndexAccess->getByIndex(nIndex++); + return mxIndexAccess->getByIndex(mnIndex++); } throw container::NoSuchElementException(); }