diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-10-23 10:58:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-10-23 13:18:01 +0200 |
| commit | fbb5ab3e0ecb862fa5c48ef4640859c4aeb77984 (patch) | |
| tree | 7c5a4300427ce5b2da5ba50d5e528abbcccd45d6 /desktop | |
| parent | 2fb74f6e155322ca25edc3b0b59d0d1347903195 (diff) | |
tdf#156525 Save as > HTML loses drawing object as invalid gif
This patch is specifically for the 7-6 branch, other changes meant that
master received a simpler fix.
This reverts the following patches
commit f22c23e71d4ae628e9e90ee98d22d1fc8fca1619
Author: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Wed Aug 2 15:26:06 2023 +0200
tdf#156525 Save as > HTML loses drawing object as invalid gif
commit 04f02cfecfae481f256b6c98a1940fc5235a921a
Author: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Wed May 10 14:06:49 2023 +0200
AlphaMask::BlendWith wants an AlphaMask parameter
commit 8270eb5d5600cc84dbf5f0e339f90c4519ef88bb
Author: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri May 19 13:35:31 2023 +0200
loplugin:unusedmethods
Change-Id: I2146557b6401079061474d5d83082f75d6f1974f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158340
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 52cd5411a7e5..0cc08257f657 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -4012,7 +4012,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis, pDevice->EnableMapMode(false); BitmapEx aBmpEx = pDevice->GetBitmapEx({ 0, 0 }, { nCanvasWidth, nCanvasHeight }); Bitmap aBmp = aBmpEx.GetBitmap(); - AlphaMask aAlpha = aBmpEx.GetAlphaMask(); + Bitmap aAlpha = aBmpEx.GetAlphaMask(); Bitmap::ScopedReadAccess sraBmp(aBmp); Bitmap::ScopedReadAccess sraAlpha(aAlpha); |