summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorAdrien Ollier <adr.ollier@hotmail.fr>2020-01-22 08:13:40 +0100
committerMike Kaganski <mike.kaganski@collabora.com>2020-01-24 10:01:31 +0100
commit70457e664cc12958f1938f0154b9c085525f4c26 (patch)
treeb85bb1cd8d267b9296851a59dcbc9d2a9460bfff /vcl
parent6b4fe3e44b4daa89fef6a3385919b00472eaed60 (diff)
Rewrite of ImplAnimView::matches using a boolean expression
Change-Id: Id9a38229fa2906eea4c8e9cb7ea6529f3b126ba4 Signed-off-by: Adrien Ollier <adr.ollier@hotmail.fr> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87172 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/impanmvw.cxx14
1 files changed, 2 insertions, 12 deletions
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 )