include/svx/svdglue.hxx | 72 +++++++++++++++++++++---------------------
svx/source/svdraw/svdglue.cxx | 70 ++++++++++++++++++++--------------------
2 files changed, 71 insertions(+), 71 deletions(-)
New commits:
commit 9e53afb9cad0e6ed66904ac38b61d1450e12f01d
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Aug 30 08:29:58 2023 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Aug 30 09:16:48 2023 +0200
svx: prefix members of SdrGluePoint
See tdf#94879 for motivation.
Change-Id: I1f1abdf5c522306a5d897250afdb99221e5609f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156274
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx
index 3c70ebeac3c4..acdebd0bf4ea 100644
--- a/include/svx/svdglue.hxx
+++ b/include/svx/svdglue.hxx
@@ -68,62 +68,62 @@ class SVXCORE_DLLPUBLIC SdrGluePoint {
// Reference Point is SdrObject::GetSnapRect().Center()
// bNoPercent=false: position is -5000..5000 (1/100)% or 0..10000
(depending on align)
// bNoPercent=true : position is in log unit, relative to the reference
point
- Point aPos;
- SdrEscapeDirection nEscDir;
- sal_uInt16 nId;
- SdrAlign nAlign;
- bool bNoPercent:1;
- bool bReallyAbsolute:1; // temp for transformations on the reference object
- bool bUserDefined:1; // #i38892#
+ Point m_aPos;
+ SdrEscapeDirection m_nEscDir;
+ sal_uInt16 m_nId;
+ SdrAlign m_nAlign;
+ bool m_bNoPercent:1;
+ bool m_bReallyAbsolute:1; // temp for transformations on the reference
object
+ bool m_bUserDefined:1; // #i38892#
public:
SdrGluePoint()
- : nEscDir(SdrEscapeDirection::SMART)
- , nId(0)
- , nAlign(SdrAlign::NONE)
- , bNoPercent(false)
- , bReallyAbsolute(false)
- , bUserDefined(true)
+ : m_nEscDir(SdrEscapeDirection::SMART)
+ , m_nId(0)
+ , m_nAlign(SdrAlign::NONE)
+ , m_bNoPercent(false)
+ , m_bReallyAbsolute(false)
+ , m_bUserDefined(true)
{}
SdrGluePoint(const Point& rNewPos)
- : aPos(rNewPos)
- , nEscDir(SdrEscapeDirection::SMART)
- , nId(0)
- , nAlign(SdrAlign::NONE)
- , bNoPercent(false)
- , bReallyAbsolute(false)
- , bUserDefined(true)
+ : m_aPos(rNewPos)
+ , m_nEscDir(SdrEscapeDirection::SMART)
+ , m_nId(0)
+ , m_nAlign(SdrAlign::NONE)
+ , m_bNoPercent(false)
+ , m_bReallyAbsolute(false)
+ , m_bUserDefined(true)
{}
const Point& GetPos() const
{
- return aPos;
+ return m_aPos;
}
void SetPos(const Point& rNewPos)
{
- aPos = rNewPos;
+ m_aPos = rNewPos;
}
SdrEscapeDirection GetEscDir() const
{
- return nEscDir;
+ return m_nEscDir;
}
void SetEscDir(SdrEscapeDirection nNewEsc)
{
- nEscDir = nNewEsc;
+ m_nEscDir = nNewEsc;
}
sal_uInt16 GetId() const
{
- return nId;
+ return m_nId;
}
void SetId(sal_uInt16 nNewId)
{
- nId = nNewId;
+ m_nId = nNewId;
}
bool IsPercent() const
{
- return !bNoPercent;
+ return !m_bNoPercent;
}
void SetPercent(bool bOn)
{
- bNoPercent = !bOn;
+ m_bNoPercent = !bOn;
}
// temp for transformations on the reference object
void SetReallyAbsolute(bool bOn, const SdrObject& rObj);
@@ -131,38 +131,38 @@ public:
// #i38892#
bool IsUserDefined() const
{
- return bUserDefined;
+ return m_bUserDefined;
}
void SetUserDefined(bool bNew)
{
- bUserDefined = bNew;
+ m_bUserDefined = bNew;
}
SdrAlign GetAlign() const
{
- return nAlign;
+ return m_nAlign;
}
void SetAlign(SdrAlign nAlg)
{
- nAlign = nAlg;
+ m_nAlign = nAlg;
}
SdrAlign GetHorzAlign() const
{
- return nAlign & static_cast<SdrAlign>(0x00FF);
+ return m_nAlign & static_cast<SdrAlign>(0x00FF);
}
void SetHorzAlign(SdrAlign nAlg)
{
assert((nAlg & static_cast<SdrAlign>(0xFF00)) == SdrAlign::NONE);
- nAlign = SdrAlign(nAlign & static_cast<SdrAlign>(0xFF00)) | (nAlg &
static_cast<SdrAlign>(0x00FF));
+ m_nAlign = SdrAlign(m_nAlign & static_cast<SdrAlign>(0xFF00)) | (nAlg
& static_cast<SdrAlign>(0x00FF));
}
SdrAlign GetVertAlign() const
{
- return nAlign & static_cast<SdrAlign>(0xFF00);
+ return m_nAlign & static_cast<SdrAlign>(0xFF00);
}
void SetVertAlign(SdrAlign nAlg)
{
assert((nAlg & static_cast<SdrAlign>(0x00FF)) == SdrAlign::NONE);
- nAlign = SdrAlign(nAlign & static_cast<SdrAlign>(0x00FF)) | (nAlg &
static_cast<SdrAlign>(0xFF00));
+ m_nAlign = SdrAlign(m_nAlign & static_cast<SdrAlign>(0x00FF)) | (nAlg
& static_cast<SdrAlign>(0xFF00));
}
bool IsHit(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 9808372f8401..471089f3763c 100644
--- a/svx/source/svdraw/svdglue.cxx
+++ b/svx/source/svdraw/svdglue.cxx
@@ -29,28 +29,28 @@ const Size aGlueHalfSize(4,4);
void SdrGluePoint::SetReallyAbsolute(bool bOn, const SdrObject& rObj)
{
- if ( bReallyAbsolute == bOn )
+ if ( m_bReallyAbsolute == bOn )
return;
if ( bOn )
{
- aPos=GetAbsolutePos(rObj);
- bReallyAbsolute=bOn;
+ m_aPos=GetAbsolutePos(rObj);
+ m_bReallyAbsolute=bOn;
}
else
{
- bReallyAbsolute=bOn;
- Point aPt(aPos);
+ m_bReallyAbsolute=bOn;
+ Point aPt(m_aPos);
SetAbsolutePos(aPt,rObj);
}
}
Point SdrGluePoint::GetAbsolutePos(const SdrObject& rObj) const
{
- if (bReallyAbsolute) return aPos;
+ if (m_bReallyAbsolute) return m_aPos;
tools::Rectangle aSnap(rObj.GetSnapRect());
tools::Rectangle aBound(rObj.GetSnapRect());
- Point aPt(aPos);
+ Point aPt(m_aPos);
Point aOfs(aSnap.Center());
switch (GetHorzAlign()) {
@@ -63,7 +63,7 @@ Point SdrGluePoint::GetAbsolutePos(const SdrObject& rObj)
const
case SdrAlign::VERT_BOTTOM: aOfs.setY(aSnap.Bottom() ); break;
default: break;
}
- if (!bNoPercent) {
+ if (!m_bNoPercent) {
tools::Long nXMul=aSnap.Right()-aSnap.Left();
tools::Long nYMul=aSnap.Bottom()-aSnap.Top();
tools::Long nXDiv=10000;
@@ -88,8 +88,8 @@ Point SdrGluePoint::GetAbsolutePos(const SdrObject& rObj)
const
void SdrGluePoint::SetAbsolutePos(const Point& rNewPos, const SdrObject& rObj)
{
- if (bReallyAbsolute) {
- aPos=rNewPos;
+ if (m_bReallyAbsolute) {
+ m_aPos=rNewPos;
return;
}
tools::Rectangle aSnap(rObj.GetSnapRect());
@@ -107,7 +107,7 @@ void SdrGluePoint::SetAbsolutePos(const Point& rNewPos,
const SdrObject& rObj)
default: break;
}
aPt-=aOfs;
- if (!bNoPercent) {
+ if (!m_bNoPercent) {
tools::Long nXMul=aSnap.Right()-aSnap.Left();
tools::Long nYMul=aSnap.Bottom()-aSnap.Top();
if (nXMul==0) nXMul=1;
@@ -123,28 +123,28 @@ void SdrGluePoint::SetAbsolutePos(const Point& rNewPos,
const SdrObject& rObj)
aPt.setY( aPt.Y() / nYMul );
}
}
- aPos=aPt;
+ m_aPos=aPt;
}
Degree100 SdrGluePoint::GetAlignAngle() const
{
- if (nAlign == (SdrAlign::HORZ_CENTER|SdrAlign::VERT_CENTER))
+ if (m_nAlign == (SdrAlign::HORZ_CENTER|SdrAlign::VERT_CENTER))
return 0_deg100; // Invalid!
- else if (nAlign == (SdrAlign::HORZ_RIGHT |SdrAlign::VERT_CENTER))
+ else if (m_nAlign == (SdrAlign::HORZ_RIGHT |SdrAlign::VERT_CENTER))
return 0_deg100;
- else if (nAlign == (SdrAlign::HORZ_RIGHT |SdrAlign::VERT_TOP))
+ else if (m_nAlign == (SdrAlign::HORZ_RIGHT |SdrAlign::VERT_TOP))
return 4500_deg100;
- else if (nAlign == (SdrAlign::HORZ_CENTER|SdrAlign::VERT_TOP))
+ else if (m_nAlign == (SdrAlign::HORZ_CENTER|SdrAlign::VERT_TOP))
return 9000_deg100;
- else if (nAlign == (SdrAlign::HORZ_LEFT |SdrAlign::VERT_TOP))
+ else if (m_nAlign == (SdrAlign::HORZ_LEFT |SdrAlign::VERT_TOP))
return 13500_deg100;
- else if (nAlign == (SdrAlign::HORZ_LEFT |SdrAlign::VERT_CENTER))
+ else if (m_nAlign == (SdrAlign::HORZ_LEFT |SdrAlign::VERT_CENTER))
return 18000_deg100;
- else if (nAlign == (SdrAlign::HORZ_LEFT |SdrAlign::VERT_BOTTOM))
+ else if (m_nAlign == (SdrAlign::HORZ_LEFT |SdrAlign::VERT_BOTTOM))
return 22500_deg100;
- else if (nAlign == (SdrAlign::HORZ_CENTER|SdrAlign::VERT_BOTTOM))
+ else if (m_nAlign == (SdrAlign::HORZ_CENTER|SdrAlign::VERT_BOTTOM))
return 27000_deg100;
- else if (nAlign == (SdrAlign::HORZ_RIGHT |SdrAlign::VERT_BOTTOM))
+ else if (m_nAlign == (SdrAlign::HORZ_RIGHT |SdrAlign::VERT_BOTTOM))
return 31500_deg100;
return 0_deg100;
}
@@ -152,14 +152,14 @@ Degree100 SdrGluePoint::GetAlignAngle() const
void SdrGluePoint::SetAlignAngle(Degree100 nAngle)
{
nAngle=NormAngle36000(nAngle);
- if (nAngle>=33750_deg100 || nAngle<2250_deg100)
nAlign=SdrAlign::HORZ_RIGHT |SdrAlign::VERT_CENTER;
- else if (nAngle< 6750_deg100) nAlign=SdrAlign::HORZ_RIGHT
|SdrAlign::VERT_TOP ;
- else if (nAngle<11250_deg100)
nAlign=SdrAlign::HORZ_CENTER|SdrAlign::VERT_TOP ;
- else if (nAngle<15750_deg100) nAlign=SdrAlign::HORZ_LEFT
|SdrAlign::VERT_TOP ;
- else if (nAngle<20250_deg100) nAlign=SdrAlign::HORZ_LEFT
|SdrAlign::VERT_CENTER;
- else if (nAngle<24750_deg100) nAlign=SdrAlign::HORZ_LEFT
|SdrAlign::VERT_BOTTOM;
- else if (nAngle<29250_deg100)
nAlign=SdrAlign::HORZ_CENTER|SdrAlign::VERT_BOTTOM;
- else if (nAngle<33750_deg100) nAlign=SdrAlign::HORZ_RIGHT
|SdrAlign::VERT_BOTTOM;
+ if (nAngle>=33750_deg100 || nAngle<2250_deg100)
m_nAlign=SdrAlign::HORZ_RIGHT |SdrAlign::VERT_CENTER;
+ else if (nAngle< 6750_deg100) m_nAlign=SdrAlign::HORZ_RIGHT
|SdrAlign::VERT_TOP ;
+ else if (nAngle<11250_deg100)
m_nAlign=SdrAlign::HORZ_CENTER|SdrAlign::VERT_TOP ;
+ else if (nAngle<15750_deg100) m_nAlign=SdrAlign::HORZ_LEFT
|SdrAlign::VERT_TOP ;
+ else if (nAngle<20250_deg100) m_nAlign=SdrAlign::HORZ_LEFT
|SdrAlign::VERT_CENTER;
+ else if (nAngle<24750_deg100) m_nAlign=SdrAlign::HORZ_LEFT
|SdrAlign::VERT_BOTTOM;
+ else if (nAngle<29250_deg100)
m_nAlign=SdrAlign::HORZ_CENTER|SdrAlign::VERT_BOTTOM;
+ else if (nAngle<33750_deg100) m_nAlign=SdrAlign::HORZ_RIGHT
|SdrAlign::VERT_BOTTOM;
}
Degree100 SdrGluePoint::EscDirToAngle(SdrEscapeDirection nEsc)
@@ -192,18 +192,18 @@ void SdrGluePoint::Rotate(const Point& rRef, Degree100
nAngle, double sn, double
Point aPt(pObj!=nullptr ? GetAbsolutePos(*pObj) : GetPos());
RotatePoint(aPt,rRef,sn,cs);
// rotate reference edge
- if(nAlign != (SdrAlign::HORZ_CENTER|SdrAlign::VERT_CENTER))
+ if(m_nAlign != (SdrAlign::HORZ_CENTER|SdrAlign::VERT_CENTER))
{
SetAlignAngle(GetAlignAngle()+nAngle);
}
// rotate exit directions
- SdrEscapeDirection nEscDir0=nEscDir;
+ SdrEscapeDirection nEscDir0=m_nEscDir;
SdrEscapeDirection nEscDir1=SdrEscapeDirection::SMART;
if (nEscDir0&SdrEscapeDirection::LEFT ) nEscDir1 |=
EscAngleToDir(EscDirToAngle(SdrEscapeDirection::LEFT )+nAngle);
if (nEscDir0&SdrEscapeDirection::TOP ) nEscDir1 |=
EscAngleToDir(EscDirToAngle(SdrEscapeDirection::TOP )+nAngle);
if (nEscDir0&SdrEscapeDirection::RIGHT ) nEscDir1 |=
EscAngleToDir(EscDirToAngle(SdrEscapeDirection::RIGHT )+nAngle);
if (nEscDir0&SdrEscapeDirection::BOTTOM) nEscDir1 |=
EscAngleToDir(EscDirToAngle(SdrEscapeDirection::BOTTOM)+nAngle);
- nEscDir=nEscDir1;
+ m_nEscDir=nEscDir1;
if (pObj!=nullptr) SetAbsolutePos(aPt,*pObj); else SetPos(aPt);
}
@@ -212,14 +212,14 @@ void SdrGluePoint::Mirror(const Point& rRef1, const
Point& rRef2, Degree100 nAng
Point aPt(pObj!=nullptr ? GetAbsolutePos(*pObj) : GetPos());
MirrorPoint(aPt,rRef1,rRef2);
// mirror reference edge
- if(nAlign != (SdrAlign::HORZ_CENTER|SdrAlign::VERT_CENTER))
+ if(m_nAlign != (SdrAlign::HORZ_CENTER|SdrAlign::VERT_CENTER))
{
Degree100 nAW=GetAlignAngle();
nAW+=2_deg100*(nAngle-nAW);
SetAlignAngle(nAW);
}
// mirror exit directions
- SdrEscapeDirection nEscDir0=nEscDir;
+ SdrEscapeDirection nEscDir0=m_nEscDir;
SdrEscapeDirection nEscDir1=SdrEscapeDirection::SMART;
if (nEscDir0&SdrEscapeDirection::LEFT) {
Degree100 nEW=EscDirToAngle(SdrEscapeDirection::LEFT);
@@ -241,7 +241,7 @@ void SdrGluePoint::Mirror(const Point& rRef1, const Point&
rRef2, Degree100 nAng
nEW+=2_deg100*(nAngle-nEW);
nEscDir1|=EscAngleToDir(nEW);
}
- nEscDir=nEscDir1;
+ m_nEscDir=nEscDir1;
if (pObj!=nullptr) SetAbsolutePos(aPt,*pObj); else SetPos(aPt);
}
