[PATCH] coverity#704334/704335/704336 Logically dead code

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3045

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/3045/1

coverity#704334/704335/704336 Logically dead code

Change-Id: Ieaa3c8ed735692a16c40ff01ea1dec52c2a29f31
---
M svx/source/svdraw/svdoashp.cxx
1 file changed, 4 insertions(+), 4 deletions(-)



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 @@
                 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);
                 }
             }
         }

-- 
To view, visit https://gerrit.libreoffice.org/3045
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieaa3c8ed735692a16c40ff01ea1dec52c2a29f31
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet <serval2...@yahoo.fr>

_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice