core.git: sd/source

[Noel Grandin (via logerrit)]

 sd/source/ui/dlg/animobjs.cxx |   18 +++++++++---------
 sd/source/ui/inc/animobjs.hxx |    4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit c92495ca41d9558e0c0ebcb6c33221a67fb340e7
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Aug 29 09:55:40 2025 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Aug 29 18:16:27 2025 +0200

    BitmapEx->Bitmap in SdDisplay
    
    now that Bitmap supports transparency
    
    Change-Id: I21732cf6bbf8eb690a4dd7a3f216213cba152679
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190375
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index ac6516b202e5..5c7dcab4f7b4 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -63,17 +63,17 @@ SdDisplay::~SdDisplay()
 {
 }
 
-void SdDisplay::SetBitmapEx( BitmapEx const * pBmpEx )
+void SdDisplay::SetBitmap( Bitmap const * pBmp )
 {
-    if( pBmpEx )
+    if( pBmp )
     {
-        aBitmapEx = *pBmpEx;
+        aBitmap = *pBmp;
     }
     else
     {
         const StyleSettings& rStyles = 
Application::GetSettings().GetStyleSettings();
         const Color aFillColor = rStyles.GetFieldColor();
-        aBitmapEx.Erase(aFillColor);
+        aBitmap.Erase(aFillColor);
     }
 }
 
@@ -89,7 +89,7 @@ void SdDisplay::Paint(vcl::RenderContext& rRenderContext, 
const ::tools::Rectang
     Point aPt;
     Size aSize = GetOutputSizePixel();
 
-    Size aBmpSize = aBitmapEx.GetBitmap().GetSizePixel();
+    Size aBmpSize = aBitmap.GetSizePixel();
     aBmpSize.setWidth( static_cast<::tools::Long>( 
static_cast<double>(aBmpSize.Width()) * static_cast<double>(aScale) ) );
     aBmpSize.setHeight( static_cast<::tools::Long>( 
static_cast<double>(aBmpSize.Height()) * static_cast<double>(aScale) ) );
 
@@ -98,7 +98,7 @@ void SdDisplay::Paint(vcl::RenderContext& rRenderContext, 
const ::tools::Rectang
     if( aBmpSize.Height() < aSize.Height() )
         aPt.setY( ( aSize.Height() - aBmpSize.Height() ) / 2 );
 
-    aBitmapEx.Draw(&rRenderContext, aPt, aBmpSize);
+    aBitmap.Draw(&rRenderContext, aPt, aBmpSize);
 }
 
 void SdDisplay::SetScale( const Fraction& rFrac )
@@ -507,7 +507,7 @@ void AnimationWindow::UpdateControl(bool const 
bDisableCtrls)
     // tdf#95298 check m_nCurrentFrame for EMPTY_FRAMELIST to avoid 
out-of-bound array access
     if (!m_FrameList.empty() && EMPTY_FRAMELIST != m_nCurrentFrame)
     {
-        BitmapEx aBmp(m_FrameList[m_nCurrentFrame].first);
+        Bitmap aBmp(m_FrameList[m_nCurrentFrame].first);
 
         SdPage* pPage = pMyDoc->GetSdPage(0, PageKind::Standard);
         SdrObject *const pObject = pPage->GetObj(m_nCurrentFrame);
@@ -532,11 +532,11 @@ void AnimationWindow::UpdateControl(bool const 
bDisableCtrls)
             aBmp = pVD->GetBitmap( aObjRect.TopLeft(), aObjSize );
         }
 
-        m_xCtlDisplay->SetBitmapEx(&aBmp);
+        m_xCtlDisplay->SetBitmap(&aBmp);
     }
     else
     {
-        m_xCtlDisplay->SetBitmapEx(nullptr);
+        m_xCtlDisplay->SetBitmap(nullptr);
     }
 
     m_xCtlDisplay->Invalidate();
diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx
index 200d61c741b9..384ba908f1cd 100644
--- a/sd/source/ui/inc/animobjs.hxx
+++ b/sd/source/ui/inc/animobjs.hxx
@@ -52,7 +52,7 @@ enum BitmapAdjustment
 class SdDisplay final : public weld::CustomWidgetController
 {
 private:
-    BitmapEx    aBitmapEx;
+    Bitmap      aBitmap;
     Fraction    aScale;
 
 public:
@@ -61,7 +61,7 @@ public:
 
     virtual void Paint( vcl::RenderContext& rRenderContext, const 
::tools::Rectangle& rRect ) override;
 
-    void    SetBitmapEx( BitmapEx const * pBmpEx );
+    void    SetBitmap( Bitmap const * pBmp );
     void    SetScale( const Fraction& rFrac );
 
     virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;