[Libreoffice-commits] core.git: 2 commits - sd/source svtools/source

[Noel Grandin (via logerrit)]

 sd/source/ui/tools/PreviewRenderer.cxx |    6 +++---
 svtools/source/misc/embedhlp.cxx       |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6b736710c08a272c8fd1b741c380032363b527b4
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jul 8 12:29:58 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Jul 8 15:50:13 2019 +0200

    use BitmapEx in PreviewRenderer::ScaleBitmap
    
    Change-Id: I9f94c9cceb3c1828b9b1d21ac064dae2c12565c8
    Reviewed-on: https://gerrit.libreoffice.org/75214
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx
index b3eb95402df3..8f5d2dd73609 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -451,12 +451,12 @@ Image PreviewRenderer::ScaleBitmap (
         mpPreviewDevice->DrawRect (::tools::Rectangle(Point(0,0), aFrameSize));
 
         // Paint the bitmap scaled to the desired width.
-        BitmapEx aScaledBitmap (rBitmapEx.GetBitmap());
+        BitmapEx aScaledBitmap(rBitmapEx);
         aScaledBitmap.Scale (aPreviewSize, BmpScaleFlag::BestQuality);
-        mpPreviewDevice->DrawBitmap (
+        mpPreviewDevice->DrawBitmapEx (
             Point(1,1),
             aPreviewSize,
-            aScaledBitmap.GetBitmap());
+            aScaledBitmap);
 
         // Get the resulting bitmap.
         aPreview = Image(mpPreviewDevice->GetBitmapEx(Point(0,0), aFrameSize));
commit 44718954e78c88442ff6654d3e13ba69188e2d38
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jul 8 12:33:40 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Jul 8 15:50:00 2019 +0200

    use BitmapEx in EmbeddedObjectRef::DrawPaintReplacement
    
    Change-Id: Ia15a34abaf941ae4af34dbb3cb93a7525a746cd1
    Reviewed-on: https://gerrit.libreoffice.org/75215
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index eace6d8e927a..beb765409a35 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -709,7 +709,7 @@ void EmbeddedObjectRef::DrawPaintReplacement( const tools::Rectangle &rRect, con
             nWidth = nW;
         }
 
-        pOut->DrawBitmap(aP, Size( nWidth, nHeight ), aBmp.GetBitmap());
+        pOut->DrawBitmapEx(aP, Size( nWidth, nHeight ), aBmp);
     }
 
     pOut->IntersectClipRegion( rRect );