summaryrefslogtreecommitdiff
path: root/svx/source/xoutdev
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-05-30 13:02:25 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-05-31 14:08:44 +0200
commitd4442ac1ac9aae36dbc08fda8154d71ea0f81708 (patch)
tree62fdc7419391dbf8c1cd92872ba2c9e12df2c4b6 /svx/source/xoutdev
parentb7939ff897a173086643819451c7b2b4553c11c3 (diff)
drop Graphic::GetBitmap
so that we flush out various code using Bitmap, in favour of using BitmapEx. This is part of the process of making Bitmap largely an internal detail of vcl Change-Id: Iaf2ead5e3d9960838723fb55b812b97108093d74 Reviewed-on: https://gerrit.libreoffice.org/55062 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/xoutdev')
-rw-r--r--svx/source/xoutdev/_xoutbmp.cxx21
1 files changed, 5 insertions, 16 deletions
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 4b943e817767..55128d08f7d8 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -96,20 +96,9 @@ Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const BmpMirrorFlags
}
else
{
- if( rGraphic.IsTransparent() )
- {
- BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
-
- aBmpEx.Mirror( nMirrorFlags );
- aRetGraphic = aBmpEx;
- }
- else
- {
- Bitmap aBmp( rGraphic.GetBitmap() );
-
- aBmp.Mirror( nMirrorFlags );
- aRetGraphic = aBmp;
- }
+ BitmapEx aBmp( rGraphic.GetBitmapEx() );
+ aBmp.Mirror( nMirrorFlags );
+ aRetGraphic = aBmp;
}
}
else
@@ -322,10 +311,10 @@ ErrCode XOutBitmap::WriteGraphic( const Graphic& rGraphic, OUString& rFileName,
aGraphic = pVDev->GetBitmap( Point(), aSize );
}
else
- aGraphic = rGraphic.GetBitmap();
+ aGraphic = rGraphic.GetBitmapEx();
}
else
- aGraphic = rGraphic.GetBitmap();
+ aGraphic = rGraphic.GetBitmapEx();
}
// mirror?