summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-09-10 12:37:56 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-09-10 16:23:59 +0200
commit40110d917b26f0d0e84938df2792abfedb461c45 (patch)
tree824313be0bc660c290b610921932b4c33f2e3321 /svx
parent8d831cc01daaed6937fc126dc5671ae58e8c027e (diff)
No more need for extra local variables
...after 453fde35bb838febf73bfda0bd981ee270c9b12e "BitmapFilter::execute can be const". This reverts the call-site changes of bce47223099bb3349d96af9d6b1fe88bcdd539df "clang-tidy bugprone-use-after-move in BitmapFilter::Filter" again. Change-Id: I5ce4eb7ddce90fb779ddfb1c5864fd4785708175 Reviewed-on: https://gerrit.libreoffice.org/60255 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/grfflt.cxx24
1 files changed, 8 insertions, 16 deletions
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index 51ebc78fe894..6ec799628327 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -90,16 +90,14 @@ SvxGraphicFilterResult SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest const
{
Animation aAnimation( rGraphic.GetAnimation() );
- BitmapSharpenFilter filter;
- if (BitmapFilter::Filter(aAnimation, filter))
+ if (BitmapFilter::Filter(aAnimation, BitmapSharpenFilter()))
aGraphic = aAnimation;
}
else
{
BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
- BitmapSharpenFilter filter;
- if (BitmapFilter::Filter(aBmpEx, filter))
+ if (BitmapFilter::Filter(aBmpEx, BitmapSharpenFilter()))
aGraphic = aBmpEx;
}
@@ -117,16 +115,14 @@ SvxGraphicFilterResult SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest const
{
Animation aAnimation( rGraphic.GetAnimation() );
- BitmapMedianFilter filter;
- if (BitmapFilter::Filter(aAnimation, filter))
+ if (BitmapFilter::Filter(aAnimation, BitmapMedianFilter()))
aGraphic = aAnimation;
}
else
{
BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
- BitmapMedianFilter filter;
- if (BitmapFilter::Filter(aBmpEx, filter))
+ if (BitmapFilter::Filter(aBmpEx, BitmapMedianFilter()))
aGraphic = aBmpEx;
}
@@ -144,16 +140,14 @@ SvxGraphicFilterResult SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest const
{
Animation aAnimation( rGraphic.GetAnimation() );
- BitmapSobelGreyFilter filter;
- if (BitmapFilter::Filter(aAnimation, filter))
+ if (BitmapFilter::Filter(aAnimation, BitmapSobelGreyFilter()))
aGraphic = aAnimation;
}
else
{
BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
- BitmapSobelGreyFilter filter;
- if (BitmapFilter::Filter(aBmpEx, filter))
+ if (BitmapFilter::Filter(aBmpEx, BitmapSobelGreyFilter()))
aGraphic = aBmpEx;
}
@@ -198,16 +192,14 @@ SvxGraphicFilterResult SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest const
{
Animation aAnimation( rGraphic.GetAnimation() );
- BitmapPopArtFilter filter;
- if (BitmapFilter::Filter(aAnimation, filter))
+ if (BitmapFilter::Filter(aAnimation, BitmapPopArtFilter()))
aGraphic = aAnimation;
}
else
{
BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
- BitmapPopArtFilter filter;
- if (BitmapFilter::Filter(aBmpEx, filter))
+ if (BitmapFilter::Filter(aBmpEx, BitmapPopArtFilter()))
aGraphic = aBmpEx;
}