svx/source/svdraw/svdoashp.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
New commits: commit e9ecc029d6ec8f48bd901959e64a872c355dc217 Author: Julien Nabet <serval2...@yahoo.fr> Date: Mon Mar 25 23:02:47 2013 +0100 coverity#704334/704335/704336 Logically dead code Change-Id: Ieaa3c8ed735692a16c40ff01ea1dec52c2a29f31 Reviewed-on: https://gerrit.libreoffice.org/3045 Reviewed-by: Petr Mladek <pmla...@suse.cz> Tested-by: Petr Mladek <pmla...@suse.cz> diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 170c4e2..c2a6989 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -247,22 +247,22 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS if(!bSolidFillUsed && XFILL_SOLID == eFillStyle) { bSolidFillUsed = sal_True; - bAllFillUsed = (bSolidFillUsed || bGradientFillUsed || bHatchFillUsed || bBitmapFillUsed); + bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed); } if(!bGradientFillUsed && XFILL_GRADIENT == eFillStyle) { bGradientFillUsed = sal_True; - bAllFillUsed = (bSolidFillUsed || bGradientFillUsed || bHatchFillUsed || bBitmapFillUsed); + bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed); } if(!bHatchFillUsed && XFILL_HATCH == eFillStyle) { bHatchFillUsed = sal_True; - bAllFillUsed = (bSolidFillUsed || bGradientFillUsed || bHatchFillUsed || bBitmapFillUsed); + bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed); } if(!bBitmapFillUsed && XFILL_BITMAP == eFillStyle) { bBitmapFillUsed = sal_True; - bAllFillUsed = (bSolidFillUsed || bGradientFillUsed || bHatchFillUsed || bBitmapFillUsed); + bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed); } } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits