core.git: 2 commits - svx/source sw/source

[Noel Grandin (via logerrit)]

 svx/source/tbxctrls/tbcontrl.cxx               |    6 +++---
 sw/source/uibase/sidebar/StylePresetsPanel.cxx |   10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 70b2cbe95536a1cd40b247f356a13c7376e4eca6
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun Jul 27 13:55:32 2025 +0200
Commit:     Noel Grandin <noelgran...@gmail.com>
CommitDate: Mon Jul 28 17:57:22 2025 +0200

    BitmapEx->Bitmap in LineListBox::ImpGetLine
    
    since Bitmap can now handle transparency
    
    Change-Id: I4b01000f550472445f0f39f406535646c5675d3b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188446
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Tested-by: Jenkins

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index bda3acaaa53a..c9e59b2abd89 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -573,7 +573,7 @@ private:
 
         void         ImpGetLine(tools::Long nLine1, tools::Long nLine2, 
tools::Long nDistance,
                                 Color nColor1, Color nColor2, Color nColorDist,
-                                SvxBorderLineStyle nStyle, BitmapEx& rBmp);
+                                SvxBorderLineStyle nStyle, Bitmap& rBmp);
 
         void            UpdatePaintLineColor();       // returns sal_True if 
maPaintCol has changed
 
@@ -618,7 +618,7 @@ private:
 
     void LineListBox::ImpGetLine( tools::Long nLine1, tools::Long nLine2, 
tools::Long nDistance,
                                 Color aColor1, Color aColor2, Color aColorDist,
-                                SvxBorderLineStyle nStyle, BitmapEx& rBmp )
+                                SvxBorderLineStyle nStyle, Bitmap& rBmp )
     {
         auto nMinWidth = 
GetDrawingArea()->get_ref_device().approximate_digit_width() * 
COMBO_WIDTH_IN_CHARS;
         Size aSize(nMinWidth, aTxtSize.Height());
@@ -773,7 +773,7 @@ private:
             auto& pData = m_vLineList[ n ];
             if ( pData->GetMinWidth() <= m_nWidth )
             {
-                BitmapEx aBmp;
+                Bitmap aBmp;
                 ImpGetLine( pData->GetLine1ForWidth( m_nWidth ),
                         pData->GetLine2ForWidth( m_nWidth ),
                         pData->GetDistForWidth( m_nWidth ),
commit 09ac3cf793129a3cddfbb798419c2e309ad755eb
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun Jul 27 13:51:54 2025 +0200
Commit:     Noel Grandin <noelgran...@gmail.com>
CommitDate: Mon Jul 28 17:57:13 2025 +0200

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

diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx 
b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
index 572db4d575a5..08745392664a 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
@@ -47,7 +47,7 @@ void renderPreview(sfx2::StyleManager* pStyleManager, 
OutputDevice& aOutputDevic
     }
 }
 
-BitmapEx GenerateStylePreview(SfxObjectShell& rSource, OUString const & aName)
+Bitmap GenerateStylePreview(SfxObjectShell& rSource, OUString const & aName)
 {
     sfx2::StyleManager* pStyleManager = rSource.GetStyleManager();
 
@@ -113,10 +113,10 @@ BitmapEx GenerateStylePreview(SfxObjectShell& rSource, 
OUString const & aName)
         renderPreview(pStyleManager, *pVirtualDev, u"Body Text", 
nTextBodyHeight, aRenderRect);
     }
 
-    return BitmapEx(pVirtualDev->GetBitmap(Point(), aSize));
+    return pVirtualDev->GetBitmap(Point(), aSize);
 }
 
-BitmapEx CreatePreview(OUString const & aUrl, OUString const & aName)
+Bitmap CreatePreview(OUString const & aUrl, OUString const & aName)
 {
     if (SfxObjectShell* pObjectShell = SfxObjectShell::Current())
     {
@@ -126,7 +126,7 @@ BitmapEx CreatePreview(OUString const & aUrl, OUString 
const & aName)
         if (xTemplDoc->LoadFrom(aMedium))
             return GenerateStylePreview(*xTemplDoc, aName);
     }
-    return BitmapEx();
+    return Bitmap();
 }
 
 }
@@ -165,7 +165,7 @@ void StylePresetsPanel::RefreshList()
             {
                 OUString aName = aTemplates.GetName(i,j);
                 OUString aURL = aTemplates.GetPath(i,j);
-                BitmapEx aPreview = CreatePreview(aURL, aName);
+                Bitmap aPreview = CreatePreview(aURL, aName);
                 sal_uInt16 nId = j + 1;
                 mxValueSet->InsertItem(nId, Image(aPreview), aName);
                 
maTemplateEntries.push_back(std::make_unique<TemplateEntry>(aURL));