summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/svx/ipolypolygoneditorcontroller.hxx13
-rw-r--r--sd/source/ui/animations/motionpathtag.cxx8
-rw-r--r--sd/source/ui/view/drbezob.cxx14
-rw-r--r--svx/source/dialog/graphctl.cxx2
-rw-r--r--svx/source/svdraw/svdpoev.cxx14
-rw-r--r--sw/source/uibase/shells/beziersh.cxx16
6 files changed, 34 insertions, 33 deletions
diff --git a/include/svx/ipolypolygoneditorcontroller.hxx b/include/svx/ipolypolygoneditorcontroller.hxx
index 1df104662be7..c7cdad9fccf8 100644
--- a/include/svx/ipolypolygoneditorcontroller.hxx
+++ b/include/svx/ipolypolygoneditorcontroller.hxx
@@ -26,12 +26,13 @@
// Defines
-
-enum SdrPathSmoothKind {SDRPATHSMOOTH_DONTCARE, // only for status query
- SDRPATHSMOOTH_ANGULAR, // angular
- SDRPATHSMOOTH_ASYMMETRIC, // asymmetric, normal Smooth
- SDRPATHSMOOTH_SYMMETRIC}; // symmetric
-
+enum class SdrPathSmoothKind
+{
+ DontCare, // only for status query
+ Angular, // angular
+ Asymmetric, // asymmetric, normal Smooth
+ Symmetric // symmetric
+};
enum class SdrPathSegmentKind
{
DontCare, // only for status query
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 4a786171cbfb..6e4583614896 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -1125,22 +1125,22 @@ SdrPathSmoothKind MotionPathTag::GetMarkedPointsSmooth() const
if( mpPathObj )
return mrView.GetMarkedPointsSmooth();
else
- return SDRPATHSMOOTH_ANGULAR;
+ return SdrPathSmoothKind::Angular;
}
void MotionPathTag::SetMarkedPointsSmooth(SdrPathSmoothKind eKind)
{
basegfx::B2VectorContinuity eFlags;
- if(SDRPATHSMOOTH_ANGULAR == eKind)
+ if(SdrPathSmoothKind::Angular == eKind)
{
eFlags = basegfx::B2VectorContinuity::NONE;
}
- else if(SDRPATHSMOOTH_ASYMMETRIC == eKind)
+ else if(SdrPathSmoothKind::Asymmetric == eKind)
{
eFlags = basegfx::B2VectorContinuity::C1;
}
- else if(SDRPATHSMOOTH_SYMMETRIC == eKind)
+ else if(SdrPathSmoothKind::Symmetric == eKind)
{
eFlags = basegfx::B2VectorContinuity::C2;
}
diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx
index 55a755341bc8..f012242a7b36 100644
--- a/sd/source/ui/view/drbezob.cxx
+++ b/sd/source/ui/view/drbezob.cxx
@@ -167,10 +167,10 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet)
SdrPathSmoothKind eSmooth = pIPPEC->GetMarkedPointsSmooth();
switch (eSmooth)
{
- case SDRPATHSMOOTH_DONTCARE : break;
- case SDRPATHSMOOTH_ANGULAR : rSet.Put(SfxBoolItem(SID_BEZIER_EDGE, true)); break;
- case SDRPATHSMOOTH_ASYMMETRIC: rSet.Put(SfxBoolItem(SID_BEZIER_SMOOTH,true)); break;
- case SDRPATHSMOOTH_SYMMETRIC : rSet.Put(SfxBoolItem(SID_BEZIER_SYMMTR,true)); break;
+ case SdrPathSmoothKind::DontCare : break;
+ case SdrPathSmoothKind::Angular : rSet.Put(SfxBoolItem(SID_BEZIER_EDGE, true)); break;
+ case SdrPathSmoothKind::Asymmetric: rSet.Put(SfxBoolItem(SID_BEZIER_SMOOTH,true)); break;
+ case SdrPathSmoothKind::Symmetric : rSet.Put(SfxBoolItem(SID_BEZIER_SYMMTR,true)); break;
}
}
if (!pIPPEC || !pIPPEC->IsOpenCloseMarkedObjectsPossible())
@@ -249,9 +249,9 @@ void BezierObjectBar::Execute(SfxRequest& rReq)
switch (nSId)
{
default:
- case SID_BEZIER_EDGE: eKind = SDRPATHSMOOTH_ANGULAR; break;
- case SID_BEZIER_SMOOTH: eKind = SDRPATHSMOOTH_ASYMMETRIC; break;
- case SID_BEZIER_SYMMTR: eKind = SDRPATHSMOOTH_SYMMETRIC; break;
+ case SID_BEZIER_EDGE: eKind = SdrPathSmoothKind::Angular; break;
+ case SID_BEZIER_SMOOTH: eKind = SdrPathSmoothKind::Asymmetric; break;
+ case SID_BEZIER_SYMMTR: eKind = SdrPathSmoothKind::Symmetric; break;
}
pIPPEC->SetMarkedPointsSmooth(eKind);
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 896a0932a7b1..cbd6fda345c5 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -156,7 +156,7 @@ void GraphCtrl::InitSdrModel()
pView->EnableExtendedMouseEventDispatcher( true );
pView->ShowSdrPage(pView->GetModel()->GetPage(0));
pView->SetFrameDragSingles();
- pView->SetMarkedPointsSmooth( SDRPATHSMOOTH_SYMMETRIC );
+ pView->SetMarkedPointsSmooth( SdrPathSmoothKind::Symmetric );
pView->SetEditMode();
// #i72889# set needed flags
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 502a1d7036b4..d4c2e2a528e5 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -38,7 +38,7 @@ using namespace sdr;
void SdrPolyEditView::ImpResetPolyPossibilityFlags()
{
- eMarkedPointsSmooth=SDRPATHSMOOTH_DONTCARE;
+ eMarkedPointsSmooth=SdrPathSmoothKind::DontCare;
eMarkedSegmentsKind=SdrPathSegmentKind::DontCare;
bSetMarkedPointsSmoothPossible=false;
bSetMarkedSegmentsKindPossible=false;
@@ -153,17 +153,17 @@ void SdrPolyEditView::CheckPolyPossibilitiesHelper( SdrMark* pM, bool& b1stSmoot
{
if(basegfx::B2VectorContinuity::NONE == eSmooth)
{
- eMarkedPointsSmooth = SDRPATHSMOOTH_ANGULAR;
+ eMarkedPointsSmooth = SdrPathSmoothKind::Angular;
}
if(basegfx::B2VectorContinuity::C1 == eSmooth)
{
- eMarkedPointsSmooth = SDRPATHSMOOTH_ASYMMETRIC;
+ eMarkedPointsSmooth = SdrPathSmoothKind::Asymmetric;
}
if(basegfx::B2VectorContinuity::C2 == eSmooth)
{
- eMarkedPointsSmooth = SDRPATHSMOOTH_SYMMETRIC;
+ eMarkedPointsSmooth = SdrPathSmoothKind::Symmetric;
}
}
@@ -179,15 +179,15 @@ void SdrPolyEditView::SetMarkedPointsSmooth(SdrPathSmoothKind eKind)
{
basegfx::B2VectorContinuity eFlags;
- if(SDRPATHSMOOTH_ANGULAR == eKind)
+ if(SdrPathSmoothKind::Angular == eKind)
{
eFlags = basegfx::B2VectorContinuity::NONE;
}
- else if(SDRPATHSMOOTH_ASYMMETRIC == eKind)
+ else if(SdrPathSmoothKind::Asymmetric == eKind)
{
eFlags = basegfx::B2VectorContinuity::C1;
}
- else if(SDRPATHSMOOTH_SYMMETRIC == eKind)
+ else if(SdrPathSmoothKind::Symmetric == eKind)
{
eFlags = basegfx::B2VectorContinuity::C2;
}
diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx
index 115628b6e5d5..b05c39313cc3 100644
--- a/sw/source/uibase/shells/beziersh.cxx
+++ b/sw/source/uibase/shells/beziersh.cxx
@@ -168,13 +168,13 @@ void SwBezierShell::Execute(SfxRequest &rReq)
case SID_BEZIER_SMOOTH:
case SID_BEZIER_SYMMTR:
{
- SdrPathSmoothKind eKind = SDRPATHSMOOTH_ASYMMETRIC;
+ SdrPathSmoothKind eKind = SdrPathSmoothKind::Asymmetric;
switch (nSlotId)
{
- case SID_BEZIER_EDGE: eKind = SDRPATHSMOOTH_ANGULAR; break;
- case SID_BEZIER_SMOOTH: eKind = SDRPATHSMOOTH_ASYMMETRIC; break;
- case SID_BEZIER_SYMMTR: eKind = SDRPATHSMOOTH_SYMMETRIC; break;
+ case SID_BEZIER_EDGE: eKind = SdrPathSmoothKind::Angular; break;
+ case SID_BEZIER_SMOOTH: eKind = SdrPathSmoothKind::Asymmetric; break;
+ case SID_BEZIER_SYMMTR: eKind = SdrPathSmoothKind::Symmetric; break;
}
SdrPathSmoothKind eSmooth = pSdrView->GetMarkedPointsSmooth();
@@ -284,15 +284,15 @@ void SwBezierShell::GetState(SfxItemSet &rSet)
bool bEnable = false;
switch (eSmooth)
{
- case SDRPATHSMOOTH_DONTCARE :
+ case SdrPathSmoothKind::DontCare :
break;
- case SDRPATHSMOOTH_ANGULAR :
+ case SdrPathSmoothKind::Angular :
bEnable = nWhich == SID_BEZIER_EDGE;
break;
- case SDRPATHSMOOTH_ASYMMETRIC:
+ case SdrPathSmoothKind::Asymmetric:
bEnable = nWhich == SID_BEZIER_SMOOTH;
break;
- case SDRPATHSMOOTH_SYMMETRIC :
+ case SdrPathSmoothKind::Symmetric :
bEnable = nWhich == SID_BEZIER_SYMMTR;
break;
}
generated by cgit (git 2.34.1) at 2024-08-05 16:54:09 +0000