transparency->alpha in tools::Color

this just changes the Get/Set methods, the constructor and internal
representation of Color is not changed.

Change-Id: Idb6e07cc08bbaa5bd55b6bd4b585e648aef507b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109074
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

24 files changed, 56 insertions, 61 deletions

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 825da3e5f415..4bbd6f76ec5c 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -2009,7 +2009,7 @@ bool SvpSalGraphics::implDrawGradient(basegfx::B2DPolyPolygon const & rPolyPolyg
         double r = rStop.maColor.GetRed() / 255.0;
         double g = rStop.maColor.GetGreen() / 255.0;
         double b = rStop.maColor.GetBlue() / 255.0;
-        double a = (0xFF - rStop.maColor.GetTransparency()) / 255.0;
+        double a = rStop.maColor.GetAlpha() / 255.0;
         double offset = rStop.mfOffset;
 
         cairo_pattern_add_color_stop_rgba(pattern, offset, r, g, b, a);
diff --git a/vcl/inc/bitmap/ScanlineTools.hxx b/vcl/inc/bitmap/ScanlineTools.hxx
index 9528f48090e9..1e3ab5023638 100644
--- a/vcl/inc/bitmap/ScanlineTools.hxx
+++ b/vcl/inc/bitmap/ScanlineTools.hxx
@@ -46,7 +46,7 @@ public:
 
     virtual void writePixel(Color nColor) override
     {
-        *pData++ = nColor.GetTransparency();
+        *pData++ = 255 - nColor.GetAlpha();
         *pData++ = nColor.GetRed();
         *pData++ = nColor.GetGreen();
         *pData++ = nColor.GetBlue();
diff --git a/vcl/inc/qt5/Qt5Tools.hxx b/vcl/inc/qt5/Qt5Tools.hxx
index 1110c7099d80..b7e4089e6f52 100644
--- a/vcl/inc/qt5/Qt5Tools.hxx
+++ b/vcl/inc/qt5/Qt5Tools.hxx
@@ -79,8 +79,7 @@ inline Point toPoint(const QPoint& rPoint) { return Point(rPoint.x(), rPoint.y()
 
 inline QColor toQColor(const Color& rColor)
 {
-    return QColor(rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue(),
-                  255 - rColor.GetTransparency());
+    return QColor(rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue(), rColor.GetAlpha());
 }
 
 Qt::DropActions toQtDropActions(sal_Int8 dragOperation);
diff --git a/vcl/qa/cppunit/BackendTest.cxx b/vcl/qa/cppunit/BackendTest.cxx
index 6e171754a225..4a32a50b6a92 100644
--- a/vcl/qa/cppunit/BackendTest.cxx
+++ b/vcl/qa/cppunit/BackendTest.cxx
@@ -584,9 +584,9 @@ public:
             device->SetBackground(Wallpaper(COL_TRANSPARENT));
             device->Erase();
             exportDevice("/tmp/12-07_erase.png", device);
-            CPPUNIT_ASSERT_EQUAL(sal_uInt8(255), device->GetPixel(Point(0, 0)).GetTransparency());
-            CPPUNIT_ASSERT_EQUAL(sal_uInt8(255), device->GetPixel(Point(9, 9)).GetTransparency());
-            CPPUNIT_ASSERT_EQUAL(sal_uInt8(255), device->GetPixel(Point(5, 5)).GetTransparency());
+            CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), device->GetPixel(Point(0, 0)).GetAlpha());
+            CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), device->GetPixel(Point(9, 9)).GetAlpha());
+            CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), device->GetPixel(Point(5, 5)).GetAlpha());
         }
     }
 
diff --git a/vcl/qa/cppunit/BitmapScaleTest.cxx b/vcl/qa/cppunit/BitmapScaleTest.cxx
index 285799e2da52..09ec8f9a3728 100644
--- a/vcl/qa/cppunit/BitmapScaleTest.cxx
+++ b/vcl/qa/cppunit/BitmapScaleTest.cxx
@@ -64,7 +64,7 @@ void assertColorsAreSimilar(int maxDifference, const std::string& message,
     if (abs(expected.GetRed() - actual.GetRed()) <= maxDifference
         && abs(expected.GetGreen() - actual.GetGreen()) <= maxDifference
         && abs(expected.GetBlue() - actual.GetBlue()) <= maxDifference
-        && abs(expected.GetTransparency() - actual.GetTransparency()) <= maxDifference)
+        && abs(expected.GetAlpha() - actual.GetAlpha()) <= maxDifference)
     {
         return;
     }
diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx
index c2f2b592309f..56395358863b 100644
--- a/vcl/qa/cppunit/BitmapTest.cxx
+++ b/vcl/qa/cppunit/BitmapTest.cxx
@@ -73,7 +73,7 @@ void assertColorsAreSimilar(int maxDifference, const std::string& message,
     if (abs(expected.GetRed() - actual.GetRed()) <= maxDifference
         && abs(expected.GetGreen() - actual.GetGreen()) <= maxDifference
         && abs(expected.GetBlue() - actual.GetBlue()) <= maxDifference
-        && abs(expected.GetTransparency() - actual.GetTransparency()) <= maxDifference)
+        && abs(expected.GetAlpha() - actual.GetAlpha()) <= maxDifference)
     {
         return;
     }
diff --git a/vcl/qa/cppunit/bitmapcolor.cxx b/vcl/qa/cppunit/bitmapcolor.cxx
index 58d889a3d8a5..7329564d46c4 100644
--- a/vcl/qa/cppunit/bitmapcolor.cxx
+++ b/vcl/qa/cppunit/bitmapcolor.cxx
@@ -56,8 +56,8 @@ void BitmapColorTest::defaultConstructor()
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", static_cast<sal_uInt8>(0), aBmpColor.GetRed());
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", static_cast<sal_uInt8>(0), aBmpColor.GetGreen());
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(0), aBmpColor.GetBlue());
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("Transparency wrong", static_cast<sal_uInt8>(0),
-                                 aBmpColor.GetTransparency());
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Transparency wrong", static_cast<sal_uInt8>(255),
+                                 aBmpColor.GetAlpha());
 }
 
 void BitmapColorTest::colorValueConstructor()
@@ -69,8 +69,8 @@ void BitmapColorTest::colorValueConstructor()
         CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", static_cast<sal_uInt8>(0),
                                      aBmpColor.GetGreen());
         CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(0), aBmpColor.GetBlue());
-        CPPUNIT_ASSERT_EQUAL_MESSAGE("Transparency wrong", static_cast<sal_uInt8>(0),
-                                     aBmpColor.GetTransparency());
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("Transparency wrong", static_cast<sal_uInt8>(255),
+                                     aBmpColor.GetAlpha());
     }
 
     {
@@ -81,8 +81,8 @@ void BitmapColorTest::colorValueConstructor()
                                      aBmpColor.GetGreen());
         CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(128),
                                      aBmpColor.GetBlue());
-        CPPUNIT_ASSERT_EQUAL_MESSAGE("Transparency wrong", static_cast<sal_uInt8>(0),
-                                     aBmpColor.GetTransparency());
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("Transparency wrong", static_cast<sal_uInt8>(255),
+                                     aBmpColor.GetAlpha());
     }
 
     {
@@ -93,8 +93,8 @@ void BitmapColorTest::colorValueConstructor()
                                      aBmpColor.GetGreen());
         CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(255),
                                      aBmpColor.GetBlue());
-        CPPUNIT_ASSERT_EQUAL_MESSAGE("Transparency wrong", static_cast<sal_uInt8>(0),
-                                     aBmpColor.GetTransparency());
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("Transparency wrong", static_cast<sal_uInt8>(255),
+                                     aBmpColor.GetAlpha());
     }
 }
 
@@ -107,8 +107,8 @@ void BitmapColorTest::colorClassConstructor()
         CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", static_cast<sal_uInt8>(0),
                                      aBmpColor.GetGreen());
         CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(0), aBmpColor.GetBlue());
-        CPPUNIT_ASSERT_EQUAL_MESSAGE("Transparency wrong", static_cast<sal_uInt8>(0),
-                                     aBmpColor.GetTransparency());
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("Transparency wrong", static_cast<sal_uInt8>(255),
+                                     aBmpColor.GetAlpha());
     }
 
     {
@@ -119,8 +119,8 @@ void BitmapColorTest::colorClassConstructor()
                                      aBmpColor.GetGreen());
         CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(127),
                                      aBmpColor.GetBlue());
-        CPPUNIT_ASSERT_EQUAL_MESSAGE("Transparency wrong", static_cast<sal_uInt8>(0),
-                                     aBmpColor.GetTransparency());
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("Transparency wrong", static_cast<sal_uInt8>(255),
+                                     aBmpColor.GetAlpha());
     }
 
     {
@@ -131,8 +131,8 @@ void BitmapColorTest::colorClassConstructor()
                                      aBmpColor.GetGreen());
         CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(255),
                                      aBmpColor.GetBlue());
-        CPPUNIT_ASSERT_EQUAL_MESSAGE("Transparency wrong", static_cast<sal_uInt8>(0),
-                                     aBmpColor.GetTransparency());
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("Transparency wrong", static_cast<sal_uInt8>(255),
+                                     aBmpColor.GetAlpha());
     }
 
     // Transparency / Alpha
@@ -143,8 +143,8 @@ void BitmapColorTest::colorClassConstructor()
         CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", static_cast<sal_uInt8>(64),
                                      aBmpColor.GetGreen());
         CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(0), aBmpColor.GetBlue());
-        CPPUNIT_ASSERT_EQUAL_MESSAGE("Transparency wrong", static_cast<sal_uInt8>(255),
-                                     aBmpColor.GetTransparency());
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("Transparency wrong", static_cast<sal_uInt8>(0),
+                                     aBmpColor.GetAlpha());
     }
 }
 
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index a93d42f77ca9..b55d4856fbee 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -49,7 +49,7 @@ static std::ostream& operator<<(std::ostream& rStrm, const Color& rColor)
     rStrm << "Color: R:" << static_cast<int>(rColor.GetRed())
           << " G:" << static_cast<int>(rColor.GetGreen())
           << " B:" << static_cast<int>(rColor.GetBlue())
-          << " A:" << static_cast<int>(rColor.GetTransparency());
+          << " A:" << static_cast<int>(255 - rColor.GetAlpha());
     return rStrm;
 }
 
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 9e7a441d3b86..8266fe938bbf 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -200,8 +200,7 @@ bool polygonContainsLine(const basegfx::B2DPolyPolygon& rPolyPolygon)
 
 SkColor toSkColor(Color color)
 {
-    return SkColorSetARGB(255 - color.GetTransparency(), color.GetRed(), color.GetGreen(),
-                          color.GetBlue());
+    return SkColorSetARGB(color.GetAlpha(), color.GetRed(), color.GetGreen(), color.GetBlue());
 }
 
 SkColor toSkColorWithTransparency(Color aColor, double fTransparency)
@@ -211,7 +210,7 @@ SkColor toSkColorWithTransparency(Color aColor, double fTransparency)
 
 SkColor toSkColorWithIntensity(Color color, int intensity)
 {
-    return SkColorSetARGB(255 - color.GetTransparency(), color.GetRed() * intensity / 100,
+    return SkColorSetARGB(color.GetAlpha(), color.GetRed() * intensity / 100,
                           color.GetGreen() * intensity / 100, color.GetBlue() * intensity / 100);
 }
 
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index 18b10680eeb8..77bb784241f0 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -627,8 +627,7 @@ SkBitmap SkiaSalBitmap::GetAsSkBitmap() const
 
 static SkColor toSkColor(Color color)
 {
-    return SkColorSetARGB(255 - color.GetTransparency(), color.GetRed(), color.GetGreen(),
-                          color.GetBlue());
+    return SkColorSetARGB(color.GetAlpha(), color.GetRed(), color.GetGreen(), color.GetBlue());
 }
 
 // If mEraseColor is set, this is the color to use when the bitmap is used as alpha bitmap.
@@ -1230,7 +1229,7 @@ OString SkiaSalBitmap::GetImageKey() const
     if (mEraseColorSet)
     {
         std::stringstream ss;
-        ss << std::hex << std::setfill('0') << std::setw(2) << (255 - mEraseColor.GetTransparency())
+        ss << std::hex << std::setfill('0') << std::setw(2) << mEraseColor.GetAlpha()
            << std::setw(6) << sal_uInt32(mEraseColor.GetRGBColor());
         return OStringLiteral("E") + ss.str().c_str();
     }
diff --git a/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx b/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx
index 0544943b3417..f3b371e03f1c 100644
--- a/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx
+++ b/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx
@@ -107,7 +107,7 @@ template <typename MorphologyOp> struct Value<MorphologyOp, 0>
                sal_uInt8* /*pHint*/ = nullptr)
     {
         const auto& rSource = pReadAccess->GetColor(y, x);
-        aResult = Color(MorphologyOp::apply(rSource.GetTransparency(), aResult.GetTransparency()),
+        aResult = Color(255 - MorphologyOp::apply(rSource.GetAlpha(), aResult.GetAlpha()),
                         MorphologyOp::apply(rSource.GetRed(), aResult.GetRed()),
                         MorphologyOp::apply(rSource.GetGreen(), aResult.GetGreen()),
                         MorphologyOp::apply(rSource.GetBlue(), aResult.GetBlue()));
diff --git a/vcl/source/bitmap/BitmapDisabledImageFilter.cxx b/vcl/source/bitmap/BitmapDisabledImageFilter.cxx
index 47e6527953ed..9c4e469191a8 100644
--- a/vcl/source/bitmap/BitmapDisabledImageFilter.cxx
+++ b/vcl/source/bitmap/BitmapDisabledImageFilter.cxx
@@ -40,7 +40,7 @@ BitmapEx BitmapDisabledImageFilter::execute(BitmapEx const& rBitmapEx) const
                 // Get the luminance from RGB color and remap the value from 0-255 to 160-224
                 const BitmapColor aColor = pRead->GetPixelFromData(pReadScan, nX);
                 sal_uInt8 nLum(aColor.GetLuminance() / 4 + 160);
-                BitmapColor aGreyValue(nLum, nLum, nLum, aColor.GetTransparency());
+                BitmapColor aGreyValue(nLum, nLum, nLum, 255 - aColor.GetAlpha());
                 pGrey->SetPixelOnData(pGreyScan, nX, aGreyValue);
             }
         }
diff --git a/vcl/source/bitmap/BitmapEx.cxx b/vcl/source/bitmap/BitmapEx.cxx
index 18978f779f4a..1f5da07218c4 100644
--- a/vcl/source/bitmap/BitmapEx.cxx
+++ b/vcl/source/bitmap/BitmapEx.cxx
@@ -574,7 +574,7 @@ bool BitmapEx::Erase( const Color& rFillColor )
             // Respect transparency on fill color
             if( rFillColor.IsTransparent() )
             {
-                const Color aFill( rFillColor.GetTransparency(), rFillColor.GetTransparency(), rFillColor.GetTransparency() );
+                const Color aFill( 255 - rFillColor.GetAlpha(), 255 - rFillColor.GetAlpha(), 255 - rFillColor.GetAlpha() );
                 maMask.Erase( aFill );
             }
             else
@@ -684,7 +684,7 @@ sal_uInt8 BitmapEx::GetTransparency(sal_Int32 nX, sal_Int32 nY) const
         if (nX >= 0 && nX < GetSizePixel().Width() && nY >= 0 && nY < GetSizePixel().Height())
         {
             if (maBitmap.GetBitCount() == 32)
-                return GetPixelColor(nX, nY).GetTransparency();
+                return 255 - GetPixelColor(nX, nY).GetAlpha();
             switch(meTransparent)
             {
                 case TransparentType::NONE:
@@ -754,11 +754,11 @@ Color BitmapEx::GetPixelColor(sal_Int32 nX, sal_Int32 nY) const
     {
         AlphaMask aAlpha = GetAlpha();
         AlphaMask::ScopedReadAccess pAlphaReadAccess(aAlpha);
-        aColor.SetTransparency(pAlphaReadAccess->GetPixel(nY, nX).GetIndex());
+        aColor.SetAlpha(255 - pAlphaReadAccess->GetPixel(nY, nX).GetIndex());
     }
     else if (maBitmap.GetBitCount() != 32)
     {
-        aColor.SetTransparency(0);
+        aColor.SetAlpha(255);
     }
     return aColor;
 }
diff --git a/vcl/source/bitmap/BitmapReadAccess.cxx b/vcl/source/bitmap/BitmapReadAccess.cxx
index 29df1f28c3b6..0a39835a364c 100644
--- a/vcl/source/bitmap/BitmapReadAccess.cxx
+++ b/vcl/source/bitmap/BitmapReadAccess.cxx
@@ -427,7 +427,7 @@ void BitmapReadAccess::SetPixelForN32BitTcAbgr(Scanline pScanline, tools::Long n
 {
     pScanline = pScanline + nX * 4;
 
-    sal_uInt8 alpha = 0xFF - rBitmapColor.GetTransparency();
+    sal_uInt8 alpha = rBitmapColor.GetAlpha();
     *pScanline++ = alpha;
     *pScanline++ = vcl::bitmap::premultiply(rBitmapColor.GetBlue(), alpha);
     *pScanline++ = vcl::bitmap::premultiply(rBitmapColor.GetGreen(), alpha);
@@ -476,7 +476,7 @@ void BitmapReadAccess::SetPixelForN32BitTcArgb(Scanline pScanline, tools::Long n
 {
     pScanline = pScanline + nX * 4;
 
-    sal_uInt8 alpha = 0xFF - rBitmapColor.GetTransparency();
+    sal_uInt8 alpha = rBitmapColor.GetAlpha();
     *pScanline++ = alpha;
     *pScanline++ = vcl::bitmap::premultiply(rBitmapColor.GetRed(), alpha);
     *pScanline++ = vcl::bitmap::premultiply(rBitmapColor.GetGreen(), alpha);
@@ -525,7 +525,7 @@ void BitmapReadAccess::SetPixelForN32BitTcBgra(Scanline pScanline, tools::Long n
 {
     pScanline = pScanline + nX * 4;
 
-    sal_uInt8 alpha = 0xFF - rBitmapColor.GetTransparency();
+    sal_uInt8 alpha = rBitmapColor.GetAlpha();
     *pScanline++ = vcl::bitmap::premultiply(rBitmapColor.GetBlue(), alpha);
     *pScanline++ = vcl::bitmap::premultiply(rBitmapColor.GetGreen(), alpha);
     *pScanline++ = vcl::bitmap::premultiply(rBitmapColor.GetRed(), alpha);
@@ -574,7 +574,7 @@ void BitmapReadAccess::SetPixelForN32BitTcRgba(Scanline pScanline, tools::Long n
 {
     pScanline = pScanline + nX * 4;
 
-    sal_uInt8 alpha = 0xFF - rBitmapColor.GetTransparency();
+    sal_uInt8 alpha = rBitmapColor.GetAlpha();
     *pScanline++ = vcl::bitmap::premultiply(rBitmapColor.GetRed(), alpha);
     *pScanline++ = vcl::bitmap::premultiply(rBitmapColor.GetGreen(), alpha);
     *pScanline++ = vcl::bitmap::premultiply(rBitmapColor.GetBlue(), alpha);
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx
index 3c654aaf6980..e4b03cb9de76 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -1101,7 +1101,7 @@ bool convertBitmap32To24Plus8(BitmapEx const & rInput, BitmapEx & rResult)
             {
                 const BitmapColor aColor = pReadAccess->GetPixelFromData(aReadScan, nX);
                 BitmapColor aResultColor(aColor.GetRed(), aColor.GetGreen(), aColor.GetBlue());
-                BitmapColor aResultColorAlpha(aColor.GetTransparency(), aColor.GetTransparency(), aColor.GetTransparency());
+                BitmapColor aResultColorAlpha(255 - aColor.GetAlpha(), 255 - aColor.GetAlpha(), 255 - aColor.GetAlpha());
 
                 pResultBitmapAccess->SetPixelOnData(aResultScan, nX, aResultColor);
                 pResultAlphaAccess->SetPixelOnData(aResultScanAlpha, nX, aResultColorAlpha);
diff --git a/vcl/source/bitmap/BitmapWriteAccess.cxx b/vcl/source/bitmap/BitmapWriteAccess.cxx
index c3613223ea94..8d6675ee7ba4 100644
--- a/vcl/source/bitmap/BitmapWriteAccess.cxx
+++ b/vcl/source/bitmap/BitmapWriteAccess.cxx
@@ -152,7 +152,7 @@ void BitmapWriteAccess::CopyScanline(tools::Long nY, ConstScanline aSrcScanline,
 
 void BitmapWriteAccess::SetLineColor(const Color& rColor)
 {
-    if (rColor.GetTransparency() == 255)
+    if (rColor.GetAlpha() == 0)
     {
         mpLineColor.reset();
     }
@@ -173,7 +173,7 @@ void BitmapWriteAccess::SetFillColor() { mpFillColor.reset(); }
 
 void BitmapWriteAccess::SetFillColor(const Color& rColor)
 {
-    if (rColor.GetTransparency() == 255)
+    if (rColor.GetAlpha() == 0)
     {
         mpFillColor.reset();
     }
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 4455b6651d58..a61c67b0c69d 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -100,7 +100,7 @@ TextEngine::TextEngine()
     vcl::Font aFont;
     aFont.SetTransparent( false );
     Color aFillColor( aFont.GetFillColor() );
-    aFillColor.SetTransparency( 0 );
+    aFillColor.SetAlpha( 255 );
     aFont.SetFillColor( aFillColor );
     SetFont( aFont );
 }
@@ -185,7 +185,7 @@ void TextEngine::SetFont( const vcl::Font& rFont )
     // Tell VCL not to use the font color, use text color from OutputDevice
     maFont.SetColor( COL_TRANSPARENT );
     Color aFillColor( maFont.GetFillColor() );
-    aFillColor.SetTransparency( 0 );
+    aFillColor.SetAlpha( 255 );
     maFont.SetFillColor( aFillColor );
 
     maFont.SetAlignment( ALIGN_TOP );
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 998bd68952bb..f7095a0d590c 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -267,7 +267,7 @@ void TextView::ImpPaint(vcl::RenderContext& rRenderContext, const Point& rStartP
         // unfortunately we cannot detect if it has changed
         vcl::Font aFont = mpImpl->mpTextEngine->GetFont();
         Color aColor = rRenderContext.GetBackground().GetColor();
-        aColor.SetTransparency(0);
+        aColor.SetAlpha(255);
         if (aColor != aFont.GetFillColor())
         {
             if (aFont.IsTransparent())
diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 37f5396a6164..f90e992963cc 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -327,7 +327,8 @@ void drawFromDrawCommands(gfx::DrawRoot const& rDrawRoot, SalGraphics& rGraphics
                         for (gfx::GradientStop const& rStop : pLinearGradient->maGradientStops)
                         {
                             Color aColor(rStop.maColor);
-                            aColor.SetTransparency(rStop.mfOpacity * (1.0f - rRectangle.mnOpacity));
+                            aColor.SetAlpha(255
+                                            - (rStop.mfOpacity * (1.0f - rRectangle.mnOpacity)));
                             aGradient.maStops.emplace_back(aColor, rStop.mfOffset);
                         }
                         FileDefinitionWidgetDraw::implDrawGradient(
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index d3efe0da4dee..26955027cd99 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -1725,7 +1725,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R
 
 Color GDIMetaFile::ImplColAdjustFnc( const Color& rColor, const void* pColParam )
 {
-    return Color( rColor.GetTransparency(),
+    return Color( 255 - rColor.GetAlpha(),
                   static_cast<const ImplColAdjustParam*>(pColParam)->pMapR[ rColor.GetRed() ],
                   static_cast<const ImplColAdjustParam*>(pColParam)->pMapG[ rColor.GetGreen() ],
                   static_cast<const ImplColAdjustParam*>(pColParam)->pMapB[ rColor.GetBlue() ] );
@@ -1751,7 +1751,7 @@ Color GDIMetaFile::ImplColConvertFnc( const Color& rColor, const void* pColParam
     if( MtfConversion::N1BitThreshold == static_cast<const ImplColConvertParam*>(pColParam)->eConversion )
         cLum = ( cLum < 128 ) ? 0 : 255;
 
-    return Color( rColor.GetTransparency(), cLum, cLum, cLum );
+    return Color( 255 - rColor.GetAlpha(), cLum, cLum, cLum );
 }
 
 BitmapEx GDIMetaFile::ImplBmpConvertFnc( const BitmapEx& rBmpEx, const void* pBmpParam )
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index 151cb991c050..dc57592944ab 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -568,9 +568,7 @@ namespace vcl::unotools
             pRet[0] = toDoubleColor(rColor.GetRed());
             pRet[1] = toDoubleColor(rColor.GetGreen());
             pRet[2] = toDoubleColor(rColor.GetBlue());
-
-            // VCL's notion of alpha is different from the rest of the world's
-            pRet[3] = 1.0 - toDoubleColor(rColor.GetTransparency());
+            pRet[3] = toDoubleColor(rColor.GetAlpha());
 
             return aRet;
         }
@@ -585,8 +583,7 @@ namespace vcl::unotools
             aColor.SetRed  ( toByteColor(rColor[0]) );
             aColor.SetGreen( toByteColor(rColor[1]) );
             aColor.SetBlue ( toByteColor(rColor[2]) );
-            // VCL's notion of alpha is different from the rest of the world's
-            aColor.SetTransparency( 255 - toByteColor(rColor[3]) );
+            aColor.SetAlpha( toByteColor(rColor[3]) );
 
             return aColor;
         }
@@ -597,7 +594,7 @@ namespace vcl::unotools
         {
             uno::Sequence<rendering::ARGBColor> aSeq(1);
             aSeq[0] = rendering::ARGBColor(
-                    1.0-toDoubleColor(rColor.GetTransparency()),
+                    toDoubleColor(rColor.GetAlpha()),
                     toDoubleColor(rColor.GetRed()),
                     toDoubleColor(rColor.GetGreen()),
                     toDoubleColor(rColor.GetBlue()) );
diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx
index 9760e309dad8..7d07be6fb31c 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -488,7 +488,7 @@ void OutputDevice::SetBackground( const Wallpaper& rBackground )
         else
         {
             // Color background.
-            int transparency = rBackground.GetColor().GetTransparency();
+            int transparency = 255 - rBackground.GetColor().GetAlpha();
             mpAlphaVDev->SetBackground( Wallpaper( Color( transparency, transparency, transparency )));
         }
     }
diff --git a/vcl/source/outdev/pixel.cxx b/vcl/source/outdev/pixel.cxx
index 9238c7a394d8..0c021a722452 100644
--- a/vcl/source/outdev/pixel.cxx
+++ b/vcl/source/outdev/pixel.cxx
@@ -44,7 +44,7 @@ Color OutputDevice::GetPixel(const Point& rPoint) const
             if (mpAlphaVDev)
             {
                 Color aAlphaColor = mpAlphaVDev->GetPixel(rPoint);
-                aColor.SetTransparency(aAlphaColor.GetBlue());
+                aColor.SetAlpha(255 - aAlphaColor.GetBlue());
             }
         }
     }
@@ -108,7 +108,7 @@ void OutputDevice::DrawPixel( const Point& rPt, const Color& rColor )
 
     if (mpAlphaVDev)
     {
-        Color aAlphaColor(rColor.GetTransparency(), rColor.GetTransparency(), rColor.GetTransparency());
+        Color aAlphaColor(255 - rColor.GetAlpha(), 255 - rColor.GetAlpha(), 255 - rColor.GetAlpha());
         mpAlphaVDev->DrawPixel(rPt, aAlphaColor);
     }
 }
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index 84e9ec332966..6c47c8a0ac01 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -96,7 +96,7 @@ void DecoToolBox::SetImages( tools::Long nMaxHeight, bool bForce )
     BitmapEx    aBmpExDst( maImage.GetBitmapEx() );
     BitmapEx    aBmpExSrc( aBmpExDst );
 
-    aEraseColor.SetTransparency( 255 );
+    aEraseColor.SetAlpha( 0 );
     aBmpExDst.Erase( aEraseColor );
     aBmpExDst.Scale( Size( lastSize, lastSize ) );