diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2018-04-20 22:22:44 +1000 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-05-09 05:17:42 +0200 |
| commit | b781a6b6b2fc0a6688a6335a9408143fb120aa6e (patch) | |
| tree | b3c3eb433001aac650de3ef00e889a901a7ff1ee /svx | |
| parent | 2af7daa18467cc7c3f4f435c58cd19ee682f754f (diff) | |
vcl: get rid of Bitmap{Ex}::Filter() and Animation::Filter()
Change-Id: I510d7b286df732712aa9206b0a7c7910af34c83f
Reviewed-on: https://gerrit.libreoffice.org/53206
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/grfflt.cxx | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index fffcaaecdbf5..ccc8e2148e99 100644 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -17,6 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <vcl/BitmapSharpenFilter.hxx> +#include <vcl/BitmapMedianFilter.hxx> +#include <vcl/BitmapSobelGreyFilter.hxx> +#include <vcl/BitmapPopArtFilter.hxx> + #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/objsh.hxx> @@ -89,14 +94,14 @@ SvxGraphicFilterResult SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest const { Animation aAnimation( rGraphic.GetAnimation() ); - if( aAnimation.Filter( BmpFilter::Sharpen ) ) + if (BitmapFilter::Filter(aAnimation, BitmapSharpenFilter())) aGraphic = aAnimation; } else { BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); - if( aBmpEx.Filter( BmpFilter::Sharpen ) ) + if (BitmapFilter::Filter(aBmpEx, BitmapSharpenFilter())) aGraphic = aBmpEx; } @@ -114,14 +119,14 @@ SvxGraphicFilterResult SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest const { Animation aAnimation( rGraphic.GetAnimation() ); - if( aAnimation.Filter( BmpFilter::RemoveNoise ) ) + if (BitmapFilter::Filter(aAnimation, BitmapMedianFilter())) aGraphic = aAnimation; } else { BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); - if( aBmpEx.Filter( BmpFilter::RemoveNoise ) ) + if (BitmapFilter::Filter(aBmpEx, BitmapMedianFilter())) aGraphic = aBmpEx; } @@ -139,14 +144,14 @@ SvxGraphicFilterResult SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest const { Animation aAnimation( rGraphic.GetAnimation() ); - if( aAnimation.Filter( BmpFilter::SobelGrey ) ) + if (BitmapFilter::Filter(aAnimation, BitmapSobelGreyFilter())) aGraphic = aAnimation; } else { BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); - if( aBmpEx.Filter( BmpFilter::SobelGrey ) ) + if (BitmapFilter::Filter(aBmpEx, BitmapSobelGreyFilter())) aGraphic = aBmpEx; } @@ -203,14 +208,14 @@ SvxGraphicFilterResult SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest const { Animation aAnimation( rGraphic.GetAnimation() ); - if( aAnimation.Filter( BmpFilter::PopArt ) ) + if (BitmapFilter::Filter(aAnimation, BitmapPopArtFilter())) aGraphic = aAnimation; } else { BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); - if( aBmpEx.Filter( BmpFilter::PopArt ) ) + if (BitmapFilter::Filter(aBmpEx, BitmapPopArtFilter())) aGraphic = aBmpEx; } |