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

[Stephan Bergmann]

 sw/source/core/attr/format.cxx   |   10 +++++-----
 sw/source/core/attr/swatrset.cxx |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 47862e75de51a4ac7476acff773b504fdc0d6e76
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Mar 28 15:38:05 2014 +0100

    loplugin:implicitboolconversion,literaltoboolconversion
    
    Change-Id: I28d228c0992660ca181a4c420736600ee79b3ea5

diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index febe242..2c5c01a 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -463,7 +463,7 @@ bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
 
         if(IsModifyLocked())
         {
-            if( 0 != ( bRet = (0 != aSet.Put( aTempSet ))) )
+            if( ( bRet = aSet.Put( aTempSet ) ) )
             {
                 aSet.SetModifyAtAttr( this );
             }
@@ -472,7 +472,7 @@ bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
         {
             SwAttrSet aOld(*aSet.GetPool(), aSet.GetRanges()), aNew(*aSet.GetPool(), aSet.GetRanges());
 
-            bRet = 0 != aSet.Put_BC(aTempSet, &aOld, &aNew);
+            bRet = aSet.Put_BC(aTempSet, &aOld, &aNew);
 
             if(bRet)
             {
@@ -543,7 +543,7 @@ bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
     {
         const SfxPoolItem* pSource = 0;
 
-        if(SFX_ITEM_SET == rSet.GetItemState(RES_BACKGROUND, sal_False, &pSource))
+        if(SFX_ITEM_SET == rSet.GetItemState(RES_BACKGROUND, false, &pSource))
         {
             //UUUU FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
             OSL_ENSURE(false, "Do no longer use SvxBrushItem, instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST] FillAttributes (simple fallback is in place and used)");
@@ -557,7 +557,7 @@ bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
 
             if(IsModifyLocked())
             {
-                if( 0 != ( bRet = (0 != aSet.Put( aTempSet ))) )
+                if( ( bRet = aSet.Put( aTempSet ) ) )
                 {
                     aSet.SetModifyAtAttr( this );
                 }
@@ -566,7 +566,7 @@ bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
             {
                 SwAttrSet aOld(*aSet.GetPool(), aSet.GetRanges()), aNew(*aSet.GetPool(), aSet.GetRanges());
 
-                bRet = 0 != aSet.Put_BC(aTempSet, &aOld, &aNew);
+                bRet = aSet.Put_BC(aTempSet, &aOld, &aNew);
 
                 if(bRet)
                 {
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index d0420d0..fbda6e1 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -101,7 +101,7 @@ void SwAttrPool::createAndAddSecondaryPools()
         pSdrPool->SetPoolDefaultItem(SdrShadowYDistItem((300 * 72) / 127));
     }
 
-    SfxItemPool *pEEgPool = EditEngine::CreatePool(sal_False);
+    SfxItemPool *pEEgPool = EditEngine::CreatePool(false);
 
     pSdrPool->SetSecondaryPool(pEEgPool);