[Libreoffice-commits] core.git: vcl/source

[Adrien Ollier (via logerrit)]

 vcl/source/gdi/impanmvw.cxx |   14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

New commits:
commit 70457e664cc12958f1938f0154b9c085525f4c26
Author:     Adrien Ollier <adr.ollier at hotmail.fr>
AuthorDate: Wed Jan 22 08:13:40 2020 +0100
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Fri Jan 24 10:01:31 2020 +0100

    Rewrite of ImplAnimView::matches using a boolean expression
    
    Change-Id: Id9a38229fa2906eea4c8e9cb7ea6529f3b126ba4
    Signed-off-by: Adrien Ollier <adr.ollier at hotmail.fr>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87172
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx
index 7818a3dcc0ed..b27a7cc70581 100644
--- a/vcl/source/gdi/impanmvw.cxx
+++ b/vcl/source/gdi/impanmvw.cxx
@@ -96,19 +96,9 @@ ImplAnimView::~ImplAnimView()
     Animation::ImplDecAnimCount();
 }
 
-bool ImplAnimView::matches( OutputDevice* pOut, long nExtraData ) const
+bool ImplAnimView::matches(OutputDevice* pOut, long nExtraData) const
 {
-    bool bRet = false;
-
-    if( nExtraData )
-    {
-        if( ( mnExtraData == nExtraData ) && ( !pOut || ( pOut == mpRenderContext ) ) )
-            bRet = true;
-    }
-    else if( !pOut || ( pOut == mpRenderContext ) )
-        bRet = true;
-
-    return bRet;
+    return (!pOut || pOut == mpRenderContext) && (nExtraData == 0 || nExtraData == mnExtraData);
 }
 
 void ImplAnimView::getPosSize( const AnimationBitmap& rAnimationBitmap, Point& rPosPix, Size& rSizePix )