vcl/source/gdi/impimage.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 6c6f78c6567db73aa85de4beb461db2cddac7b2a Author: Julien Nabet <serval2...@yahoo.fr> Date: Sat Apr 12 17:40:41 2014 +0200 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 diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index 2d054ab7..c8f4a72 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() ); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits