include/svx/svdpoev.hxx | 8 ++++---- svx/source/svdraw/svdpoev.cxx | 32 ++++++++++++++++---------------- 2 files changed, 20 insertions(+), 20 deletions(-)
New commits: commit 92b811e50b024ecbdf1132e77b91c9eb4981e203 Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Mon Sep 23 08:08:35 2024 +0200 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Mon Sep 23 09:30:29 2024 +0200 svx: prefix members of SdrPolyEditView See tdf#94879 for motivation. Change-Id: Ib50e86f1ec207de37074f953eb062c2c46c3a2f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173784 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmik...@collabora.com> diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx index 089c88903068..775eb14b4972 100644 --- a/include/svx/svdpoev.hxx +++ b/include/svx/svdpoev.hxx @@ -28,11 +28,11 @@ class SVXCORE_DLLPUBLIC SdrPolyEditView : public SdrEditView, public IPolyPolygo { friend class SdrEditView; - bool bSetMarkedPointsSmoothPossible : 1; - bool bSetMarkedSegmentsKindPossible : 1; + bool m_bSetMarkedPointsSmoothPossible : 1; + bool m_bSetMarkedSegmentsKindPossible : 1; - SdrPathSmoothKind eMarkedPointsSmooth; - SdrPathSegmentKind eMarkedSegmentsKind; + SdrPathSmoothKind m_eMarkedPointsSmooth; + SdrPathSegmentKind m_eMarkedSegmentsKind; private: SVX_DLLPRIVATE void ImpResetPolyPossibilityFlags(); diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index d6e3bcd22650..9cbf9b99079b 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -39,10 +39,10 @@ using namespace sdr; void SdrPolyEditView::ImpResetPolyPossibilityFlags() { - eMarkedPointsSmooth=SdrPathSmoothKind::DontCare; - eMarkedSegmentsKind=SdrPathSegmentKind::DontCare; - bSetMarkedPointsSmoothPossible=false; - bSetMarkedSegmentsKindPossible=false; + m_eMarkedPointsSmooth=SdrPathSmoothKind::DontCare; + m_eMarkedSegmentsKind=SdrPathSegmentKind::DontCare; + m_bSetMarkedPointsSmoothPossible=false; + m_bSetMarkedSegmentsKindPossible=false; } SdrPolyEditView::SdrPolyEditView( @@ -93,11 +93,11 @@ void SdrPolyEditView::CheckPolyPossibilitiesHelper( SdrMark* pM, bool& b1stSmoot return; const bool bClosed(pPath->IsClosed()); - bSetMarkedPointsSmoothPossible = true; + m_bSetMarkedPointsSmoothPossible = true; if (bClosed) { - bSetMarkedSegmentsKindPossible = true; + m_bSetMarkedSegmentsKindPossible = true; } for (const auto& rPt : rPts) @@ -110,9 +110,9 @@ void SdrPolyEditView::CheckPolyPossibilitiesHelper( SdrMark* pM, bool& b1stSmoot const basegfx::B2DPolygon aLocalPolygon(pPath->GetPathPoly().getB2DPolygon(nPolyNum)); bool bCanSegment(bClosed || nPntNum < aLocalPolygon.count() - 1); - if(!bSetMarkedSegmentsKindPossible && bCanSegment) + if(!m_bSetMarkedSegmentsKindPossible && bCanSegment) { - bSetMarkedSegmentsKindPossible = true; + m_bSetMarkedSegmentsKindPossible = true; } if(!bSmoothFuz) @@ -149,23 +149,23 @@ void SdrPolyEditView::CheckPolyPossibilitiesHelper( SdrMark* pM, bool& b1stSmoot { if(basegfx::B2VectorContinuity::NONE == eSmooth) { - eMarkedPointsSmooth = SdrPathSmoothKind::Angular; + m_eMarkedPointsSmooth = SdrPathSmoothKind::Angular; } if(basegfx::B2VectorContinuity::C1 == eSmooth) { - eMarkedPointsSmooth = SdrPathSmoothKind::Asymmetric; + m_eMarkedPointsSmooth = SdrPathSmoothKind::Asymmetric; } if(basegfx::B2VectorContinuity::C2 == eSmooth) { - eMarkedPointsSmooth = SdrPathSmoothKind::Symmetric; + m_eMarkedPointsSmooth = SdrPathSmoothKind::Symmetric; } } if(!b1stSegm && !bSegmFuz) { - eMarkedSegmentsKind = bCurve ? SdrPathSegmentKind::Curve : SdrPathSegmentKind::Line; + m_eMarkedSegmentsKind = bCurve ? SdrPathSegmentKind::Curve : SdrPathSegmentKind::Line; } } @@ -260,25 +260,25 @@ void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind) bool SdrPolyEditView::IsSetMarkedPointsSmoothPossible() const { ForcePossibilities(); - return bSetMarkedPointsSmoothPossible; + return m_bSetMarkedPointsSmoothPossible; } SdrPathSmoothKind SdrPolyEditView::GetMarkedPointsSmooth() const { ForcePossibilities(); - return eMarkedPointsSmooth; + return m_eMarkedPointsSmooth; } bool SdrPolyEditView::IsSetMarkedSegmentsKindPossible() const { ForcePossibilities(); - return bSetMarkedSegmentsKindPossible; + return m_bSetMarkedSegmentsKindPossible; } SdrPathSegmentKind SdrPolyEditView::GetMarkedSegmentsKind() const { ForcePossibilities(); - return eMarkedSegmentsKind; + return m_eMarkedSegmentsKind; } bool SdrPolyEditView::IsDeleteMarkedPointsPossible() const