summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2013-03-25 23:02:47 +0100
committerPetr Mladek <pmladek@suse.cz>2013-03-27 17:10:03 +0000
commite9ecc029d6ec8f48bd901959e64a872c355dc217 (patch)
treeaf3aadacb517f6b6fb1de917595471046ae81e2a /svx
parent23c22d3da5349ba1242edaeecfa0cba97a92ac71 (diff)
coverity#704334/704335/704336 Logically dead code
Change-Id: Ieaa3c8ed735692a16c40ff01ea1dec52c2a29f31 Reviewed-on: https://gerrit.libreoffice.org/3045 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdoashp.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 170c4e27289f..c2a69891eeaf 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);
}
}
}