summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2014-04-12 17:40:41 +0200
committerJulien Nabet <serval2412@yahoo.fr>2014-04-12 17:42:49 +0200
commit6c6f78c6567db73aa85de4beb461db2cddac7b2a (patch)
treec4e9624e157391476dfcd956d4cc4c52007ce382
parent2df53ef5002270bfe788e383e95002f636a242d9 (diff)
cppcheck: multiCondition
2 "else if" with same condition, one of them is wrong and it seems here the first one. More details here: http://nabble.documentfoundation.org/Cppcheck-reports-else-if-condition-matches-previous-condition-vcl-td4104270.html Change-Id: I818cfa879a41c5818c429acc1645b1ee1f8b5103
-rw-r--r--vcl/source/gdi/impimage.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx
index 2d054ab75c76..c8f4a720904e 100644
--- a/vcl/source/gdi/impimage.cxx
+++ b/vcl/source/gdi/impimage.cxx
@@ -297,7 +297,7 @@ void ImplImageBmp::Draw( sal_uInt16 nPos, OutputDevice* pOutDev,
{
if( aTmpBmpEx.IsAlpha() )
aTmpBmpEx = BitmapEx( aTmpBmp, aTmpBmpEx.GetAlpha() );
- else if( aTmpBmpEx.IsAlpha() )
+ else if( aTmpBmpEx.IsTransparent() )
aTmpBmpEx = BitmapEx( aTmpBmp, aTmpBmpEx.GetMask() );
}