Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


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 <serval2412@yahoo.fr>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.