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/source/bitmap/bitmappaint.cxx | |
| 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/source/bitmap/bitmappaint.cxx')
| -rw-r--r-- | vcl/source/bitmap/bitmappaint.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/vcl/source/bitmap/bitmappaint.cxx b/vcl/source/bitmap/bitmappaint.cxx index aa21c4d359b0..0bbd32559bfe 100644 --- a/vcl/source/bitmap/bitmappaint.cxx +++ b/vcl/source/bitmap/bitmappaint.cxx @@ -22,8 +22,10 @@ #include <vcl/bitmapaccess.hxx> #include <vcl/alpha.hxx> -#include <impbmp.hxx> #include <bitmapwriteaccess.hxx> +#include <salbmp.hxx> +#include <svdata.hxx> +#include <salinst.hxx> #include <algorithm> #include <memory> @@ -143,7 +145,7 @@ bool Bitmap::Invert() } } - mxImpBmp->InvalidateChecksum(); + mxSalBmp->InvalidateChecksum(); pAcc.reset(); bRet = true; } @@ -856,13 +858,13 @@ bool Bitmap::Replace(const AlphaMask& rAlpha, const Color& rMergeColor) bool Bitmap::Replace(const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol) { - if (mxImpBmp) + if (mxSalBmp) { // implementation specific replace - std::shared_ptr<ImpBitmap> xImpBmp(new ImpBitmap); - if (xImpBmp->Create(*mxImpBmp) && xImpBmp->Replace(rSearchColor, rReplaceColor, nTol)) + std::shared_ptr<SalBitmap> xImpBmp(ImplGetSVData()->mpDefInst->CreateSalBitmap()); + if (xImpBmp->Create(*mxSalBmp) && xImpBmp->Replace(rSearchColor, rReplaceColor, nTol)) { - ImplSetImpBitmap(xImpBmp); + ImplSetSalBitmap(xImpBmp); maPrefMapMode = MapMode(MapUnit::MapPixel); maPrefSize = xImpBmp->GetSize(); return true; |