include/svx/svdhdl.hxx | 30 +++++++++++++++---------------
svx/source/svdraw/svdhdl.cxx | 42 +++++++++++++++++++++---------------------
2 files changed, 36 insertions(+), 36 deletions(-)
New commits:
commit 819fabd11f9b78bf7ecef1d2afeae1a9d8382afa
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Oct 2 08:25:44 2023 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Oct 2 10:40:23 2023 +0200
svx: prefix members of SdrHdlGradient
See tdf#94879 for motivation.
Change-Id: I1da02ee14cb3cbc0cd51ccc4f612947b789ca46a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157478
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index abd5a060f5aa..115bf9c77896 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -292,18 +292,18 @@ class SdrHdlGradient final : public SdrHdl
{
private:
// pointer to used color handles
- SdrHdlColor* pColHdl1;
- SdrHdlColor* pColHdl2;
+ SdrHdlColor* m_pColHdl1;
+ SdrHdlColor* m_pColHdl2;
// 2nd position
- Point a2ndPos;
+ Point m_a2ndPos;
// is this a gradient or a transparence
- bool bGradient : 1;
+ bool m_bGradient : 1;
// select which handle to move
- bool bMoveSingleHandle : 1;
- bool bMoveFirstHandle : 1;
+ bool m_bMoveSingleHandle : 1;
+ bool m_bMoveFirstHandle : 1;
// create marker for this kind
virtual void CreateB2dIAObject() override;
@@ -312,14 +312,14 @@ public:
SdrHdlGradient(const Point& rRef1, const Point& rRef2, bool bGrad);
virtual ~SdrHdlGradient() override;
- bool IsGradient() const { return bGradient; }
+ bool IsGradient() const { return m_bGradient; }
// set the associated color handles
- void SetColorHandles(SdrHdlColor* pL1, SdrHdlColor* pL2) { pColHdl1 = pL1;
pColHdl2 = pL2; }
- SdrHdlColor* GetColorHdl1() const { return pColHdl1; }
- SdrHdlColor* GetColorHdl2() const { return pColHdl2; }
+ void SetColorHandles(SdrHdlColor* pL1, SdrHdlColor* pL2) { m_pColHdl1 =
pL1; m_pColHdl2 = pL2; }
+ SdrHdlColor* GetColorHdl1() const { return m_pColHdl1; }
+ SdrHdlColor* GetColorHdl2() const { return m_pColHdl2; }
- const Point& Get2ndPos() const { return a2ndPos; }
+ const Point& Get2ndPos() const { return m_a2ndPos; }
void Set2ndPos(const Point& rPnt);
// the link called by the color handles
@@ -329,10 +329,10 @@ public:
void FromIAOToItem(SdrObject* pObj, bool bSetItemOnObject, bool bUndo);
// selection flags for interaction
- bool IsMoveSingleHandle() const { return bMoveSingleHandle; }
- void SetMoveSingleHandle(bool bNew) { bMoveSingleHandle = bNew; }
- bool IsMoveFirstHandle() const { return bMoveFirstHandle; }
- void SetMoveFirstHandle(bool bNew) { bMoveFirstHandle = bNew; }
+ bool IsMoveSingleHandle() const { return m_bMoveSingleHandle; }
+ void SetMoveSingleHandle(bool bNew) { m_bMoveSingleHandle = bNew; }
+ bool IsMoveFirstHandle() const { return m_bMoveFirstHandle; }
+ void SetMoveFirstHandle(bool bNew) { m_bMoveFirstHandle = bNew; }
};
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 77904d411a9f..407e82eedb4e 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -1253,12 +1253,12 @@ void SdrHdlColor::SetSize(const Size& rNew)
SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, bool
bGrad)
: SdrHdl(rRef1, bGrad ? SdrHdlKind::Gradient : SdrHdlKind::Transparence)
- , pColHdl1(nullptr)
- , pColHdl2(nullptr)
- , a2ndPos(rRef2)
- , bGradient(bGrad)
- , bMoveSingleHandle(false)
- , bMoveFirstHandle(false)
+ , m_pColHdl1(nullptr)
+ , m_pColHdl2(nullptr)
+ , m_a2ndPos(rRef2)
+ , m_bGradient(bGrad)
+ , m_bMoveSingleHandle(false)
+ , m_bMoveFirstHandle(false)
{
}
@@ -1268,10 +1268,10 @@ SdrHdlGradient::~SdrHdlGradient()
void SdrHdlGradient::Set2ndPos(const Point& rPnt)
{
- if(a2ndPos != rPnt)
+ if(m_a2ndPos != rPnt)
{
// remember new position
- a2ndPos = rPnt;
+ m_a2ndPos = rPnt;
// create new display
Touch();
@@ -1306,7 +1306,7 @@ void SdrHdlGradient::CreateB2dIAObject()
if (xManager.is())
{
// striped line in between
- basegfx::B2DVector aVec(a2ndPos.X() - m_aPos.X(), a2ndPos.Y()
- m_aPos.Y());
+ basegfx::B2DVector aVec(m_a2ndPos.X() - m_aPos.X(),
m_a2ndPos.Y() - m_aPos.Y());
double fVecLen = aVec.getLength();
double fLongPercentArrow = (1.0 - 0.05) * fVecLen;
double fHalfArrowWidth = (0.05 * 0.5) * fVecLen;
@@ -1340,7 +1340,7 @@ void SdrHdlGradient::CreateB2dIAObject()
basegfx::B2DPoint aPositionLeft(aLeft.X(), aLeft.Y());
basegfx::B2DPoint aPositionRight(aRight.X(), aRight.Y());
- basegfx::B2DPoint aPosition2(a2ndPos.X(), a2ndPos.Y());
+ basegfx::B2DPoint aPosition2(m_a2ndPos.X(), m_a2ndPos.Y());
pNewOverlayObject.reset(new
sdr::overlay::OverlayTriangle(
@@ -1377,10 +1377,10 @@ void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj,
bool bSetItemOnObject, bool
aGradTransVector.maPositionA = basegfx::B2DPoint(GetPos().X(),
GetPos().Y());
aGradTransVector.maPositionB = basegfx::B2DPoint(Get2ndPos().X(),
Get2ndPos().Y());
- if(pColHdl1)
- aGradTransVector.aCol1 = pColHdl1->GetColor();
- if(pColHdl2)
- aGradTransVector.aCol2 = pColHdl2->GetColor();
+ if(m_pColHdl1)
+ aGradTransVector.aCol1 = m_pColHdl1->GetColor();
+ if(m_pColHdl2)
+ aGradTransVector.aCol2 = m_pColHdl2->GetColor();
if(IsGradient())
aOldGradTransGradient.aGradient =
rSet.Get(XATTR_FILLGRADIENT).GetGradientValue();
@@ -1388,7 +1388,7 @@ void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, bool
bSetItemOnObject, bool
aOldGradTransGradient.aGradient =
rSet.Get(XATTR_FILLFLOATTRANSPARENCE).GetGradientValue();
// transform vector data to gradient
- GradTransformer::VecToGrad(aGradTransVector, aGradTransGradient,
aOldGradTransGradient, _pObj, bMoveSingleHandle, bMoveFirstHandle);
+ GradTransformer::VecToGrad(aGradTransVector, aGradTransGradient,
aOldGradTransGradient, _pObj, m_bMoveSingleHandle, m_bMoveFirstHandle);
if(bSetItemOnObject)
{
@@ -1422,15 +1422,15 @@ void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj,
bool bSetItemOnObject, bool
SetPos(Point(FRound(aGradTransVector.maPositionA.getX()),
FRound(aGradTransVector.maPositionA.getY())));
Set2ndPos(Point(FRound(aGradTransVector.maPositionB.getX()),
FRound(aGradTransVector.maPositionB.getY())));
- if(pColHdl1)
+ if(m_pColHdl1)
{
- pColHdl1->SetPos(Point(FRound(aGradTransVector.maPositionA.getX()),
FRound(aGradTransVector.maPositionA.getY())));
- pColHdl1->SetColor(aGradTransVector.aCol1);
+ m_pColHdl1->SetPos(Point(FRound(aGradTransVector.maPositionA.getX()),
FRound(aGradTransVector.maPositionA.getY())));
+ m_pColHdl1->SetColor(aGradTransVector.aCol1);
}
- if(pColHdl2)
+ if(m_pColHdl2)
{
- pColHdl2->SetPos(Point(FRound(aGradTransVector.maPositionB.getX()),
FRound(aGradTransVector.maPositionB.getY())));
- pColHdl2->SetColor(aGradTransVector.aCol2);
+ m_pColHdl2->SetPos(Point(FRound(aGradTransVector.maPositionB.getX()),
FRound(aGradTransVector.maPositionB.getY())));
+ m_pColHdl2->SetColor(aGradTransVector.aCol2);
}
}
