include/svx/svdglue.hxx | 10 +++++-----
svx/source/svdraw/svdglue.cxx | 22 +++++++++++-----------
2 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 9bb4fa71c230a34a07ea9b7c4e4f13f4d3f7b5fe
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Sep 4 08:29:26 2023 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Sep 4 16:27:30 2023 +0200
svx: prefix members of SdrGluePointList
See tdf#94879 for motivation.
Change-Id: Ia58a0c5319d51c463db23bae250e6c0c5e7a9741
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156505
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx
index acdebd0bf4ea..234ecf08cdd0 100644
--- a/include/svx/svdglue.hxx
+++ b/include/svx/svdglue.hxx
@@ -182,7 +182,7 @@ public:
class SVXCORE_DLLPUBLIC SdrGluePointList
{
- std::vector<SdrGluePoint> aList;
+ std::vector<SdrGluePoint> m_aList;
public:
SdrGluePointList() {};
SdrGluePointList(const SdrGluePointList& rSrcList)
@@ -193,22 +193,22 @@ public:
SdrGluePointList& operator=(const SdrGluePointList& rSrcList);
sal_uInt16 GetCount() const
{
- return sal_uInt16(aList.size());
+ return sal_uInt16(m_aList.size());
}
// At insert, the object (GluePoint) automatically gets an ID assigned.
// Return value is the index of the new GluePoint in the list.
sal_uInt16 Insert(const SdrGluePoint& rGP);
void Delete(sal_uInt16 nPos)
{
- aList.erase(aList.begin() + nPos);
+ m_aList.erase(m_aList.begin() + nPos);
}
SdrGluePoint& operator[](sal_uInt16 nPos)
{
- return aList[nPos];
+ return m_aList[nPos];
}
const SdrGluePoint& operator[](sal_uInt16 nPos) const
{
- return aList[nPos];
+ return m_aList[nPos];
}
sal_uInt16 FindGluePoint(sal_uInt16 nId) const;
sal_uInt16 HitTest(const Point& rPnt, const OutputDevice& rOut, const
SdrObject* pObj) const;
diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx
index 471089f3763c..c27fc2e2bde9 100644
--- a/svx/source/svdraw/svdglue.cxx
+++ b/svx/source/svdraw/svdglue.cxx
@@ -282,7 +282,7 @@ bool SdrGluePoint::IsHit(const Point& rPnt, const
OutputDevice& rOut, const SdrO
SdrGluePointList& SdrGluePointList::operator=(const SdrGluePointList& rSrcList)
{
- if (GetCount()!=0) aList.clear();
+ if (GetCount()!=0) m_aList.clear();
sal_uInt16 nCount=rSrcList.GetCount();
for (sal_uInt16 i=0; i<nCount; i++) {
Insert(rSrcList[i]);
@@ -298,7 +298,7 @@ sal_uInt16 SdrGluePointList::Insert(const SdrGluePoint& rGP)
sal_uInt16 nId=aGP.GetId();
sal_uInt16 nCount=GetCount();
sal_uInt16 nInsPos=nCount;
- sal_uInt16 nLastId=nCount!=0 ? aList[nCount-1].GetId() : 0;
+ sal_uInt16 nLastId=nCount!=0 ? m_aList[nCount-1].GetId() : 0;
DBG_ASSERT(nLastId>=nCount,"SdrGluePointList::Insert(): nLastId<nCount");
bool bHole = nLastId>nCount;
if (nId<=nLastId) {
@@ -307,7 +307,7 @@ sal_uInt16 SdrGluePointList::Insert(const SdrGluePoint& rGP)
} else {
bool bBrk = false;
for (sal_uInt16 nNum=0; nNum<nCount && !bBrk; nNum++) {
- const auto& pGP2=aList[nNum];
+ const auto& pGP2=m_aList[nNum];
sal_uInt16 nTmpId=pGP2.GetId();
if (nTmpId==nId) {
nId=nLastId+1; // already in use
@@ -321,7 +321,7 @@ sal_uInt16 SdrGluePointList::Insert(const SdrGluePoint& rGP)
}
aGP.SetId(nId);
}
- aList.emplace(aList.begin()+nInsPos, aGP);
+ m_aList.emplace(m_aList.begin()+nInsPos, aGP);
return nInsPos;
}
@@ -329,7 +329,7 @@ void SdrGluePointList::Invalidate(vcl::Window& rWin, const
SdrObject* pObj) cons
{
if (comphelper::LibreOfficeKit::isActive())
return;
- for (auto& xGP : aList)
+ for (auto& xGP : m_aList)
xGP.Invalidate(rWin,pObj);
}
@@ -340,7 +340,7 @@ sal_uInt16 SdrGluePointList::FindGluePoint(sal_uInt16 nId)
const
sal_uInt16 nCount=GetCount();
sal_uInt16 nRet=SDRGLUEPOINT_NOTFOUND;
for (sal_uInt16 nNum=0; nNum<nCount && nRet==SDRGLUEPOINT_NOTFOUND;
nNum++) {
- const auto& pGP=aList[nNum];
+ const auto& pGP=m_aList[nNum];
if (pGP.GetId()==nId) nRet=nNum;
}
return nRet;
@@ -353,7 +353,7 @@ sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt,
const OutputDevice& rOut
sal_uInt16 nNum = nCount;
while ((nNum>0) && nRet==SDRGLUEPOINT_NOTFOUND) {
nNum--;
- const auto& pGP = aList[nNum];
+ const auto& pGP = m_aList[nNum];
if (pGP.IsHit(rPnt,rOut,pObj))
nRet = nNum;
}
@@ -362,13 +362,13 @@ sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt,
const OutputDevice& rOut
void SdrGluePointList::SetReallyAbsolute(bool bOn, const SdrObject& rObj)
{
- for (auto& xGP : aList)
+ for (auto& xGP : m_aList)
xGP.SetReallyAbsolute(bOn,rObj);
}
void SdrGluePointList::Rotate(const Point& rRef, Degree100 nAngle, double sn,
double cs, const SdrObject* pObj)
{
- for (auto& xGP : aList)
+ for (auto& xGP : m_aList)
xGP.Rotate(rRef,nAngle,sn,cs,pObj);
}
@@ -381,13 +381,13 @@ void SdrGluePointList::Mirror(const Point& rRef1, const
Point& rRef2, const SdrO
void SdrGluePointList::Mirror(const Point& rRef1, const Point& rRef2,
Degree100 nAngle, const SdrObject* pObj)
{
- for (auto& xGP : aList)
+ for (auto& xGP : m_aList)
xGP.Mirror(rRef1,rRef2,nAngle,pObj);
}
void SdrGluePointList::Shear(const Point& rRef, double tn, bool bVShear, const
SdrObject* pObj)
{
- for (auto& xGP : aList)
+ for (auto& xGP : m_aList)
xGP.Shear(rRef,tn,bVShear,pObj);
}
