From 51216852e0431d679d2bcfb428f2a2dd32fda3b0 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Thu, 1 Mar 2012 10:22:17 +0200
Subject: WaE: use of logical '||' with constant operand

Until now the code has by accident added a property with the attribute
MAYBEVOID (which is that one which has the value 1), while the
intention obviously was to use BOUND|REMOVABLE. Whether this has
caused unintended consequences, or been harmless, and whether this fix
now then will cause unintended consequences, no idea.
---
 sw/source/filter/ww8/ww8par3.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sw')

diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 59345249abee..3ac1645b39ba 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2466,7 +2466,7 @@ static void lcl_AddToPropertyContainer
         uno::Any aAny(C2U(""));
         xPropContainer->addProperty
             (rPropertyName,
-             static_cast<sal_Int16>(beans::PropertyAttribute::BOUND ||
+             static_cast<sal_Int16>(beans::PropertyAttribute::BOUND |
                                     beans::PropertyAttribute::REMOVABLE),
              aAny);
     }
-- 
cgit