[Libreoffice-commits] core.git: sw/qa vcl/source

[Luboš Luňák (via logerrit)]

 sw/qa/extras/tiledrendering/tiledrendering.cxx |    4 ++--
 vcl/source/bitmap/BitmapReadAccess.cxx         |    5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 0be8060a856f86fdfb42372e58073586b29c93fa
Author:     Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Fri Feb 4 15:01:26 2022 +0100
Commit:     Michael Meeks <michael.me...@collabora.com>
CommitDate: Fri Feb 4 19:13:21 2022 +0100

    Revert "lok: copy over the alpha channel too for cairo..."
    
    Not needed in the end.
    
    This reverts commit 688051edf59a311371b84ea34db4991d3a164d52.
    
    Change-Id: If2474ccff0ada5fd0ca5206f10ca2893df0fe1f8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129491
    Tested-by: Jenkins
    Reviewed-by: Michael Meeks <michael.me...@collabora.com>

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index b321ae9306a6..cc50ef8e9c83 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -2879,7 +2879,7 @@ void SwTiledRenderingTest::testHighlightNumbering()
 
     // Yellow highlighting over numbering
     Color aColor(pAccess->GetPixel(103, 148));
-    CPPUNIT_ASSERT_EQUAL(Color(ColorTransparency, 0xFF, 0xFF, 0xFF, 0x00), 
aColor);
+    CPPUNIT_ASSERT_EQUAL(COL_YELLOW, aColor);
 }
 
 void SwTiledRenderingTest::testHighlightNumbering_shd()
@@ -2904,7 +2904,7 @@ void SwTiledRenderingTest::testHighlightNumbering_shd()
 
     // No highlighting over numbering - w:shd does not apply to numbering.
     Color aColor(pAccess->GetPixel(103, 148));
-    CPPUNIT_ASSERT_EQUAL(Color(ColorTransparency, 0xFF, 0xFF, 0xFF, 0xFF), 
aColor);
+    CPPUNIT_ASSERT_EQUAL(COL_WHITE, aColor);
 }
 
 void SwTiledRenderingTest::testPilcrowRedlining()
diff --git a/vcl/source/bitmap/BitmapReadAccess.cxx 
b/vcl/source/bitmap/BitmapReadAccess.cxx
index 08c148a4d3fe..6e87debd1ec1 100644
--- a/vcl/source/bitmap/BitmapReadAccess.cxx
+++ b/vcl/source/bitmap/BitmapReadAccess.cxx
@@ -19,7 +19,6 @@
 
 #include <vcl/BitmapReadAccess.hxx>
 #include <vcl/BitmapTools.hxx>
-#include <comphelper/lok.hxx>
 
 #include <salbmp.hxx>
 #include <svdata.hxx>
@@ -458,8 +457,6 @@ BitmapColor 
BitmapReadAccess::GetPixelForN32BitTcBgrx(ConstScanline pScanline, t
     aBitmapColor.SetBlue(*pScanline++);
     aBitmapColor.SetGreen(*pScanline++);
     aBitmapColor.SetRed(*pScanline);
-    if (comphelper::LibreOfficeKit::isActive())
-        aBitmapColor.SetAlpha(0xFF - *(++pScanline));
 
     return aBitmapColor;
 }
@@ -483,7 +480,7 @@ void BitmapReadAccess::SetPixelForN32BitTcBgrx(Scanline 
pScanline, tools::Long n
     *pScanline++ = rBitmapColor.GetBlue();
     *pScanline++ = rBitmapColor.GetGreen();
     *pScanline++ = rBitmapColor.GetRed();
-    *pScanline = (comphelper::LibreOfficeKit::isActive()) ? 0xFF - 
rBitmapColor.GetAlpha() : 0xFF;
+    *pScanline = 0xFF;
 }
 
 BitmapColor BitmapReadAccess::GetPixelForN32BitTcRgba(ConstScanline pScanline, 
tools::Long nX,