diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2020-10-20 07:27:44 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-21 08:13:05 +0200 |
commit | 0fb58a1ff168ae122e9c8993a3136658e3b0e3f0 (patch) | |
tree | 908983b02f466e0a49599edc70aaa1baaa240371 /svx | |
parent | b84afd2188d6993c91081885dc24664bd3f1cc73 (diff) |
new tools::Degree10 strong typedef
partly to flush some use of "long" out the codebase,
but also to make it obvious which units are being used
for angle values.
Change-Id: I1dc22494ca42c4677a63f685d5903f2b89886dc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104548
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 6 | ||||
-rw-r--r-- | svx/source/dialog/dialcontrol.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/rubydialog.cxx | 2 | ||||
-rw-r--r-- | svx/source/fmcomp/fmgridif.cxx | 4 | ||||
-rw-r--r-- | svx/source/sdr/primitive2d/sdrattributecreator.cxx | 6 | ||||
-rw-r--r-- | svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 8 | ||||
-rw-r--r-- | svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx | 6 | ||||
-rw-r--r-- | svx/source/svdraw/gradtrns.cxx | 16 | ||||
-rw-r--r-- | svx/source/svdraw/svdattr.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdfmtf.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdograf.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdotextdecomposition.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdpdf.cxx | 2 | ||||
-rw-r--r-- | svx/source/table/cell.cxx | 4 | ||||
-rw-r--r-- | svx/source/unodraw/XPropertyTable.cxx | 6 | ||||
-rw-r--r-- | svx/source/xoutdev/xattr.cxx | 26 | ||||
-rw-r--r-- | svx/source/xoutdev/xtabgrdt.cxx | 14 | ||||
-rw-r--r-- | svx/source/xoutdev/xtabhtch.cxx | 8 |
20 files changed, 61 insertions, 61 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 8ccc0337389c..f25fee8d3a4d 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -189,7 +189,7 @@ static void CalculateHorizontalScalingFactor( const SvxWeightItem& rWeightItem = rSdrObjCustomShape.GetMergedItem( EE_CHAR_WEIGHT ); aFont.SetWeight( rWeightItem.GetWeight() ); - aFont.SetOrientation( 0 ); + aFont.SetOrientation( Degree10(0) ); // initializing virtual device ScopedVclPtrInstance< VirtualDevice > pVirDev(DeviceFormat::BITMASK); @@ -294,7 +294,7 @@ static void GetTextAreaOutline( aFont.SetFamilyName( rFontItem.GetFamilyName() ); aFont.SetFamily( rFontItem.GetFamily() ); aFont.SetStyleName( rFontItem.GetStyleName() ); - aFont.SetOrientation( 0 ); + aFont.SetOrientation( Degree10(0) ); const SvxPostureItem& rPostureItem = rSdrObjCustomShape.GetMergedItem( EE_CHAR_ITALIC ); aFont.SetItalic( rPostureItem.GetPosture() ); @@ -338,7 +338,7 @@ static void GetTextAreaOutline( for ( auto& rOutline : aCharacterData.vOutlines ) { // rotating - rOutline.Rotate( Point( nTextWidth / 2, rFWData.nSingleLineHeight / 2 ), 900 ); + rOutline.Rotate( Point( nTextWidth / 2, rFWData.nSingleLineHeight / 2 ), Degree10(900) ); aCharacterData.aBoundRect.Union( rOutline.GetBoundRect() ); } for ( auto& rOutline : aCharacterData.vOutlines ) diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 7faf0d9852e9..527bd4f47883 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -76,7 +76,7 @@ void DialControlBmp::DrawElements( const OUString& rText, sal_Int32 nAngle ) // rotated text vcl::Font aFont( GetFont() ); aFont.SetColor( GetTextColor() ); - aFont.SetOrientation( static_cast< short >( (nAngle + 5) / 10 ) ); // Font uses 1/10 degrees + aFont.SetOrientation( Degree10(static_cast< sal_Int16 >( (nAngle + 5) / 10 )) ); // Font uses 1/10 degrees aFont.SetWeight( WEIGHT_BOLD ); SetFont( aFont ); diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index f4161b37fe9c..06dd3fdc6751 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -779,7 +779,7 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang bRubyStretch = true; aRubyFont.SetVertical(true); - aRubyFont.SetOrientation(2700); + aRubyFont.SetOrientation(Degree10(2700)); } long nYOutput; diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index a944d591d8c9..d70a853b3f91 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -97,7 +97,7 @@ static css::awt::FontDescriptor ImplCreateFontDescriptor( const vcl::Font& rFont aFD.Slant = vcl::unohelper::ConvertFontSlant( rFont.GetItalic() ); aFD.Underline = static_cast<sal_Int16>(rFont.GetUnderline()); aFD.Strikeout = static_cast<sal_Int16>(rFont.GetStrikeout()); - aFD.Orientation = rFont.GetOrientation() / 10.0; + aFD.Orientation = rFont.GetOrientation().get() / 10.0; aFD.Kerning = rFont.IsKerning(); aFD.WordLineMode = rFont.IsWordLineMode(); aFD.Type = 0; // ??? => only to metric... @@ -119,7 +119,7 @@ static vcl::Font ImplCreateFont( const css::awt::FontDescriptor& rDescr ) aFont.SetItalic( static_cast<FontItalic>(rDescr.Slant) ); aFont.SetUnderline( static_cast<::FontLineStyle>(rDescr.Underline) ); aFont.SetStrikeout( static_cast<::FontStrikeout>(rDescr.Strikeout) ); - aFont.SetOrientation( static_cast<sal_Int16>(rDescr.Orientation * 10) ); + aFont.SetOrientation( Degree10(static_cast<sal_Int16>(rDescr.Orientation * 10)) ); aFont.SetKerning( static_cast<FontKerning>(rDescr.Kerning) ); aFont.SetWordLineMode( rDescr.WordLineMode ); return aFont; diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 391f1f69cb8b..c3cad4f96209 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -483,7 +483,7 @@ namespace drawinglayer::primitive2d static_cast<double>(aXGradient.GetBorder()) * 0.01, static_cast<double>(aXGradient.GetXOffset()) * 0.01, static_cast<double>(aXGradient.GetYOffset()) * 0.01, - static_cast<double>(aXGradient.GetAngle()) * F_PI1800, + static_cast<double>(aXGradient.GetAngle().get()) * F_PI1800, aStart, aEnd, rSet.Get(XATTR_GRADIENTSTEPCOUNT).GetValue()); @@ -498,7 +498,7 @@ namespace drawinglayer::primitive2d aHatch = attribute::FillHatchAttribute( XHatchStyleToHatchStyle(rHatch.GetHatchStyle()), static_cast<double>(rHatch.GetDistance()), - static_cast<double>(rHatch.GetAngle()) * F_PI1800, + static_cast<double>(rHatch.GetAngle().get()) * F_PI1800, aColorB.getBColor(), 3, // same default as VCL, a minimum of three discrete units (pixels) offset rSet.Get(XATTR_FILLBACKGROUND).GetValue()); @@ -644,7 +644,7 @@ namespace drawinglayer::primitive2d static_cast<double>(rGradient.GetBorder()) * 0.01, static_cast<double>(rGradient.GetXOffset()) * 0.01, static_cast<double>(rGradient.GetYOffset()) * 0.01, - static_cast<double>(rGradient.GetAngle()) * F_PI1800, + static_cast<double>(rGradient.GetAngle().get()) * F_PI1800, basegfx::BColor(fStartLum, fStartLum, fStartLum), basegfx::BColor(fEndLum, fEndLum, fEndLum), 0); diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx index 8f8925201e26..6284e1e1b0cf 100644 --- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx @@ -148,7 +148,7 @@ namespace drawinglayer::primitive2d maGraphicAttr(rGraphicAttr) { // reset some values from GraphicAttr which are part of transformation already - maGraphicAttr.SetRotation(0); + maGraphicAttr.SetRotation(Degree10(0)); } bool SdrGrafPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index 60f9290aac59..cb8a6fc1ccda 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -145,7 +145,7 @@ void AreaPropertyPanelBase::Initialize() maGradientLinear.SetXOffset(DEFAULT_CENTERX); maGradientLinear.SetYOffset(DEFAULT_CENTERY); - maGradientLinear.SetAngle(DEFAULT_ANGLE); + maGradientLinear.SetAngle(Degree10(DEFAULT_ANGLE)); maGradientLinear.SetStartColor(Color(DEFAULT_STARTVALUE)); maGradientLinear.SetEndColor(Color(DEFAULT_ENDVALUE)); maGradientLinear.SetBorder(DEFAULT_BORDER); @@ -328,7 +328,7 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl, weld::ComboBox&, void) mxLbFillGradFrom->SelectEntry(aGradient.GetStartColor()); mxLbFillGradTo->SelectEntry(aGradient.GetEndColor()); - mxMTRAngle->set_value(aGradient.GetAngle() / 10, FieldUnit::DEGREE); + mxMTRAngle->set_value(aGradient.GetAngle().get() / 10, FieldUnit::DEGREE); css::awt::GradientStyle eXGS = aGradient.GetGradientStyle(); mxGradientStyle->set_active(sal::static_int_cast< sal_Int32 >( eXGS )); } @@ -507,7 +507,7 @@ void AreaPropertyPanelBase::SelectFillAttrHdl_Impl() if(pSh && pSh->GetItem(SID_COLOR_TABLE)) { XGradient aGradient; - aGradient.SetAngle(mxMTRAngle->get_value(FieldUnit::DEGREE) * 10); + aGradient.SetAngle(Degree10(mxMTRAngle->get_value(FieldUnit::DEGREE) * 10)); aGradient.SetGradientStyle(static_cast<css::awt::GradientStyle>(mxGradientStyle->get_active())); aGradient.SetStartColor(mxLbFillGradFrom->GetSelectEntryColor()); aGradient.SetEndColor(mxLbFillGradTo->GetSelectEntryColor()); @@ -1174,7 +1174,7 @@ void AreaPropertyPanelBase::Update() if(mxGradientStyle->get_active() == sal_Int32(GradientStyle::Radial)) mxMTRAngle->set_sensitive(false); else - mxMTRAngle->set_value(aGradient.GetAngle() / 10, FieldUnit::DEGREE); + mxMTRAngle->set_value(aGradient.GetAngle().get() / 10, FieldUnit::DEGREE); } else { diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx index a6330f03f644..7c4a8dc59962 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx @@ -64,7 +64,7 @@ void AreaTransparencyGradientPopup::InitStatus(XFillFloatTransparenceItem const if (rGradient.GetXOffset() == AreaPropertyPanelBase::DEFAULT_CENTERX && rGradient.GetYOffset() == AreaPropertyPanelBase::DEFAULT_CENTERY - && (rGradient.GetAngle() / 10) == AreaPropertyPanelBase::DEFAULT_ANGLE + && (rGradient.GetAngle().get() / 10) == AreaPropertyPanelBase::DEFAULT_ANGLE && static_cast<sal_uInt16>(((static_cast<sal_uInt16>(rGradient.GetStartColor().GetRed()) + 1) * 100) / 255) == AreaPropertyPanelBase::DEFAULT_STARTVALUE && static_cast<sal_uInt16>(((static_cast<sal_uInt16>(rGradient.GetEndColor().GetRed()) + 1) * 100) / 255) @@ -79,7 +79,7 @@ void AreaTransparencyGradientPopup::InitStatus(XFillFloatTransparenceItem const } mxMtrTrgrCenterX->set_value(aGradient.GetXOffset(), FieldUnit::PERCENT); mxMtrTrgrCenterY->set_value(aGradient.GetYOffset(), FieldUnit::PERCENT); - mxMtrTrgrAngle->set_value(aGradient.GetAngle() / 10, FieldUnit::DEGREE); + mxMtrTrgrAngle->set_value(aGradient.GetAngle().get() / 10, FieldUnit::DEGREE); mxMtrTrgrStartValue->set_value(static_cast<sal_uInt16>(((static_cast<sal_uInt16>(aGradient.GetStartColor().GetRed()) + 1) * 100) / 255), FieldUnit::PERCENT); mxMtrTrgrEndValue->set_value(static_cast<sal_uInt16>(((static_cast<sal_uInt16>(aGradient.GetEndColor().GetRed()) + 1) * 100) / 255), FieldUnit::PERCENT); mxMtrTrgrBorder->set_value(aGradient.GetBorder(), FieldUnit::PERCENT); @@ -127,7 +127,7 @@ void AreaTransparencyGradientPopup::ExecuteValueModify(sal_uInt8 nStartCol, sal_ Color(nStartCol, nStartCol, nStartCol), Color(nEndCol, nEndCol, nEndCol), static_cast<css::awt::GradientStyle>(mrAreaPropertyPanel.GetSelectedTransparencyTypeIndex()-2), - static_cast<sal_uInt16>(mxMtrTrgrAngle->get_value(FieldUnit::DEGREE)) * 10, + Degree10(static_cast<sal_Int16>(mxMtrTrgrAngle->get_value(FieldUnit::DEGREE)) * 10), static_cast<sal_uInt16>(mxMtrTrgrCenterX->get_value(FieldUnit::PERCENT)), static_cast<sal_uInt16>(mxMtrTrgrCenterY->get_value(FieldUnit::PERCENT)), static_cast<sal_uInt16>(mxMtrTrgrBorder->get_value(FieldUnit::PERCENT)), diff --git a/svx/source/svdraw/gradtrns.cxx b/svx/source/svdraw/gradtrns.cxx index ecb219836d31..faf44656183b 100644 --- a/svx/source/svdraw/gradtrns.cxx +++ b/svx/source/svdraw/gradtrns.cxx @@ -68,7 +68,7 @@ void GradTransformer::GradToVec(GradTransGradient const & rG, GradTransVector& r if(rG.aGradient.GetAngle()) { - const double fAngle = basegfx::deg2rad(rG.aGradient.GetAngle() / 10.0); + const double fAngle = basegfx::deg2rad(rG.aGradient.GetAngle().get() / 10.0); const basegfx::B2DHomMatrix aTransformation(basegfx::utils::createRotateAroundPoint(aCenter, -fAngle)); aStartPos *= aTransformation; @@ -91,7 +91,7 @@ void GradTransformer::GradToVec(GradTransGradient const & rG, GradTransVector& r if(rG.aGradient.GetAngle()) { - const double fAngle = basegfx::deg2rad(rG.aGradient.GetAngle() / 10.0); + const double fAngle = basegfx::deg2rad(rG.aGradient.GetAngle().get() / 10.0); const basegfx::B2DHomMatrix aTransformation(basegfx::utils::createRotateAroundPoint(aCenter, -fAngle)); aStartPos *= aTransformation; @@ -115,7 +115,7 @@ void GradTransformer::GradToVec(GradTransGradient const & rG, GradTransVector& r if(rG.aGradient.GetAngle()) { - const double fAngle = basegfx::deg2rad(rG.aGradient.GetAngle() / 10.0); + const double fAngle = basegfx::deg2rad(rG.aGradient.GetAngle().get() / 10.0); const basegfx::B2DHomMatrix aTransformation(basegfx::utils::createRotateAroundPoint(aEndPos, -fAngle)); aStartPos *= aTransformation; @@ -150,7 +150,7 @@ void GradTransformer::GradToVec(GradTransGradient const & rG, GradTransVector& r if(rG.aGradient.GetAngle()) { - const double fAngle = basegfx::deg2rad(rG.aGradient.GetAngle() / 10.0); + const double fAngle = basegfx::deg2rad(rG.aGradient.GetAngle().get() / 10.0); const basegfx::B2DHomMatrix aTransformation(basegfx::utils::createRotateAroundPoint(aEndPos, -fAngle)); aStartPos *= aTransformation; @@ -235,7 +235,7 @@ void GradTransformer::VecToGrad(GradTransVector const & rV, GradTransGradient& r } // to int and set - sal_Int32 nNewAngle = FRound(fNewFullAngle); + Degree10 nNewAngle( FRound(fNewFullAngle)); if(nNewAngle != rGOld.aGradient.GetAngle()) { @@ -319,7 +319,7 @@ void GradTransformer::VecToGrad(GradTransVector const & rV, GradTransGradient& r } // to int and set - const sal_Int32 nNewAngle(FRound(fNewFullAngle)); + const Degree10 nNewAngle(FRound(fNewFullAngle)); if(nNewAngle != rGOld.aGradient.GetAngle()) { @@ -414,7 +414,7 @@ void GradTransformer::VecToGrad(GradTransVector const & rV, GradTransGradient& r } // to int and set - const sal_Int32 nNewAngle(FRound(fNewFullAngle)); + const Degree10 nNewAngle(FRound(fNewFullAngle)); if(nNewAngle != rGOld.aGradient.GetAngle()) { @@ -509,7 +509,7 @@ void GradTransformer::VecToGrad(GradTransVector const & rV, GradTransGradient& r } // to int and set - const sal_Int32 nNewAngle(FRound(fNewFullAngle)); + const Degree10 nNewAngle(FRound(fNewFullAngle)); if(nNewAngle != rGOld.aGradient.GetAngle()) { diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 005676d47e83..158a1ab762b4 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -327,7 +327,7 @@ SdrItemPool::SdrItemPool( rPoolDefaults[ SDRATTR_TABLE_BORDER_INNER - SDRATTR_START ] = pBoxInfoItem; rPoolDefaults[ SDRATTR_TABLE_BORDER_TLBR - SDRATTR_START ] = new SvxLineItem( SDRATTR_TABLE_BORDER_TLBR ); rPoolDefaults[ SDRATTR_TABLE_BORDER_BLTR - SDRATTR_START ] = new SvxLineItem( SDRATTR_TABLE_BORDER_BLTR ); - rPoolDefaults[ SDRATTR_TABLE_TEXT_ROTATION - SDRATTR_START ] = new SvxTextRotateItem(0, SDRATTR_TABLE_TEXT_ROTATION); + rPoolDefaults[ SDRATTR_TABLE_TEXT_ROTATION - SDRATTR_START ] = new SvxTextRotateItem(Degree10(0), SDRATTR_TABLE_TEXT_ROTATION); rPoolDefaults[ SDRATTR_GLOW_RADIUS - SDRATTR_START ] = new SdrMetricItem(SDRATTR_GLOW_RADIUS, 0); rPoolDefaults[ SDRATTR_GLOW_COLOR - SDRATTR_START ] = new XColorItem(SDRATTR_GLOW_COLOR, aNullCol); diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 1555951984c1..b9fdcacbe2ac 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -1053,7 +1053,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rSt aAttr.Put(XFillColorItem(OUString(), aFnt.GetFillColor())); pText->SetMergedItemSet(aAttr); } - sal_uInt32 nAngle = aFnt.GetOrientation(); + sal_Int32 nAngle = aFnt.GetOrientation().get(); if ( nAngle ) { nAngle*=10; diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 4a3910174f6f..8728c67a9b2c 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -1732,7 +1732,7 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded() ShearPoint(aPoly[i],maRect.Center(), fTan ); } if ( aGeo.nRotationAngle ) - aPoly.Rotate( maRect.Center(), aGeo.nRotationAngle / 10 ); + aPoly.Rotate( maRect.Center(), Degree10(aGeo.nRotationAngle / 10) ); tools::Rectangle aBoundRect( aPoly.GetBoundRect() ); sal_Int32 nXDiff = aBoundRect.Left() - maRect.Left(); diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 2f2c4886f86d..9d719839334d 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -382,7 +382,7 @@ GraphicAttr SdrGrafObj::GetGraphicAttr( SdrGrafObjTransformsAttrs nTransformFlag } if( bRotate ) - aActAttr.SetRotation( sal_uInt16(aGeo.nRotationAngle / 10) ); + aActAttr.SetRotation( Degree10(aGeo.nRotationAngle / 10) ); } return aActAttr; diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index aacc10bf4b7b..23e5279b4c1d 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -184,7 +184,7 @@ namespace // apply font rotate if(rInfo.mrFont.GetOrientation()) { - aNewTransform.rotate(-rInfo.mrFont.GetOrientation() * F_PI1800); + aNewTransform.rotate(-rInfo.mrFont.GetOrientation().get() * F_PI1800); } // look for escapement, if necessary, translate accordingly diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx index 97c59fd94ae8..3a8b60951d4a 100644 --- a/svx/source/svdraw/svdpdf.cxx +++ b/svx/source/svdraw/svdpdf.cxx @@ -842,7 +842,7 @@ void ImpSdrPdfImport::InsertTextObject(const Point& rPos, const Size& rSize, con aAttr.Put(XFillColorItem(OUString(), aFont.GetFillColor())); pText->SetMergedItemSet(aAttr); } - sal_uInt32 nAngle = aFont.GetOrientation(); + sal_uInt32 nAngle = aFont.GetOrientation().get(); if (nAngle) { nAngle *= 10; diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 71be1f2ecd94..0a7844817c61 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -1115,7 +1115,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& if (nRotVal != 27000 && nRotVal != 9000 && nRotVal != 0) throw IllegalArgumentException(); - mpProperties->SetObjectItem(SvxTextRotateItem(nRotVal/10, SDRATTR_TABLE_TEXT_ROTATION)); + mpProperties->SetObjectItem(SvxTextRotateItem(Degree10(nRotVal/10), SDRATTR_TABLE_TEXT_ROTATION)); return; } default: @@ -1236,7 +1236,7 @@ Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) case SDRATTR_TABLE_TEXT_ROTATION: { const SvxTextRotateItem& rTextRotate = mpProperties->GetItem(SDRATTR_TABLE_TEXT_ROTATION); - return Any(sal_Int32(rTextRotate.GetValue() * 10)); + return Any(sal_Int32(rTextRotate.GetValue().get() * 10)); } default: { diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 01e9e1dc4430..8068feee8ce9 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -472,7 +472,7 @@ uno::Any SvxUnoXHatchTable::getAny( const XPropertyEntry* pEntry ) const throw() aUnoHatch.Style = aHatch.GetHatchStyle(); aUnoHatch.Color = sal_Int32(aHatch.GetColor()); aUnoHatch.Distance = aHatch.GetDistance(); - aUnoHatch.Angle = aHatch.GetAngle(); + aUnoHatch.Angle = aHatch.GetAngle().get(); return uno::Any(aUnoHatch); } @@ -487,7 +487,7 @@ std::unique_ptr<XPropertyEntry> SvxUnoXHatchTable::createEntry(const OUString& r aXHatch.SetHatchStyle( aUnoHatch.Style ); aXHatch.SetColor( Color(aUnoHatch.Color) ); aXHatch.SetDistance( aUnoHatch.Distance ); - aXHatch.SetAngle( aUnoHatch.Angle ); + aXHatch.SetAngle( Degree10(aUnoHatch.Angle) ); return std::make_unique<XHatchEntry>(aXHatch, rName); } @@ -566,7 +566,7 @@ std::unique_ptr<XPropertyEntry> SvxUnoXGradientTable::createEntry(const OUString aXGradient.SetGradientStyle( aGradient.Style ); aXGradient.SetStartColor( Color(aGradient.StartColor) ); aXGradient.SetEndColor( Color(aGradient.EndColor) ); - aXGradient.SetAngle( aGradient.Angle ); + aXGradient.SetAngle( Degree10(aGradient.Angle) ); aXGradient.SetBorder( aGradient.Border ); aXGradient.SetXOffset( aGradient.XOffset ); aXGradient.SetYOffset( aGradient.YOffset ); diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 9e244fb14c15..f391a3fc9a34 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -2024,7 +2024,7 @@ namespace aGradient.SetStartColor(rMap["startcolor"].toInt32(16)); aGradient.SetEndColor(rMap["endcolor"].toInt32(16)); aGradient.SetGradientStyle(lcl_getStyleFromString(rMap["style"])); - aGradient.SetAngle(rMap["angle"].toInt32()); + aGradient.SetAngle(Degree10(rMap["angle"].toInt32())); return aGradient; } @@ -2051,7 +2051,7 @@ XGradient::XGradient() : } XGradient::XGradient(const Color& rStart, const Color& rEnd, - css::awt::GradientStyle eTheStyle, long nTheAngle, sal_uInt16 nXOfs, + css::awt::GradientStyle eTheStyle, Degree10 nTheAngle, sal_uInt16 nXOfs, sal_uInt16 nYOfs, sal_uInt16 nTheBorder, sal_uInt16 nStartIntens, sal_uInt16 nEndIntens, sal_uInt16 nSteps) : @@ -2089,7 +2089,7 @@ boost::property_tree::ptree XGradient::dumpAsJSON() const aTree.put("style", XGradient::GradientStyleToString(eStyle)); aTree.put("startcolor",aStartColor.AsRGBHexString()); aTree.put("endcolor", aEndColor.AsRGBHexString()); - aTree.put("angle", std::to_string(nAngle)); + aTree.put("angle", std::to_string(nAngle.get())); aTree.put("border", std::to_string(nBorder)); aTree.put("x", std::to_string(nOfsX)); aTree.put("y", std::to_string(nOfsY)); @@ -2268,7 +2268,7 @@ bool XFillGradientItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId aXGradient.SetGradientStyle( aGradient2.Style ); aXGradient.SetStartColor( Color(aGradient2.StartColor) ); aXGradient.SetEndColor( Color(aGradient2.EndColor) ); - aXGradient.SetAngle( aGradient2.Angle ); + aXGradient.SetAngle( Degree10(aGradient2.Angle) ); aXGradient.SetBorder( aGradient2.Border ); aXGradient.SetXOffset( aGradient2.XOffset ); aXGradient.SetYOffset( aGradient2.YOffset ); @@ -2305,7 +2305,7 @@ bool XFillGradientItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId aXGradient.SetGradientStyle( aGradient2.Style ); aXGradient.SetStartColor( Color(aGradient2.StartColor) ); aXGradient.SetEndColor( Color(aGradient2.EndColor) ); - aXGradient.SetAngle( aGradient2.Angle ); + aXGradient.SetAngle( Degree10(aGradient2.Angle) ); aXGradient.SetBorder( aGradient2.Border ); aXGradient.SetXOffset( aGradient2.XOffset ); aXGradient.SetYOffset( aGradient2.YOffset ); @@ -2354,7 +2354,7 @@ bool XFillGradientItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId case MID_GRADIENT_STYLE: aXGradient.SetGradientStyle( static_cast<css::awt::GradientStyle>(nVal) ); break; case MID_GRADIENT_ANGLE: - aXGradient.SetAngle( nVal ); break; + aXGradient.SetAngle( Degree10(nVal) ); break; case MID_GRADIENT_BORDER: aXGradient.SetBorder( nVal ); break; case MID_GRADIENT_STARTINTENSITY: @@ -2532,7 +2532,7 @@ boost::property_tree::ptree XFillFloatTransparenceItem::dumpAsJSON() const } XHatch::XHatch(const Color& rCol, css::drawing::HatchStyle eTheStyle, long nTheDistance, - long nTheAngle) : + Degree10 nTheAngle) : eStyle(eTheStyle), aColor(rCol), nDistance(nTheDistance), @@ -2618,7 +2618,7 @@ bool XFillHatchItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) cons aUnoHatch.Style = aHatch.GetHatchStyle(); aUnoHatch.Color = sal_Int32(aHatch.GetColor()); aUnoHatch.Distance = aHatch.GetDistance(); - aUnoHatch.Angle = aHatch.GetAngle(); + aUnoHatch.Angle = aHatch.GetAngle().get(); aPropSeq[0].Name = "Name"; aPropSeq[0].Value <<= SvxUnogetApiNameForItem(Which(), GetName()); @@ -2635,7 +2635,7 @@ bool XFillHatchItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) cons aUnoHatch.Style = aHatch.GetHatchStyle(); aUnoHatch.Color = sal_Int32(aHatch.GetColor()); aUnoHatch.Distance = aHatch.GetDistance(); - aUnoHatch.Angle = aHatch.GetAngle(); + aUnoHatch.Angle = aHatch.GetAngle().get(); rVal <<= aUnoHatch; break; } @@ -2653,7 +2653,7 @@ bool XFillHatchItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) cons case MID_HATCH_DISTANCE: rVal <<= aHatch.GetDistance(); break; case MID_HATCH_ANGLE: - rVal <<= aHatch.GetAngle(); break; + rVal <<= aHatch.GetAngle().get(); break; default: OSL_FAIL("Wrong MemberId!"); return false; } @@ -2692,7 +2692,7 @@ bool XFillHatchItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) aHatch.SetHatchStyle( aUnoHatch.Style ); aHatch.SetColor( Color(aUnoHatch.Color) ); aHatch.SetDistance( aUnoHatch.Distance ); - aHatch.SetAngle( aUnoHatch.Angle ); + aHatch.SetAngle( Degree10(aUnoHatch.Angle) ); } return true; @@ -2710,7 +2710,7 @@ bool XFillHatchItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) aHatch.SetHatchStyle( aUnoHatch.Style ); aHatch.SetColor( Color(aUnoHatch.Color) ); aHatch.SetDistance( aUnoHatch.Distance ); - aHatch.SetAngle( aUnoHatch.Angle ); + aHatch.SetAngle( Degree10(aUnoHatch.Angle) ); break; } @@ -2745,7 +2745,7 @@ bool XFillHatchItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) else if ( nMemberId == MID_HATCH_DISTANCE ) aHatch.SetDistance( nVal ); else - aHatch.SetAngle( nVal ); + aHatch.SetAngle( Degree10(nVal) ); break; } diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index 1a29fbcaca86..990bed31172e 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -69,17 +69,17 @@ bool XGradientList::Create() OUStringBuffer aStr(SvxResId(RID_SVXSTR_GRADIENT)); aStr.append(" 1"); sal_Int32 nLen = aStr.getLength() - 1; - Insert(std::make_unique<XGradientEntry>(XGradient(COL_BLACK, COL_WHITE, css::awt::GradientStyle_LINEAR , 0,10,10, 0,100,100),aStr.toString())); + Insert(std::make_unique<XGradientEntry>(XGradient(COL_BLACK, COL_WHITE, css::awt::GradientStyle_LINEAR , Degree10(0),10,10, 0,100,100),aStr.toString())); aStr[nLen] = '2'; - Insert(std::make_unique<XGradientEntry>(XGradient(COL_BLUE, COL_RED, css::awt::GradientStyle_AXIAL , 300,20,20,10,100,100),aStr.toString())); + Insert(std::make_unique<XGradientEntry>(XGradient(COL_BLUE, COL_RED, css::awt::GradientStyle_AXIAL , Degree10(300),20,20,10,100,100),aStr.toString())); aStr[nLen] = '3'; - Insert(std::make_unique<XGradientEntry>(XGradient(COL_RED, COL_YELLOW,css::awt::GradientStyle_RADIAL , 600,30,30,20,100,100),aStr.toString())); + Insert(std::make_unique<XGradientEntry>(XGradient(COL_RED, COL_YELLOW,css::awt::GradientStyle_RADIAL , Degree10(600),30,30,20,100,100),aStr.toString())); aStr[nLen] = '4'; - Insert(std::make_unique<XGradientEntry>(XGradient(COL_YELLOW , COL_GREEN, css::awt::GradientStyle_ELLIPTICAL, 900,40,40,30,100,100),aStr.toString())); + Insert(std::make_unique<XGradientEntry>(XGradient(COL_YELLOW , COL_GREEN, css::awt::GradientStyle_ELLIPTICAL, Degree10(900),40,40,30,100,100),aStr.toString())); aStr[nLen] = '5'; - Insert(std::make_unique<XGradientEntry>(XGradient(COL_GREEN , COL_MAGENTA,css::awt::GradientStyle_SQUARE , 1200,50,50,40,100,100),aStr.toString())); + Insert(std::make_unique<XGradientEntry>(XGradient(COL_GREEN , COL_MAGENTA,css::awt::GradientStyle_SQUARE , Degree10(1200),50,50,40,100,100),aStr.toString())); aStr[nLen] = '6'; - Insert(std::make_unique<XGradientEntry>(XGradient(COL_MAGENTA, COL_YELLOW ,css::awt::GradientStyle_RECT , 1900,60,60,50,100,100),aStr.toString())); + Insert(std::make_unique<XGradientEntry>(XGradient(COL_MAGENTA, COL_YELLOW ,css::awt::GradientStyle_RECT , Degree10(1900),60,60,50,100,100),aStr.toString())); return true; } @@ -159,7 +159,7 @@ BitmapEx XGradientList::CreateBitmap( long nIndex, const Size& rSize ) const static_cast<double>(rGradient.GetBorder()) * 0.01, static_cast<double>(rGradient.GetXOffset()) * 0.01, static_cast<double>(rGradient.GetYOffset()) * 0.01, - static_cast<double>(rGradient.GetAngle()) * F_PI1800, + static_cast<double>(rGradient.GetAngle().get()) * F_PI1800, aStart, aEnd, nSteps); diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index 3b84601fac27..ded1bba8a5d2 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -67,11 +67,11 @@ bool XHatchList::Create() aStr.append(" 1"); sal_Int32 nLen = aStr.getLength() - 1; - Insert(std::make_unique<XHatchEntry>(XHatch(COL_BLACK,css::drawing::HatchStyle_SINGLE,100, 0),aStr.toString())); + Insert(std::make_unique<XHatchEntry>(XHatch(COL_BLACK,css::drawing::HatchStyle_SINGLE,100, Degree10(0)),aStr.toString())); aStr[nLen] = '2'; - Insert(std::make_unique<XHatchEntry>(XHatch(COL_RED ,css::drawing::HatchStyle_DOUBLE, 80,450),aStr.toString())); + Insert(std::make_unique<XHatchEntry>(XHatch(COL_RED ,css::drawing::HatchStyle_DOUBLE, 80,Degree10(450)),aStr.toString())); aStr[nLen] = '3'; - Insert(std::make_unique<XHatchEntry>(XHatch(COL_BLUE ,css::drawing::HatchStyle_TRIPLE,120, 0),aStr.toString())); + Insert(std::make_unique<XHatchEntry>(XHatch(COL_BLUE ,css::drawing::HatchStyle_TRIPLE,120, Degree10(0)),aStr.toString())); return true; } @@ -119,7 +119,7 @@ BitmapEx XHatchList::CreateBitmap( long nIndex, const Size& rSize) const const drawinglayer::attribute::FillHatchAttribute aFillHatch( aHatchStyle, static_cast<double>(rHatch.GetDistance()) * fScaleValue, - static_cast<double>(rHatch.GetAngle()) * F_PI1800, + static_cast<double>(rHatch.GetAngle().get()) * F_PI1800, rHatch.GetColor().getBColor(), 3, // same default as VCL, a minimum of three discrete units (pixels) offset false); |