strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

svx: prefix members of SdrPolyEditView

Browse source 
See tdf#94879 for motivation.

Change-Id: Ib50e86f1ec207de37074f953eb062c2c46c3a2f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173784
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
This commit is contained in:
Miklos Vajna 2024-09-23 08:08:35 +02:00
parent da75e4750e
commit 92b811e50b
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/svx/svdpoev.hxx
View file

@ -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();

32
svx/source/svdraw/svdpoev.cxx
View file

@ -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