[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - oox/source

[Noel Grandin (via logerrit)]

 oox/source/export/drawingml.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7522113559f33a3349591462b598e986bc427ed9
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Dec 17 09:34:06 2019 +0200
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Tue Dec 17 11:42:06 2019 +0100

    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 <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 5c54778aad677d6bb6e6687f0f43dffad1aefa1e)
    Reviewed-on: https://gerrit.libreoffice.org/85269
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index d844d6f8242b..d5e035528651 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2331,10 +2331,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);