include/svx/svdhdl.hxx | 20 ++++++++++----------
svx/source/svdraw/svdhdl.cxx | 26 +++++++++++++-------------
2 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit a55e2ad714ff941a2aa2c725ffbc1057fbd9baf5
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Oct 16 20:06:02 2023 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue Oct 17 08:12:01 2023 +0200
svx: prefix members of SdrHdlList
See tdf#94879 for motivation.
Change-Id: I9e529ef12c05e333e2eeb535d2ae72e5d4c84a72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158062
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 0bcff5f2e318..4cece6895236 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -428,13 +428,13 @@ public:
class SVXCORE_DLLPUBLIC SdrHdlList
{
size_t mnFocusIndex;
- SdrMarkView* pView;
+ SdrMarkView* m_pView;
std::deque<std::unique_ptr<SdrHdl>> maList;
- sal_uInt16 nHdlSize;
+ sal_uInt16 m_nHdlSize;
- bool bRotateShear : 1;
- bool bDistortShear : 1;
- bool bMoveOutside : 1; // move handles
outwards (for TextEdit)
+ bool m_bRotateShear : 1;
+ bool m_bDistortShear : 1;
+ bool m_bMoveOutside : 1; // move handles
outwards (for TextEdit)
SVX_DLLPRIVATE SdrHdlList(const SdrHdlList&) = delete;
SVX_DLLPRIVATE void operator=(const SdrHdlList&) = delete;
@@ -450,7 +450,7 @@ public:
void ResetFocusHdl();
// Access to View
- SdrMarkView* GetView() const { return pView;}
+ SdrMarkView* GetView() const { return m_pView;}
// Sorting: 1.Level first reference point handle, then normal handles,
next Glue, then User then Plushandles
// 2.Level PageView (Pointer)
@@ -460,13 +460,13 @@ public:
SdrHdl* GetHdl(size_t nNum) const { return nNum < maList.size() ?
maList[nNum].get() : nullptr; }
size_t GetHdlNum(const SdrHdl* pHdl) const;
void SetHdlSize(sal_uInt16 nSiz);
- sal_uInt16 GetHdlSize() const { return nHdlSize; }
+ sal_uInt16 GetHdlSize() const { return
m_nHdlSize; }
void SetMoveOutside(bool bOn);
- bool IsMoveOutside() const { return bMoveOutside; }
+ bool IsMoveOutside() const { return m_bMoveOutside; }
void SetRotateShear(bool bOn);
- bool IsRotateShear() const { return bRotateShear; }
+ bool IsRotateShear() const { return m_bRotateShear; }
void SetDistortShear(bool bOn);
- bool IsDistortShear() const { return bDistortShear; }
+ bool IsDistortShear() const { return m_bDistortShear; }
// AddHdl takes ownership of the handle. It should be on the Heap
// as Clear() deletes it.
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 867534e9a08f..90903acb29f8 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -2174,12 +2174,12 @@ void SdrHdlList::ResetFocusHdl()
SdrHdlList::SdrHdlList(SdrMarkView* pV)
: mnFocusIndex(SAL_MAX_SIZE),
- pView(pV)
+ m_pView(pV)
{
- nHdlSize = 3;
- bRotateShear = false;
- bMoveOutside = false;
- bDistortShear = false;
+ m_nHdlSize = 3;
+ m_bRotateShear = false;
+ m_bMoveOutside = false;
+ m_bDistortShear = false;
}
SdrHdlList::~SdrHdlList()
@@ -2189,10 +2189,10 @@ SdrHdlList::~SdrHdlList()
void SdrHdlList::SetHdlSize(sal_uInt16 nSiz)
{
- if(nHdlSize != nSiz)
+ if(m_nHdlSize != nSiz)
{
// remember new value
- nHdlSize = nSiz;
+ m_nHdlSize = nSiz;
// propagate change to IAOs
for(size_t i=0; i<GetHdlCount(); ++i)
@@ -2205,10 +2205,10 @@ void SdrHdlList::SetHdlSize(sal_uInt16 nSiz)
void SdrHdlList::SetMoveOutside(bool bOn)
{
- if(bMoveOutside != bOn)
+ if(m_bMoveOutside != bOn)
{
// remember new value
- bMoveOutside = bOn;
+ m_bMoveOutside = bOn;
// propagate change to IAOs
for(size_t i=0; i<GetHdlCount(); ++i)
@@ -2221,12 +2221,12 @@ void SdrHdlList::SetMoveOutside(bool bOn)
void SdrHdlList::SetRotateShear(bool bOn)
{
- bRotateShear = bOn;
+ m_bRotateShear = bOn;
}
void SdrHdlList::SetDistortShear(bool bOn)
{
- bDistortShear = bOn;
+ m_bDistortShear = bOn;
}
std::unique_ptr<SdrHdl> SdrHdlList::RemoveHdl(size_t nNum)
@@ -2248,8 +2248,8 @@ void SdrHdlList::Clear()
{
maList.clear();
- bRotateShear=false;
- bDistortShear=false;
+ m_bRotateShear=false;
+ m_bDistortShear=false;
}
void SdrHdlList::Sort()
