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/win/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/win/window')
| -rw-r--r-- | vcl/win/window/salframe.cxx | 3 | ||||
| -rw-r--r-- | vcl/win/window/salmenu.cxx | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 5b5c55198d9a..a15e6924b963 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -64,7 +64,6 @@ #include <win/saltimer.h> #include <helpwin.hxx> -#include <impbmp.hxx> #include <window.h> #include <sallayout.hxx> @@ -4543,7 +4542,7 @@ static LRESULT ImplDrawItem(HWND, WPARAM wParam, LPARAM lParam ) aBitmap.Replace( COL_LIGHTMAGENTA, Color( GetRValue(colBackground),GetGValue(colBackground),GetBValue(colBackground) )); - WinSalBitmap* pSalBmp = static_cast<WinSalBitmap*>(aBitmap.ImplGetImpBitmap()->ImplGetSalBitmap()); + WinSalBitmap* pSalBmp = static_cast<WinSalBitmap*>(aBitmap.ImplGetSalBitmap().get()); HGLOBAL hDrawDIB = pSalBmp->ImplGethDIB(); if( hDrawDIB ) diff --git a/vcl/win/window/salmenu.cxx b/vcl/win/window/salmenu.cxx index 45be022ef23b..1339f80afa3d 100644 --- a/vcl/win/window/salmenu.cxx +++ b/vcl/win/window/salmenu.cxx @@ -29,7 +29,6 @@ #include <win/salframe.h> #include <win/salmenu.h> -#include <impbmp.hxx> #include <salgdi.hxx> static DWORD myerr=0; |