diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-31 17:00:49 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2018-06-01 11:14:43 +0200 |
| commit | 36ad2b13371a24d99dcec16a60b48d895e0228aa (patch) | |
| tree | 1d1cc5e345438e7a05db93f1ceebb2786d1735bf /sd | |
| parent | 6c4135416f79aebf02afa58d6d125f5c175b34d7 (diff) | |
drop Image(Bitmap) constructor
and convert some more code from Bitmap to BitmapEx
Change-Id: Icf3c18608e0bb608408fe69722441cfa19f6b161
Reviewed-on: https://gerrit.libreoffice.org/55160
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/docshell/docshel2.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/inc/DrawDocShell.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/tools/PreviewRenderer.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 2eed71680ac5..b5c6ba0f147a 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -179,7 +179,7 @@ FrameView* DrawDocShell::GetFrameView() /** * Creates a bitmap of an arbitrary page */ -Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage) +BitmapEx DrawDocShell::GetPagePreviewBitmap(SdPage* pPage) { const sal_uInt16 nMaxEdgePixel = 90; MapMode aMapMode( MapUnit::Map100thMM ); @@ -262,7 +262,7 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage) pVDev->SetMapMode( MapMode() ); - Bitmap aPreview( pVDev->GetBitmap( aNullPt, pVDev->GetOutputSizePixel() ) ); + BitmapEx aPreview( pVDev->GetBitmap( aNullPt, pVDev->GetOutputSizePixel() ) ); DBG_ASSERT(!!aPreview, "Preview-Bitmap could not be generated"); diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 7012e2113433..a823be100156 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -131,7 +131,7 @@ public: void GotoBookmark(const OUString& rBookmark); - Bitmap GetPagePreviewBitmap(SdPage* pPage); + BitmapEx GetPagePreviewBitmap(SdPage* pPage); /** checks, if the given name is a valid new name for a slide diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 76f980e0f60c..83812ebbe69a 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -120,7 +120,7 @@ Image PreviewRenderer::RenderPage ( PaintFrame(); Size aSize (mpPreviewDevice->GetOutputSizePixel()); - aPreview = Image(mpPreviewDevice->GetBitmap ( + aPreview = Image(mpPreviewDevice->GetBitmapEx( mpPreviewDevice->PixelToLogic(Point(0,0)), mpPreviewDevice->PixelToLogic(aSize))); @@ -182,7 +182,7 @@ Image PreviewRenderer::RenderSubstitution ( PaintFrame(); const Size aSize (mpPreviewDevice->GetOutputSizePixel()); - aPreview = Image(mpPreviewDevice->GetBitmap( + aPreview = Image(mpPreviewDevice->GetBitmapEx( mpPreviewDevice->PixelToLogic(Point(0,0)), mpPreviewDevice->PixelToLogic(aSize))); } @@ -456,7 +456,7 @@ Image PreviewRenderer::ScaleBitmap ( aScaledBitmap.GetBitmap()); // Get the resulting bitmap. - aPreview = Image(mpPreviewDevice->GetBitmap(Point(0,0), aFrameSize)); + aPreview = Image(mpPreviewDevice->GetBitmapEx(Point(0,0), aFrameSize)); } while (false); |