From 5c54778aad677d6bb6e6687f0f43dffad1aefa1e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 17 Dec 2019 09:34:06 +0200 Subject: tdf#129143 FILESAVE: PPTX: bullets have a black border after RT Revert "no need to use AlphaMask in DrawingML::WriteParagraphNumbering" This reverts commit 126818d293982e578dfb4d977ee0ea64a1cff0de. Change-Id: I7326e7dbf2f00629ca5d08cff680e68c679f321a Reviewed-on: https://gerrit.libreoffice.org/85258 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- oox/source/export/drawingml.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'oox') diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 37a28c35594d..ce6ef82348a0 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2341,10 +2341,12 @@ void DrawingML::WriteParagraphNumbering(const Reference< XPropertySet >& rXPropS long nPaddingY = std::lround((aDestSize.Height() - fBulletSizeRel * aDestSize.Height()) / 2.f); tools::Rectangle aDestRect(nPaddingX, nPaddingY, aDestSize.Width() - nPaddingX, aDestSize.Height() - nPaddingY); + AlphaMask aMask(aDestSize); + aMask.Erase(255); BitmapEx aSourceBitmap(aGraphic.GetBitmapEx()); aSourceBitmap.Scale(aDestRect.GetSize()); tools::Rectangle aSourceRect(Point(0, 0), aDestRect.GetSize()); - BitmapEx aDestBitmap(aDestSize, 24); + BitmapEx aDestBitmap(Bitmap(aDestSize, 24), aMask); aDestBitmap.CopyPixel(aDestRect, aSourceRect, &aSourceBitmap); Graphic aDestGraphic(aDestBitmap); sRelationId = WriteImage(aDestGraphic); -- cgit