[Libreoffice-commits] core.git: include/svx svx/sdi svx/source sw/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Tue Dec 29 18:10:51 UTC 2020
include/svx/svxids.hrc | 2 +-
svx/sdi/svx.sdi | 2 +-
svx/source/svdraw/svdedtv1.cxx | 2 +-
sw/source/uibase/shells/frmsh.cxx | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 8c87e3d63a6e9d498a4e5da1bcc4a10451c1a7f9
Author: Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Mon Dec 28 21:01:13 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Dec 29 19:10:05 2020 +0100
use SdrAngleItem for SID_ATTR_TRANSFORM_DELTA_ANGLE
as a precursor to introducing a strong_int type for hundredths
of a degree
Change-Id: I766f1c2f8c6d31ec1ea2f064293d70b30da0bc56
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108431
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 91c7191dd104..82c6364d9a7e 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -251,7 +251,7 @@ class SdrAngleItem;
#define SID_ATTR_TRANSFORM_ROT_X TypedWhichId<SfxInt32Item>( SID_SVX_START + 93 )
#define SID_ATTR_TRANSFORM_ROT_Y TypedWhichId<SfxInt32Item>( SID_SVX_START + 94 )
#define SID_ATTR_TRANSFORM_ANGLE TypedWhichId<SdrAngleItem>( SID_SVX_START + 95 )
-#define SID_ATTR_TRANSFORM_DELTA_ANGLE TypedWhichId<SfxInt32Item>( SID_SVX_START + 96 )
+#define SID_ATTR_TRANSFORM_DELTA_ANGLE TypedWhichId<SdrAngleItem>( SID_SVX_START + 96 )
// CAUTION! Range <96..100> used by SFX2 (!)
#define SID_SIZE_ALL ( SID_SVX_START + 101 )
#define SID_DRAW_LINE ( SID_SVX_START + 102 )
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 32fda1bedab6..dcf2a2c89126 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -8753,7 +8753,7 @@ SvxULSpaceItem TopBottomMargin SID_ATTR_ULSPACE
SfxVoidItem TransformDialog SID_ATTR_TRANSFORM
-(SfxUInt32Item TransformPosX SID_ATTR_TRANSFORM_POS_X,SfxUInt32Item TransformPosY SID_ATTR_TRANSFORM_POS_Y,SfxUInt32Item TransformWidth SID_ATTR_TRANSFORM_WIDTH, SfxUInt32Item TransformHeight SID_ATTR_TRANSFORM_HEIGHT,SfxUInt32Item TransformRotationDeltaAngle SID_ATTR_TRANSFORM_DELTA_ANGLE,SdrAngleItem TransformRotationAngle SID_ATTR_TRANSFORM_ANGLE,SfxUInt32Item TransformRotationX SID_ATTR_TRANSFORM_ROT_X,SfxUInt32Item TransformRotationY SID_ATTR_TRANSFORM_ROT_Y)
+(SfxUInt32Item TransformPosX SID_ATTR_TRANSFORM_POS_X,SfxUInt32Item TransformPosY SID_ATTR_TRANSFORM_POS_Y,SfxUInt32Item TransformWidth SID_ATTR_TRANSFORM_WIDTH, SfxUInt32Item TransformHeight SID_ATTR_TRANSFORM_HEIGHT,SdrAngleItem TransformRotationDeltaAngle SID_ATTR_TRANSFORM_DELTA_ANGLE,SdrAngleItem TransformRotationAngle SID_ATTR_TRANSFORM_ANGLE,SfxUInt32Item TransformRotationX SID_ATTR_TRANSFORM_ROT_X,SfxUInt32Item TransformRotationY SID_ATTR_TRANSFORM_ROT_Y)
[
AutoUpdate = FALSE,
FastCall = TRUE,
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index c9196b7a3fff..a75bc8336eb8 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -1600,7 +1600,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
// rotation
if (SfxItemState::SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_DELTA_ANGLE, true, &pPoolItem)) {
- nRotateAngle = static_cast<const SfxInt32Item*>(pPoolItem)->GetValue();
+ nRotateAngle = static_cast<const SdrAngleItem*>(pPoolItem)->GetValue();
bRotate = (nRotateAngle != 0);
}
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index f529d30f4be0..10476553c9f7 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -400,7 +400,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
if (pArgs && SfxItemState::SET == pArgs->GetItemState(SID_ATTR_TRANSFORM_DELTA_ANGLE, false, &pItem))
{
- const Degree10 nDeltaRot(static_cast<const SfxUInt32Item*>(pItem)->GetValue() / 10);
+ const Degree10 nDeltaRot(static_cast<const SdrAngleItem*>(pItem)->GetValue() / 10);
aMgr.SetRotation(nOldRot, nOldRot + nDeltaRot, rRotation.GetUnrotatedSize());
}
More information about the Libreoffice-commits
mailing list