diff options
author | Noel <noelgrandin@gmail.com> | 2020-10-26 14:17:32 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-28 07:21:59 +0100 |
commit | 6436302f40252bc6619e304e2051115fee902e20 (patch) | |
tree | a32659b4fecc9fbf8fad3e379ddd8645a2a52e0b /oox | |
parent | 35f16614ee7ddf518d4c01de6b1d800f5ff1ba7e (diff) |
convert some more long -> tools::Long
grepping for stuff in template params this time
Change-Id: Ia37bfd85480b3a72c3c465489581d56ad8dde851
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104855
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/drawingml/fillproperties.cxx | 2 | ||||
-rw-r--r-- | oox/source/export/drawingml.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index 74a5d39fe1df..fe19a556609d 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -770,7 +770,7 @@ void GraphicProperties::pushToPropMap( PropertyMap& rPropMap, const GraphicHelpe // When custom shape is rotated, bitmap have to be rotated too. if(rPropMap.hasProperty(PROP_RotateAngle)) { - tools::Long nAngle = rPropMap.getProperty(PROP_RotateAngle).get<long>(); + tools::Long nAngle = rPropMap.getProperty(PROP_RotateAngle).get<tools::Long>(); xGraphic = lclRotateGraphic(xGraphic, Degree10(nAngle/10) ); } diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 8b69d23ab499..8908af370e0b 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2463,7 +2463,7 @@ void DrawingML::WriteParagraphNumbering(const Reference< XPropertySet >& rXPropS // Add padding to get the bullet point centered in PPT Size aDestSize(64, 64); float fBulletSizeRelX = fBulletSizeRel / aGraphicSize.Height * aGraphicSize.Width; - tools::Long nPaddingX = std::max<long>(0, std::lround((aDestSize.Width() - fBulletSizeRelX * aDestSize.Width()) / 2.f)); + tools::Long nPaddingX = std::max<tools::Long>(0, std::lround((aDestSize.Width() - fBulletSizeRelX * aDestSize.Width()) / 2.f)); tools::Long nPaddingY = std::lround((aDestSize.Height() - fBulletSizeRel * aDestSize.Height()) / 2.f); tools::Rectangle aDestRect(nPaddingX, nPaddingY, aDestSize.Width() - nPaddingX, aDestSize.Height() - nPaddingY); |