diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2024-02-12 08:17:14 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2024-02-12 10:34:34 +0100 |
| commit | 207501b8385818a5d413b9f4001e0d24aaa4f2a9 (patch) | |
| tree | 986b58e31fb7a62b216af5cd74e24f215e9d70c0 | |
| parent | 70cc059b7b9fbb38cbbdd04832dd6c87553c8672 (diff) | |
svx: prefix members of SdrHelpLineList
See tdf#94879 for motivation.
Change-Id: I172aad9fe63589a6a6bbbce77173a6fe24291ae5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163235
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
| -rw-r--r-- | include/svx/svdhlpln.hxx | 16 | ||||
| -rw-r--r-- | svx/source/svdraw/svdhlpln.cxx | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx index 0eed874adf3a..218f36e46bf8 100644 --- a/include/svx/svdhlpln.hxx +++ b/include/svx/svdhlpln.hxx @@ -59,7 +59,7 @@ public: #define SDRHELPLINE_NOTFOUND 0xFFFF class SVXCORE_DLLPUBLIC SdrHelpLineList { - std::vector<std::unique_ptr<SdrHelpLine>> aList; + std::vector<std::unique_ptr<SdrHelpLine>> m_aList; public: SdrHelpLineList() {} @@ -67,21 +67,21 @@ public: SdrHelpLineList& operator=(const SdrHelpLineList& rSrcList); bool operator==(const SdrHelpLineList& rCmp) const; bool operator!=(const SdrHelpLineList& rCmp) const { return !operator==(rCmp); } - sal_uInt16 GetCount() const { return sal_uInt16(aList.size()); } - void Insert(const SdrHelpLine& rHL) { aList.emplace_back(new SdrHelpLine(rHL)); } + sal_uInt16 GetCount() const { return sal_uInt16(m_aList.size()); } + void Insert(const SdrHelpLine& rHL) { m_aList.emplace_back(new SdrHelpLine(rHL)); } void Insert(const SdrHelpLine& rHL, sal_uInt16 nPos) { if(nPos==0xFFFF) - aList.emplace_back(new SdrHelpLine(rHL)); + m_aList.emplace_back(new SdrHelpLine(rHL)); else - aList.emplace(aList.begin() + nPos, new SdrHelpLine(rHL)); + m_aList.emplace(m_aList.begin() + nPos, new SdrHelpLine(rHL)); } void Delete(sal_uInt16 nPos) { - aList.erase(aList.begin() + nPos); + m_aList.erase(m_aList.begin() + nPos); } - SdrHelpLine& operator[](sal_uInt16 nPos) { return *aList[nPos]; } - const SdrHelpLine& operator[](sal_uInt16 nPos) const { return *aList[nPos]; } + SdrHelpLine& operator[](sal_uInt16 nPos) { return *m_aList[nPos]; } + const SdrHelpLine& operator[](sal_uInt16 nPos) const { return *m_aList[nPos]; } sal_uInt16 HitTest(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const; }; diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx index c42aefd4e816..58d0eb10c400 100644 --- a/svx/source/svdraw/svdhlpln.cxx +++ b/svx/source/svdraw/svdhlpln.cxx @@ -73,7 +73,7 @@ tools::Rectangle SdrHelpLine::GetBoundRect(const OutputDevice& rOut) const SdrHelpLineList& SdrHelpLineList::operator=(const SdrHelpLineList& rSrcList) { - aList.clear(); + m_aList.clear(); sal_uInt16 nCount=rSrcList.GetCount(); for (sal_uInt16 i=0; i<nCount; i++) { Insert(rSrcList[i]); @@ -88,7 +88,7 @@ bool SdrHelpLineList::operator==(const SdrHelpLineList& rSrcList) const if (nCount==rSrcList.GetCount()) { bEqual = true; for (sal_uInt16 i=0; i<nCount && bEqual; i++) { - if (*aList[i]!=*rSrcList.aList[i]) { + if (*m_aList[i]!=*rSrcList.m_aList[i]) { bEqual = false; } } @@ -101,7 +101,7 @@ sal_uInt16 SdrHelpLineList::HitTest(const Point& rPnt, sal_uInt16 nTolLog, const sal_uInt16 nCount=GetCount(); for (sal_uInt16 i=nCount; i>0;) { i--; - if (aList[i]->IsHit(rPnt,nTolLog,rOut)) return i; + if (m_aList[i]->IsHit(rPnt,nTolLog,rOut)) return i; } return SDRHELPLINE_NOTFOUND; } |