[Libreoffice-commits] core.git: drawinglayer/source editeng/source svx/source

[Maxim Monastirsky (via logerrit)]

 drawinglayer/source/processor2d/vclprocessor2d.cxx |    7 ++-----
 editeng/source/editeng/editattr.cxx                |    2 +-
 editeng/source/editeng/editdoc.cxx                 |    2 +-
 svx/source/tbxctrls/tbcontrl.cxx                   |    2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 619ac8bbb31a62087ac1e3745cc28b461bfb49c0
Author:     Maxim Monastirsky <momonas...@gmail.com>
AuthorDate: Thu Jul 6 01:58:42 2023 +0300
Commit:     Maxim Monastirsky <momonas...@gmail.com>
CommitDate: Thu Jul 6 09:33:52 2023 +0200

    tdf#126382 Correct check for transparency
    
    Change-Id: I0664abae6f83736678108fab31dd119fae811054
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154082
    Tested-by: Jenkins
    Reviewed-by: Maxim Monastirsky <momonas...@gmail.com>

diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index ad680803438d..3ad89f1cab63 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -185,11 +185,8 @@ void 
VclProcessor2D::RenderTextSimpleOrDecoratedPortionPrimitive2D(
 
             // set FillColor Attribute
             const Color aFillColor(rTextCandidate.getTextFillColor());
-            if (aFillColor != COL_TRANSPARENT)
-            {
-                aFont.SetFillColor(aFillColor);
-                aFont.SetTransparent(false);
-            }
+            aFont.SetTransparent(aFillColor.IsTransparent());
+            aFont.SetFillColor(aFillColor);
 
             // handle additional font attributes
             const primitive2d::TextDecoratedPortionPrimitive2D* pTCPP = 
nullptr;
diff --git a/editeng/source/editeng/editattr.cxx 
b/editeng/source/editeng/editattr.cxx
index 42e5f20206ba..a045f16ade81 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -230,7 +230,7 @@ 
EditCharAttribBackgroundColor::EditCharAttribBackgroundColor(
 void EditCharAttribBackgroundColor::SetFont( SvxFont& rFont, OutputDevice* )
 {
     Color aColor = static_cast<const SvxColorItem*>(GetItem())->GetValue();
-    rFont.SetTransparent(aColor == COL_TRANSPARENT);
+    rFont.SetTransparent(aColor.IsTransparent());
     rFont.SetFillColor(aColor);
 }
 
diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index 08750a94fcd2..d4dc4ee16e37 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1998,7 +1998,7 @@ void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, 
bool bSearchInParent, S
     if ( bSearchInParent || ( rSet.GetItemState( EE_CHAR_BKGCOLOR ) == 
SfxItemState::SET ) )
     {
         auto& aColor = rSet.Get( EE_CHAR_BKGCOLOR ).GetValue();
-        rFont.SetTransparent(aColor == COL_TRANSPARENT);
+        rFont.SetTransparent(aColor.IsTransparent());
         rFont.SetFillColor(aColor);
     }
     if ( bSearchInParent || ( rSet.GetItemState( nWhich_FontHeight ) == 
SfxItemState::SET ) )
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 052d8558386b..da8493c75059 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2349,7 +2349,7 @@ void ColorWindow::SelectEntry(const NamedColor& 
rNamedColor)
 
     const Color &rColor = rNamedColor.m_aColor;
 
-    if (mxButtonAutoColor->get_visible() && (rColor == COL_TRANSPARENT || 
rColor == COL_AUTO))
+    if (mxButtonAutoColor->get_visible() && rColor.IsFullyTransparent())
     {
         mpDefaultButton = mxButtonAutoColor.get();
         return;