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>

11 files changed, 27 insertions, 64 deletions

diff --git a/vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx b/vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx
index cbc5dc34d837..13e238bc1ecf 100644
--- a/vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx
+++ b/vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx
@@ -223,8 +223,7 @@ BitmapEx BitmapInterpolateScaleFilter::execute(BitmapEx const& rBitmapEx) const
     {
         // fallback to fast scale filter
         BitmapEx aBmpEx(aBitmap);
-        BitmapFastScaleFilter filter(mfScaleX, mfScaleY);
-        bRet = BitmapFilter::Filter(aBmpEx, filter);
+        bRet = BitmapFilter::Filter(aBmpEx, BitmapFastScaleFilter(mfScaleX, mfScaleY));
         aBitmap = aBmpEx.GetBitmap();
     }
 
diff --git a/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx b/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx
index 0ee1fd3159b2..85a5774f1a1d 100644
--- a/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx
+++ b/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx
@@ -28,8 +28,7 @@ BitmapEx BitmapSeparableUnsharpenFilter::execute(BitmapEx const& rBitmapEx) cons
     Bitmap aBlur(aBitmap);
     BitmapEx aBlurEx(aBlur);
 
-    BitmapGaussianSeparableBlurFilter filter(-mfRadius);
-    BitmapFilter::Filter(aBlurEx, filter);
+    BitmapFilter::Filter(aBlurEx, BitmapGaussianSeparableBlurFilter(-mfRadius));
     aBlur = aBlurEx.GetBitmap();
 
     // Amount of unsharpening effect on image - currently set to a fixed value
diff --git a/vcl/source/bitmap/BitmapSmoothenFilter.cxx b/vcl/source/bitmap/BitmapSmoothenFilter.cxx
index 3e6f3148cd3d..fbc464d880ca 100644
--- a/vcl/source/bitmap/BitmapSmoothenFilter.cxx
+++ b/vcl/source/bitmap/BitmapSmoothenFilter.cxx
@@ -23,15 +23,9 @@ BitmapEx BitmapSmoothenFilter::execute(BitmapEx const& rBitmapEx) const
     bool bRet = false;
 
     if (mfRadius > 0.0) // Blur for positive values of mnRadius
-    {
-        BitmapGaussianSeparableBlurFilter filter(mfRadius);
-        bRet = BitmapFilter::Filter(aBitmapEx, filter);
-    }
+        bRet = BitmapFilter::Filter(aBitmapEx, BitmapGaussianSeparableBlurFilter(mfRadius));
     else if (mfRadius < 0.0) // Unsharpen mask for negative values of mnRadius
-    {
-        BitmapSeparableUnsharpenFilter filter(mfRadius);
-        bRet = BitmapFilter::Filter(aBitmapEx, filter);
-    }
+        bRet = BitmapFilter::Filter(aBitmapEx, BitmapSeparableUnsharpenFilter(mfRadius));
 
     if (bRet)
         return rBitmapEx;
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index 7e801a9cb01f..22519fa5b810 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -525,13 +525,12 @@ bool Animation::ReduceColors( sal_uInt16 nNewColorCount )
     {
         bRet = true;
 
-        BitmapColorQuantizationFilter filter(nNewColorCount);
         for (size_t i = 0, n = maList.size(); (i < n) && bRet; ++i)
         {
-            bRet = BitmapFilter::Filter(maList[i]->aBmpEx, filter);
+            bRet = BitmapFilter::Filter(maList[i]->aBmpEx, BitmapColorQuantizationFilter(nNewColorCount));
         }
 
-        BitmapFilter::Filter(maBitmapEx, filter);
+        BitmapFilter::Filter(maBitmapEx, BitmapColorQuantizationFilter(nNewColorCount));
     }
     else
     {
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 8a02e37bdffa..2994bbc610aa 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -249,8 +249,7 @@ bool Bitmap::Convert( BmpConversion eConversion )
         case BmpConversion::N1BitThreshold:
         {
             BitmapEx aBmpEx(*this);
-            BitmapMonochromeFilter filter(128);
-            bRet = BitmapFilter::Filter(aBmpEx, filter);
+            bRet = BitmapFilter::Filter(aBmpEx, BitmapMonochromeFilter(128));
             *this = aBmpEx.GetBitmap();
         }
         break;
@@ -776,49 +775,32 @@ bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag n
     switch(nScaleFlag)
     {
         case BmpScaleFlag::Fast:
-        {
-            BitmapFastScaleFilter filter(rScaleX, rScaleY);
-            bRetval = BitmapFilter::Filter(aBmpEx, filter);
+            bRetval = BitmapFilter::Filter(aBmpEx, BitmapFastScaleFilter(rScaleX, rScaleY));
             break;
-        }
+
         case BmpScaleFlag::Interpolate:
-        {
-            BitmapInterpolateScaleFilter filter(rScaleX, rScaleY);
-            bRetval = BitmapFilter::Filter(aBmpEx, filter);
+            bRetval = BitmapFilter::Filter(aBmpEx, BitmapInterpolateScaleFilter(rScaleX, rScaleY));
             break;
-        }
+
         case BmpScaleFlag::Default:
             if (GetSizePixel().Width() < 2 || GetSizePixel().Height() < 2)
-            {
-                BitmapFastScaleFilter filter(rScaleX, rScaleY);
-                bRetval = BitmapFilter::Filter(aBmpEx, filter);
-            }
+                bRetval = BitmapFilter::Filter(aBmpEx, BitmapFastScaleFilter(rScaleX, rScaleY));
             else
-            {
-                BitmapScaleSuperFilter filter(rScaleX, rScaleY);
-                bRetval = BitmapFilter::Filter(aBmpEx, filter);
-            }
+                bRetval = BitmapFilter::Filter(aBmpEx, BitmapScaleSuperFilter(rScaleX, rScaleY));
             break;
 
         case BmpScaleFlag::Lanczos:
         case BmpScaleFlag::BestQuality:
-        {
-            vcl::BitmapScaleLanczos3Filter filter(rScaleX, rScaleY);
-            bRetval = BitmapFilter::Filter(aBmpEx, filter);
+            bRetval = BitmapFilter::Filter(aBmpEx, vcl::BitmapScaleLanczos3Filter(rScaleX, rScaleY));
             break;
-        }
+
         case BmpScaleFlag::BiCubic:
-        {
-            vcl::BitmapScaleBicubicFilter filter(rScaleX, rScaleY);
-            bRetval = BitmapFilter::Filter(aBmpEx, filter);
+            bRetval = BitmapFilter::Filter(aBmpEx, vcl::BitmapScaleBicubicFilter(rScaleX, rScaleY));
             break;
-        }
+
         case BmpScaleFlag::BiLinear:
-        {
-            vcl::BitmapScaleBilinearFilter filter(rScaleX, rScaleY);
-            bRetval = BitmapFilter::Filter(aBmpEx, filter);
+            bRetval = BitmapFilter::Filter(aBmpEx, vcl::BitmapScaleBilinearFilter(rScaleX, rScaleY));
             break;
-        }
     }
 
     if (bRetval)
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 6edfeb231e33..ae7e5bcd858d 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -128,8 +128,7 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const Bitmap& rMask ) :
     {
         SAL_WARN( "vcl", "BitmapEx: forced mask to monochrome");
         BitmapEx aMaskEx(maMask);
-        BitmapMonochromeFilter filter(255);
-        BitmapFilter::Filter(aMaskEx, filter);
+        BitmapFilter::Filter(aMaskEx, BitmapMonochromeFilter(255));
         maMask = aMaskEx.GetBitmap();
     }
 
@@ -256,8 +255,7 @@ Bitmap BitmapEx::GetMask() const
         return maMask;
 
     BitmapEx aMaskEx(maMask);
-    BitmapMonochromeFilter filter(255);
-    BitmapFilter::Filter(aMaskEx, filter);
+    BitmapFilter::Filter(aMaskEx, BitmapMonochromeFilter(255));
     return aMaskEx.GetBitmap();
 }
 
diff --git a/vcl/source/graphic/UnoGraphicTransformer.cxx b/vcl/source/graphic/UnoGraphicTransformer.cxx
index b749014ffe44..2fba69d01c93 100644
--- a/vcl/source/graphic/UnoGraphicTransformer.cxx
+++ b/vcl/source/graphic/UnoGraphicTransformer.cxx
@@ -122,8 +122,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::applyDuotone(
     Bitmap      aBitmap( aBitmapEx.GetBitmap() );
 
     BitmapEx    aTmpBmpEx(aBitmap);
-    BitmapDuoToneFilter filter(static_cast<sal_uLong>(nColorOne), static_cast<sal_uLong>(nColorTwo));
-    BitmapFilter::Filter(aTmpBmpEx, filter);
+    BitmapFilter::Filter(aTmpBmpEx, BitmapDuoToneFilter(static_cast<sal_uLong>(nColorOne), static_cast<sal_uLong>(nColorTwo)));
     aBitmap = aTmpBmpEx.GetBitmap();
 
     aReturnGraphic = ::Graphic( BitmapEx( aBitmap, aMask ) );
diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx
index 0cb69d6affb8..049e3bef5d0d 100644
--- a/vcl/source/image/Image.cxx
+++ b/vcl/source/image/Image.cxx
@@ -138,8 +138,7 @@ void Image::Draw(OutputDevice* pOutDev, const Point& rPos, DrawImageFlags nStyle
         if (mpImplData->maBitmapChecksum != aChecksum)
         {
             BitmapEx aDisabledBmpEx(mpImplData->maBitmapEx);
-            BitmapDisabledImageFilter filter;
-            BitmapFilter::Filter(aDisabledBmpEx, filter);
+            BitmapFilter::Filter(aDisabledBmpEx, BitmapDisabledImageFilter());
 
             mpImplData->maBitmapChecksum = aChecksum;
             mpImplData->maDisabledBitmapEx = aDisabledBmpEx;
@@ -162,8 +161,7 @@ void Image::Draw(OutputDevice* pOutDev, const Point& rPos, DrawImageFlags nStyle
                 else
                     aColor = rSettings.GetDeactiveColor();
 
-                BitmapColorizeFilter filter(aColor);
-                BitmapFilter::Filter(aTempBitmapEx, filter);
+                BitmapFilter::Filter(aTempBitmapEx, BitmapColorizeFilter(aColor));
             }
 
             if (nStyle & DrawImageFlags::SemiTransparent)
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index 1ee8d7b513e2..fd1025dec240 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -163,10 +163,7 @@ void loadImageFromStream(std::shared_ptr<SvStream> const & xStream, OUString con
         vcl::bitmap::loadFromSvg(*xStream.get(), rPath, rParameters.mrBitmap, aScalePercentage / 100.0);
 
         if (bConvertToDarkTheme)
-        {
-            BitmapLightenFilter filter;
-            BitmapFilter::Filter(rParameters.mrBitmap, filter);
-        }
+            BitmapFilter::Filter(rParameters.mrBitmap, BitmapLightenFilter());
 
         return;
     }
@@ -178,8 +175,7 @@ void loadImageFromStream(std::shared_ptr<SvStream> const & xStream, OUString con
     if (bConvertToDarkTheme)
     {
         rParameters.mbWriteImageToCache = true; // Cache the dark variant
-        BitmapLightenFilter filter;
-        BitmapFilter::Filter(rParameters.mrBitmap, filter);
+        BitmapFilter::Filter(rParameters.mrBitmap, BitmapLightenFilter());
     }
 
     if (aScalePercentage > 100)
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 5b72fc700b99..ffc1299925d8 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -330,8 +330,7 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
                     // output, having alpha-induced grey levels is not
                     // acceptable.
                     BitmapEx aMaskEx(aBmpEx.GetAlpha().GetBitmap());
-                    BitmapMonochromeFilter filter(129);
-                    BitmapFilter::Filter(aMaskEx, filter);
+                    BitmapFilter::Filter(aMaskEx, BitmapMonochromeFilter(129));
                     aBmpEx = BitmapEx(aColorBmp, aMaskEx.GetBitmap());
                 }
                 else
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 2f4478892a82..9904ecf304d4 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1413,7 +1413,7 @@ std::unique_ptr<SalLayout> OutputDevice::ImplGlyphFallbackLayout( std::unique_pt
         pSalLayout = std::move(pMultiSalLayout);
 
     // restore orig font settings
-    pSalLayout->InitFont(); // NOLINT{bugprone-use-after-move} false+
+    pSalLayout->InitFont();
     rLayoutArgs.maRuns = aLayoutRuns;
 
     return pSalLayout;