[Libreoffice-commits] core.git: 3 commits - svtools/source sw/source

[Julien Nabet]

 svtools/source/config/apearcfg.cxx |    2 +-
 svtools/source/control/ctrlbox.cxx |    2 +-
 sw/source/ui/dochdl/swdtflvr.cxx   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 77b708117c33538ea105e4fbb3d44fe36fcfe5a2
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Mar 21 22:39:47 2013 +0100

    coverity#735364 Logical vs. bitwise operator
    
    Change-Id: I116db00e16a8cb962ee7c98d9bfafb69312c1333

diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index c46932e..53b8bd1 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -542,7 +542,7 @@ sal_uInt16 ImpLineListData::GetStyle( )
 void lclDrawPolygon( OutputDevice& rDev, const basegfx::B2DPolygon& rPolygon, long nWidth, sal_uInt16 nDashing )
 {
     sal_uInt16 nOldAA = rDev.GetAntialiasing();
-    rDev.SetAntialiasing( nOldAA & !ANTIALIASING_ENABLE_B2DDRAW );
+    rDev.SetAntialiasing( nOldAA & ~ANTIALIASING_ENABLE_B2DDRAW );
 
     basegfx::B2DPolyPolygon aPolygons = svtools::ApplyLineDashing( rPolygon, nDashing, rDev.GetMapMode().GetMapUnit() );
     for ( sal_uInt32 i = 0; i < aPolygons.count( ); i++ )
commit 3aef56aa5728667c72c0fc4e0939688353a73383
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Mar 21 22:38:37 2013 +0100

    coverity#704128 Logical vs. bitwise operator
    
    Change-Id: If798ad895cc1472e4885de5d81ba8df626cbd1b1

diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 80c300e..34d9ff4 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -1113,7 +1113,7 @@ int SwTransferable::Paste( SwWrtShell& rSh, TransferableDataHelper& rData )
     {
         if( rData.HasFormat( SOT_FORMAT_RTF ) )
         {
-            nAction = EXCHG_OUT_ACTION_INSERT_STRING | (nAction & !EXCHG_ACTION_MASK);
+            nAction = EXCHG_OUT_ACTION_INSERT_STRING | (nAction & ~EXCHG_ACTION_MASK);
             nFormat = SOT_FORMAT_RTF;
         }
     }
commit 158883a9e90aab786f9af97c15ecad85fea968bd
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Mar 21 22:34:21 2013 +0100

    coverity#704123 Logical vs. bitwise operator
    
    Change-Id: If6afc7eff435460fe4d0da84baf28e3517660364

diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx
index 068430c..1c9d839 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -190,7 +190,7 @@ void SvtTabAppearanceCfg::SetApplicationDefaults ( Application* pApp )
     MouseSettings hMouseSettings = hAppSettings.GetMouseSettings();
     sal_uLong         nMouseOptions  = hMouseSettings.GetOptions();
 
-    nMouseOptions &=  ! (MOUSE_OPTION_AUTOCENTERPOS | MOUSE_OPTION_AUTODEFBTNPOS);
+    nMouseOptions &=  ~ (MOUSE_OPTION_AUTOCENTERPOS | MOUSE_OPTION_AUTODEFBTNPOS);
 
     switch ( nSnapMode )
     {