include/svx/svdoedge.hxx | 12 ++++++------
svx/source/svdraw/svdoedge.cxx | 38 +++++++++++++++++++-------------------
2 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit 93c5885dad3343f3d1a55e33bf83fecd1fed8cab
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Tue Sep 12 22:48:12 2023 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Wed Sep 13 07:14:19 2023 +0200
svx: prefix members of SaveGeoData
See tdf#94879 for motivation.
Change-Id: I9ba78fdbb7f2390f43e3315c8cdf86c56f96f478
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156863
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index 4da2219b3645..94bb89a00a3e 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -112,12 +112,12 @@ public:
class SdrEdgeObjGeoData final : public SdrTextObjGeoData
{
public:
- SdrObjConnection aCon1; // connection status of the beginning
of the line
- SdrObjConnection aCon2; // connection status of the end of the
line
- std::optional<XPolygon> pEdgeTrack;
- bool bEdgeTrackDirty; // true -> connector track
needs to be recalculated
- bool bEdgeTrackUserDefined;
- SdrEdgeInfoRec aEdgeInfo;
+ SdrObjConnection m_aCon1; // connection status of the
beginning of the line
+ SdrObjConnection m_aCon2; // connection status of the end of
the line
+ std::optional<XPolygon> m_pEdgeTrack;
+ bool m_bEdgeTrackDirty; // true -> connector track
needs to be recalculated
+ bool m_bEdgeTrackUserDefined;
+ SdrEdgeInfoRec m_aEdgeInfo;
public:
SdrEdgeObjGeoData();
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 4eee430ced24..f70e1f924f6b 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -2478,9 +2478,9 @@ void SdrEdgeObj::NbcSetPoint(const Point& rPnt,
sal_uInt32 i)
}
SdrEdgeObjGeoData::SdrEdgeObjGeoData()
- : pEdgeTrack(std::in_place)
- , bEdgeTrackDirty(false)
- , bEdgeTrackUserDefined(false)
+ : m_pEdgeTrack(std::in_place)
+ , m_bEdgeTrackDirty(false)
+ , m_bEdgeTrackUserDefined(false)
{
}
@@ -2497,38 +2497,38 @@ void SdrEdgeObj::SaveGeoData(SdrObjGeoData& rGeo) const
{
SdrTextObj::SaveGeoData(rGeo);
SdrEdgeObjGeoData& rEGeo=static_cast<SdrEdgeObjGeoData&>(rGeo);
- rEGeo.aCon1 =m_aCon1;
- rEGeo.aCon2 =m_aCon2;
- *rEGeo.pEdgeTrack =*m_pEdgeTrack;
- rEGeo.bEdgeTrackDirty=m_bEdgeTrackDirty;
- rEGeo.bEdgeTrackUserDefined=m_bEdgeTrackUserDefined;
- rEGeo.aEdgeInfo =m_aEdgeInfo;
+ rEGeo.m_aCon1 =m_aCon1;
+ rEGeo.m_aCon2 =m_aCon2;
+ *rEGeo.m_pEdgeTrack =*m_pEdgeTrack;
+ rEGeo.m_bEdgeTrackDirty=m_bEdgeTrackDirty;
+ rEGeo.m_bEdgeTrackUserDefined=m_bEdgeTrackUserDefined;
+ rEGeo.m_aEdgeInfo =m_aEdgeInfo;
}
void SdrEdgeObj::RestoreGeoData(const SdrObjGeoData& rGeo)
{
SdrTextObj::RestoreGeoData(rGeo);
const SdrEdgeObjGeoData& rEGeo=static_cast<const SdrEdgeObjGeoData&>(rGeo);
- if (m_aCon1.m_pSdrObj!=rEGeo.aCon1.m_pSdrObj) {
+ if (m_aCon1.m_pSdrObj!=rEGeo.m_aCon1.m_pSdrObj) {
if (m_aCon1.m_pSdrObj!=nullptr)
m_aCon1.m_pSdrObj->RemoveListener(*this);
- m_aCon1=rEGeo.aCon1;
+ m_aCon1=rEGeo.m_aCon1;
if (m_aCon1.m_pSdrObj!=nullptr) m_aCon1.m_pSdrObj->AddListener(*this);
}
else
- m_aCon1=rEGeo.aCon1;
+ m_aCon1=rEGeo.m_aCon1;
- if (m_aCon2.m_pSdrObj!=rEGeo.aCon2.m_pSdrObj) {
+ if (m_aCon2.m_pSdrObj!=rEGeo.m_aCon2.m_pSdrObj) {
if (m_aCon2.m_pSdrObj!=nullptr)
m_aCon2.m_pSdrObj->RemoveListener(*this);
- m_aCon2=rEGeo.aCon2;
+ m_aCon2=rEGeo.m_aCon2;
if (m_aCon2.m_pSdrObj!=nullptr) m_aCon2.m_pSdrObj->AddListener(*this);
}
else
- m_aCon2=rEGeo.aCon2;
+ m_aCon2=rEGeo.m_aCon2;
- *m_pEdgeTrack =*rEGeo.pEdgeTrack;
- m_bEdgeTrackDirty=rEGeo.bEdgeTrackDirty;
- m_bEdgeTrackUserDefined=rEGeo.bEdgeTrackUserDefined;
- m_aEdgeInfo =rEGeo.aEdgeInfo;
+ *m_pEdgeTrack =*rEGeo.m_pEdgeTrack;
+ m_bEdgeTrackDirty=rEGeo.m_bEdgeTrackDirty;
+ m_bEdgeTrackUserDefined=rEGeo.m_bEdgeTrackUserDefined;
+ m_aEdgeInfo =rEGeo.m_aEdgeInfo;
}
Point SdrEdgeObj::GetTailPoint( bool bTail ) const
