core.git: toolkit/source

[Noel Grandin (via logerrit)]

 toolkit/source/controls/table/gridtablerenderer.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 02ea6bde72dad86560a2425a5141c7e87ddbc8d0
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun Jul 27 13:47:16 2025 +0200
Commit:     Noel Grandin <noelgran...@gmail.com>
CommitDate: Mon Jul 28 16:40:18 2025 +0200

    BitmapEx->Bitmap in CachedSortIndicator
    
    since Bitmap can how handle transparency
    
    Change-Id: If4364ced24486bb32879d7759d9702f943fc09a1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188444
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Tested-by: Jenkins

diff --git a/toolkit/source/controls/table/gridtablerenderer.cxx 
b/toolkit/source/controls/table/gridtablerenderer.cxx
index 93f94f60aeb7..35af29c17bff 100644
--- a/toolkit/source/controls/table/gridtablerenderer.cxx
+++ b/toolkit/source/controls/table/gridtablerenderer.cxx
@@ -62,22 +62,22 @@ namespace svt::table
         {
         }
 
-        BitmapEx const & getBitmapFor(vcl::RenderContext const & i_device, 
tools::Long const i_headerHeight,
+        Bitmap const & getBitmapFor(vcl::RenderContext const & i_device, 
tools::Long const i_headerHeight,
                                       StyleSettings const & i_style, bool 
const i_sortAscending);
 
     private:
         tools::Long m_lastHeaderHeight;
         Color m_lastArrowColor;
-        BitmapEx m_sortAscending;
-        BitmapEx m_sortDescending;
+        Bitmap m_sortAscending;
+        Bitmap m_sortDescending;
     };
 
     }
 
-    BitmapEx const & CachedSortIndicator::getBitmapFor(vcl::RenderContext 
const& i_device, tools::Long const i_headerHeight,
+    Bitmap const & CachedSortIndicator::getBitmapFor(vcl::RenderContext const& 
i_device, tools::Long const i_headerHeight,
         StyleSettings const & i_style, bool const i_sortAscending )
     {
-        BitmapEx& rBitmap(i_sortAscending ? m_sortAscending : 
m_sortDescending);
+        Bitmap& rBitmap(i_sortAscending ? m_sortAscending : m_sortDescending);
         if (rBitmap.IsEmpty() || (i_headerHeight != m_lastHeaderHeight) || 
(i_style.GetActiveColor() != m_lastArrowColor))
         {
             tools::Long const nSortIndicatorWidth = 2 * i_headerHeight / 3;
@@ -274,7 +274,7 @@ namespace svt::table
         if ( aCurrentSortOrder.nColumnPos == _nCol )
         {
             tools::Long const nHeaderHeight( _rArea.GetHeight() );
-            BitmapEx const aIndicatorBitmap = 
m_pImpl->aSortIndicator.getBitmapFor(rRenderContext, nHeaderHeight, _rStyle,
+            Bitmap const aIndicatorBitmap = 
m_pImpl->aSortIndicator.getBitmapFor(rRenderContext, nHeaderHeight, _rStyle,
                                                                                
    aCurrentSortOrder.eSortDirection == ColumnSortAscending);
             Size const aBitmapSize( aIndicatorBitmap.GetSizePixel() );
             tools::Long const nSortIndicatorPaddingX = 2;