diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx index f9dcb9b6e082..620a7a5134c3 100644 --- a/vcl/headless/svpbmp.cxx +++ b/vcl/headless/svpbmp.cxx @@ -250,9 +250,4 @@ bool SvpSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, return false; } -bool SvpSalBitmap::Replace( const ::Color& /*rSearchColor*/, const ::Color& /*rReplaceColor*/, sal_uInt8 /*nTol*/ ) -{ - return false; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx index ab57bca43816..413be0effabe 100644 --- a/vcl/inc/headless/svpbmp.hxx +++ b/vcl/inc/headless/svpbmp.hxx @@ -61,7 +61,6 @@ public: SAL_DLLPRIVATE virtual bool ScalingSupported() const override; SAL_DLLPRIVATE virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override; - SAL_DLLPRIVATE virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol ) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/qt5/QtBitmap.hxx b/vcl/inc/qt5/QtBitmap.hxx index e864350ba7b3..25f1b7798ccc 100644 --- a/vcl/inc/qt5/QtBitmap.hxx +++ b/vcl/inc/qt5/QtBitmap.hxx @@ -53,8 +53,6 @@ public: virtual bool ScalingSupported() const override; virtual bool Scale(const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag) override; - virtual bool Replace(const Color& rSearchColor, const Color& rReplaceColor, - sal_uInt8 nTol) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h index 6d29858dec89..568fb45110a4 100644 --- a/vcl/inc/quartz/salbmp.h +++ b/vcl/inc/quartz/salbmp.h @@ -74,7 +74,6 @@ public: bool ScalingSupported() const override; bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override; - bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol ) override; private: // quartz helper diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx index 8bfa76f2a757..da0a742129e2 100644 --- a/vcl/inc/salbmp.hxx +++ b/vcl/inc/salbmp.hxx @@ -80,8 +80,6 @@ public: virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) = 0; void DropScaledCache(); - virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol ) = 0; - virtual bool ConvertToGreyscale() { return false; diff --git a/vcl/inc/skia/salbmp.hxx b/vcl/inc/skia/salbmp.hxx index 791335f306b8..44414f96e6ee 100644 --- a/vcl/inc/skia/salbmp.hxx +++ b/vcl/inc/skia/salbmp.hxx @@ -56,8 +56,6 @@ public: virtual bool ScalingSupported() const override; virtual bool Scale(const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag) override; - virtual bool Replace(const Color& rSearchColor, const Color& rReplaceColor, - sal_uInt8 nTol) override; virtual bool InterpretAs8Bit() override; virtual bool ConvertToGreyscale() override; virtual bool Erase(const Color& color) override; diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h index d87daa33b37c..049963fb893f 100644 --- a/vcl/inc/win/salbmp.h +++ b/vcl/inc/win/salbmp.h @@ -84,7 +84,6 @@ public: virtual bool ScalingSupported() const override; virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override; - virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol ) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/QtBitmap.cxx b/vcl/qt5/QtBitmap.cxx index d0b08620406a..3837820becb7 100644 --- a/vcl/qt5/QtBitmap.cxx +++ b/vcl/qt5/QtBitmap.cxx @@ -178,10 +178,4 @@ bool QtBitmap::Scale(const double& /*rScaleX*/, const double& /*rScaleY*/, return false; } -bool QtBitmap::Replace(const Color& /*rSearchColor*/, const Color& /*rReplaceColor*/, - sal_uInt8 /*nTol*/) -{ - return false; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index 41a19f13b33b..079199ce8d16 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -655,9 +655,4 @@ bool QuartzSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY* return false; } -bool QuartzSalBitmap::Replace( const Color& /*rSearchColor*/, const Color& /*rReplaceColor*/, sal_uInt8 /*nTol*/ ) -{ - return false; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx index c54598660c37..7553a73116a9 100644 --- a/vcl/skia/salbmp.cxx +++ b/vcl/skia/salbmp.cxx @@ -440,14 +440,6 @@ bool SkiaSalBitmap::Scale(const double& rScaleX, const double& rScaleY, BmpScale return true; } -bool SkiaSalBitmap::Replace(const Color&, const Color&, sal_uInt8) -{ -#ifdef DBG_UTIL - assert(mWriteAccessCount == 0); -#endif - return false; -} - bool SkiaSalBitmap::ConvertToGreyscale() { #ifdef DBG_UTIL diff --git a/vcl/source/bitmap/bitmappaint.cxx b/vcl/source/bitmap/bitmappaint.cxx index 4873d55ba5e7..8dbcbf563685 100644 --- a/vcl/source/bitmap/bitmappaint.cxx +++ b/vcl/source/bitmap/bitmappaint.cxx @@ -947,19 +947,6 @@ bool Bitmap::Replace(const AlphaMask& rAlpha, const Color& rMergeColor) bool Bitmap::Replace(const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol) { - if (mxSalBmp) - { - // implementation specific replace - std::shared_ptr xImpBmp(ImplGetSVData()->mpDefInst->CreateSalBitmap()); - if (xImpBmp->Create(*mxSalBmp) && xImpBmp->Replace(rSearchColor, rReplaceColor, nTol)) - { - ImplSetSalBitmap(xImpBmp); - maPrefMapMode = MapMode(MapUnit::MapPixel); - maPrefSize = xImpBmp->GetSize(); - return true; - } - } - BitmapScopedWriteAccess pAcc(*this); if (!pAcc) return false; diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx index 0064da5cd507..f35f83064cb9 100644 --- a/vcl/win/gdi/salbmp.cxx +++ b/vcl/win/gdi/salbmp.cxx @@ -540,9 +540,4 @@ bool WinSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, return false; } -bool WinSalBitmap::Replace( const Color& /*rSearchColor*/, const Color& /*rReplaceColor*/, sal_uInt8 /*nTol*/ ) -{ - return false; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */