sd/source/ui/func/fuconarc.cxx | 8 ++++----
svx/sdi/svx.sdi | 20 ++++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit f4e8c28e465d103a7ac4bc711e3b23ad3cae9996
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Jan 2 19:00:35 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Jan 3 08:52:31 2021 +0100
Revert "use SdrAngleItem for ID_VAL_ANGLE*"
This reverts commit 0a99feb4539b8c64679778cd5f6c99f58fbaedd3.
Because I didn't find the places that call this SDI action,
and I can't seem to find them now, so I can't fix the callers to use
SdrAngleItem in their parameter list.
Change-Id: Ia1a07c0486b6ecca1b8a8a9d597a2404e85c0786
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108596
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index 1ced022927ac..093d0a70f916 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -80,8 +80,8 @@ void FuConstructArc::DoExecute( SfxRequest& rReq )
const SfxUInt32Item* pCenterY =
rReq.GetArg<SfxUInt32Item>(ID_VAL_CENTER_Y);
const SfxUInt32Item* pAxisX = rReq.GetArg<SfxUInt32Item>(ID_VAL_AXIS_X);
const SfxUInt32Item* pAxisY = rReq.GetArg<SfxUInt32Item>(ID_VAL_AXIS_Y);
- const SdrAngleItem* pPhiStart =
rReq.GetArg<SdrAngleItem>(ID_VAL_ANGLESTART);
- const SdrAngleItem* pPhiEnd = rReq.GetArg<SdrAngleItem>(ID_VAL_ANGLEEND);
+ const SfxUInt32Item* pPhiStart =
rReq.GetArg<SfxUInt32Item>(ID_VAL_ANGLESTART);
+ const SfxUInt32Item* pPhiEnd = rReq.GetArg<SfxUInt32Item>(ID_VAL_ANGLEEND);
::tools::Rectangle aNewRectangle (pCenterX->GetValue () -
pAxisX->GetValue () / 2,
pCenterY->GetValue () - pAxisY->GetValue () / 2,
@@ -94,8 +94,8 @@ void FuConstructArc::DoExecute( SfxRequest& rReq )
mpView->getSdrModelFromSdrView(),
ToSdrCircKind(mpView->GetCurrentObjIdentifier()),
aNewRectangle,
- pPhiStart->GetValue(),
- pPhiEnd->GetValue());
+ Degree100(pPhiStart->GetValue() * 10),
+ Degree100(pPhiEnd->GetValue() * 10));
SdrPageView *pPV = mpView->GetSdrPageView();
mpView->InsertObjectAtView(pNewCircle, *pPV, SdrInsertFlags::SETDEFLAYER);
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index d22ca5fb064f..dcf2a2c89126 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -234,7 +234,7 @@ SfxBoolItem AlignUp SID_OBJECT_ALIGN_UP
SfxBoolItem Arc SID_DRAW_ARC
-(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SdrAngleItem StartAngle ID_VAL_ANGLESTART,SdrAngleItem EndAngle
ID_VAL_ANGLEEND)
+(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle
ID_VAL_ANGLEEND)
[
AutoUpdate = TRUE,
FastCall = FALSE,
@@ -1402,7 +1402,7 @@ SfxBoolItem Circle_Unfilled SID_DRAW_CIRCLE_NOFILL
SfxBoolItem CircleArc SID_DRAW_CIRCLEARC
-(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SdrAngleItem StartAngle ID_VAL_ANGLESTART,SdrAngleItem EndAngle
ID_VAL_ANGLEEND)
+(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle
ID_VAL_ANGLEEND)
[
AutoUpdate = TRUE,
FastCall = FALSE,
@@ -1419,7 +1419,7 @@ SfxBoolItem CircleArc SID_DRAW_CIRCLEARC
SfxBoolItem CircleCut SID_DRAW_CIRCLECUT
-(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SdrAngleItem StartAngle ID_VAL_ANGLESTART,SdrAngleItem EndAngle
ID_VAL_ANGLEEND)
+(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle
ID_VAL_ANGLEEND)
[
AutoUpdate = TRUE,
FastCall = FALSE,
@@ -1437,7 +1437,7 @@ SfxBoolItem CircleCut SID_DRAW_CIRCLECUT
SfxBoolItem CircleCut_Unfilled SID_DRAW_CIRCLECUT_NOFILL
-(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SdrAngleItem StartAngle ID_VAL_ANGLESTART,SdrAngleItem EndAngle
ID_VAL_ANGLEEND)
+(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle
ID_VAL_ANGLEEND)
[
AutoUpdate = TRUE,
FastCall = FALSE,
@@ -1454,7 +1454,7 @@ SfxBoolItem CircleCut_Unfilled SID_DRAW_CIRCLECUT_NOFILL
SfxBoolItem CirclePie SID_DRAW_CIRCLEPIE
-(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SdrAngleItem StartAngle ID_VAL_ANGLESTART,SdrAngleItem EndAngle
ID_VAL_ANGLEEND)
+(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle
ID_VAL_ANGLEEND)
[
AutoUpdate = TRUE,
FastCall = FALSE,
@@ -1471,7 +1471,7 @@ SfxBoolItem CirclePie SID_DRAW_CIRCLEPIE
SfxBoolItem CirclePie_Unfilled SID_DRAW_CIRCLEPIE_NOFILL
-(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SdrAngleItem StartAngle ID_VAL_ANGLESTART,SdrAngleItem EndAngle
ID_VAL_ANGLEEND)
+(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle
ID_VAL_ANGLEEND)
[
AutoUpdate = TRUE,
FastCall = FALSE,
@@ -2544,7 +2544,7 @@ SfxBoolItem Ellipse_Unfilled SID_DRAW_ELLIPSE_NOFILL
SfxBoolItem EllipseCut SID_DRAW_ELLIPSECUT
-(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SdrAngleItem StartAngle ID_VAL_ANGLESTART,SdrAngleItem EndAngle
ID_VAL_ANGLEEND)
+(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle
ID_VAL_ANGLEEND)
[
AutoUpdate = TRUE,
FastCall = FALSE,
@@ -2561,7 +2561,7 @@ SfxBoolItem EllipseCut SID_DRAW_ELLIPSECUT
SfxBoolItem EllipseCut_Unfilled SID_DRAW_ELLIPSECUT_NOFILL
-(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SdrAngleItem StartAngle ID_VAL_ANGLESTART,SdrAngleItem EndAngle
ID_VAL_ANGLEEND)
+(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle
ID_VAL_ANGLEEND)
[
AutoUpdate = TRUE,
FastCall = FALSE,
@@ -6555,7 +6555,7 @@ SfxBoolItem InsertGridControl SID_INSERT_GRIDCONTROL
]
SfxBoolItem Pie SID_DRAW_PIE
-(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SdrAngleItem StartAngle ID_VAL_ANGLESTART,SdrAngleItem EndAngle
ID_VAL_ANGLEEND)
+(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle
ID_VAL_ANGLEEND)
[
AutoUpdate = TRUE,
FastCall = FALSE,
@@ -6573,7 +6573,7 @@ SfxBoolItem Pie SID_DRAW_PIE
SfxBoolItem Pie_Unfilled SID_DRAW_PIE_NOFILL
-(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SdrAngleItem StartAngle ID_VAL_ANGLESTART,SdrAngleItem EndAngle
ID_VAL_ANGLEEND)
+(SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY
ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY
ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle
ID_VAL_ANGLEEND)
[
AutoUpdate = TRUE,
FastCall = FALSE,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
