diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-16 11:27:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-17 15:07:13 +0200 |
| commit | f462a76f2bbaaaaaa79bf935a51bdf8cead25dbb (patch) | |
| tree | 745b09434515a712d8af42626e0f7ef1dd6871db /vcl/unx/generic/window | |
| parent | 432c7dd62b3ea7634a43850ea937c6bc681884d8 (diff) | |
remove ImpBitmap
it's not adding anything useful, just hold the underlying SalBitmap
instead
Change-Id: I54852707b2f8af99283b9c882a428a8a7a11c4cf
Reviewed-on: https://gerrit.libreoffice.org/52955
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/unx/generic/window')
| -rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 8f8bc056e054..88a9c455cbb1 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -69,7 +69,6 @@ #include <svdata.hxx> #include <strings.hrc> #include <bitmaps.hlst> -#include <impbmp.hxx> #include <boost/optional.hpp> @@ -334,7 +333,7 @@ static bool lcl_SelectAppIconPixmap( SalDisplay const *pDisplay, SalX11Screen nX return false; X11SalBitmap *pBitmap = dynamic_cast < X11SalBitmap * > - (aIcon.ImplGetBitmapImpBitmap()->ImplGetSalBitmap()); + (aIcon.ImplGetBitmapSalBitmap().get()); if (!pBitmap) // FIXME: opengl return false; @@ -374,7 +373,7 @@ static bool lcl_SelectAppIconPixmap( SalDisplay const *pDisplay, SalX11Screen nX aMask.Invert(); X11SalBitmap *pMask = static_cast < X11SalBitmap * > - (aMask.ImplGetImpBitmap()->ImplGetSalBitmap()); + (aMask.ImplGetSalBitmap().get()); pMask->ImplDraw(icon_mask, nXScreen, 1, aRect, aMonoGC); XFreeGC( pDisplay->GetDisplay(), aMonoGC ); |