core.git: 2 commits - sd/source

[Noel Grandin (via logerrit)]

 sd/source/ui/docshell/docshel2.cxx     |    4 ++--
 sd/source/ui/inc/DrawDocShell.hxx      |    2 +-
 sd/source/ui/table/TableDesignPane.cxx |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 7d52524fba6d54367b974c6dcef20811b552978d
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Jul 28 16:55:52 2025 +0200
Commit:     Noel Grandin <noelgran...@gmail.com>
CommitDate: Tue Jul 29 08:45:18 2025 +0200

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

diff --git a/sd/source/ui/docshell/docshel2.cxx 
b/sd/source/ui/docshell/docshel2.cxx
index d4d8e3f62765..7ff45f6f2cf6 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -177,7 +177,7 @@ FrameView* DrawDocShell::GetFrameView()
 /**
  * Creates a bitmap of an arbitrary page
  */
-BitmapEx DrawDocShell::GetPagePreviewBitmap(SdPage* pPage)
+Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage)
 {
     const sal_uInt16 nMaxEdgePixel = 90;
     MapMode         aMapMode( MapUnit::Map100thMM );
@@ -260,7 +260,7 @@ BitmapEx DrawDocShell::GetPagePreviewBitmap(SdPage* pPage)
 
     pVDev->SetMapMode( MapMode() );
 
-    BitmapEx aPreview( pVDev->GetBitmap( aNullPt, pVDev->GetOutputSizePixel() 
) );
+    Bitmap aPreview( pVDev->GetBitmap( aNullPt, pVDev->GetOutputSizePixel() ) 
);
 
     DBG_ASSERT(!aPreview.IsEmpty(), "Preview-Bitmap could not be generated");
 
diff --git a/sd/source/ui/inc/DrawDocShell.hxx 
b/sd/source/ui/inc/DrawDocShell.hxx
index 248b919f028d..3f3df764c1a3 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -130,7 +130,7 @@ public:
 
     void                    GotoBookmark(std::u16string_view rBookmark);
 
-    SD_DLLPUBLIC BitmapEx GetPagePreviewBitmap(SdPage* pPage);
+    SD_DLLPUBLIC Bitmap GetPagePreviewBitmap(SdPage* pPage);
 
     /** checks, if the given name is a valid new name for a slide
 
commit b96eb873b235e8a147cd7de075e7bbfb3169cfa9
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Jul 28 16:44:46 2025 +0200
Commit:     Noel Grandin <noelgran...@gmail.com>
CommitDate: Tue Jul 29 08:45:09 2025 +0200

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

diff --git a/sd/source/ui/table/TableDesignPane.cxx 
b/sd/source/ui/table/TableDesignPane.cxx
index 5bb93b9f4156..3a2a5e4c1959 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -907,7 +907,7 @@ static void FillCellInfoMatrix( const CellInfoVector& 
rStyle, const TableStyleSe
     }
 }
 
-static BitmapEx CreateDesignPreview( const Reference< XIndexAccess >& 
xTableStyle, const TableStyleSettings& rSettings, bool bIsPageDark )
+static Bitmap CreateDesignPreview( const Reference< XIndexAccess >& 
xTableStyle, const TableStyleSettings& rSettings, bool bIsPageDark )
 {
     CellInfoVector aCellInfoVector(sdr::table::style_count);
     FillCellInfoVector( xTableStyle, aCellInfoVector );
@@ -1018,7 +1018,7 @@ static BitmapEx CreateDesignPreview( const Reference< 
XIndexAccess >& xTableStyl
         }
     }
 
-    return BitmapEx(pVirDev->GetBitmap(Point(0,0), aBmpSize));
+    return pVirDev->GetBitmap(Point(0,0), aBmpSize);
 }
 
 void TableDesignWidget::FillDesignPreviewControl()