diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-01-28 14:15:44 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-01-28 18:15:07 +0100 |
commit | 94823392874be9c9249e312f6783394edf0e731f (patch) | |
tree | fa2afea3550d90d1b6fd49c3cc44c797cfd2a370 /xmloff | |
parent | cd4c5e3b2afe767091884d8c1b507d78963e17c4 (diff) |
ofz#5621 Integer-overflow
Change-Id: Ie0a7c29428e686e5c480997b84b8d12e5be4539f
Reviewed-on: https://gerrit.libreoffice.org/48790
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 616dec4d1ba2..4ccdb68d5ff1 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -1083,16 +1083,16 @@ void SdXMLLineShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib pOuterSequence->realloc(2); awt::Point* pInnerSequence = pOuterSequence->getArray(); - *pInnerSequence = awt::Point(o3tl::saturating_add(mnX1, -aTopLeft.X), o3tl::saturating_add(mnY1, -aTopLeft.Y)); + *pInnerSequence = awt::Point(o3tl::saturating_sub(mnX1, aTopLeft.X), o3tl::saturating_sub(mnY1, aTopLeft.Y)); pInnerSequence++; - *pInnerSequence = awt::Point(o3tl::saturating_add(mnX2, -aTopLeft.X), o3tl::saturating_add(mnY2, -aTopLeft.Y)); + *pInnerSequence = awt::Point(o3tl::saturating_sub(mnX2, aTopLeft.X), o3tl::saturating_sub(mnY2, aTopLeft.Y)); xPropSet->setPropertyValue("Geometry", Any(aPolyPoly)); } // set sizes for transformation - maSize.Width = o3tl::saturating_add(aBottomRight.X, -aTopLeft.X); - maSize.Height = o3tl::saturating_add(aBottomRight.Y, -aTopLeft.Y); + maSize.Width = o3tl::saturating_sub(aBottomRight.X, aTopLeft.X); + maSize.Height = o3tl::saturating_sub(aBottomRight.Y, aTopLeft.Y); maPosition.X = aTopLeft.X; maPosition.Y = aTopLeft.Y; |