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

[Tor Lillqvist]

 svx/source/sdr/properties/customshapeproperties.cxx |    2 +-
 svx/source/svdraw/svdoashp.cxx                      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 23eccddfc37ebbf21c3001680782f1db4628d83d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Mar 23 08:20:25 2014 +0200

    WaE: implicit conversion from bool to 'int' [loplugin:implicitboolconversion]
    
    Change-Id: I7116fda40f6bc4c86b9eb5273774e928d018f64c

diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx
index 729709e..487c8f1 100644
--- a/svx/source/sdr/properties/customshapeproperties.cxx
+++ b/svx/source/sdr/properties/customshapeproperties.cxx
@@ -39,7 +39,7 @@ namespace sdr
 
             // change TextFrame flag when bResizeShapeToFitText changes (which is mapped
             // on the item SDRATTR_TEXT_AUTOGROWHEIGHT for custom shapes, argh)
-            rObj.bTextFrame = 0 != static_cast< const SdrTextAutoGrowHeightItem& >(GetObjectItemSet().Get(SDRATTR_TEXT_AUTOGROWHEIGHT)).GetValue();
+            rObj.bTextFrame = static_cast< const SdrTextAutoGrowHeightItem& >(GetObjectItemSet().Get(SDRATTR_TEXT_AUTOGROWHEIGHT)).GetValue();
 
             // check if it did change
             if(rObj.bTextFrame != bOld)
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index b86e76c..89d207a 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1450,7 +1450,7 @@ void SdrObjCustomShape::AdaptTextMinSize()
 {
     if(!pModel || !pModel->IsPasteResize())
     {
-        const bool bResizeShapeToFitText(0 != static_cast< const SdrTextAutoGrowHeightItem& >(GetObjectItem(SDRATTR_TEXT_AUTOGROWHEIGHT)).GetValue());
+        const bool bResizeShapeToFitText(static_cast< const SdrTextAutoGrowHeightItem& >(GetObjectItem(SDRATTR_TEXT_AUTOGROWHEIGHT)).GetValue());
         SfxItemSet aSet(
             *GetObjectItemSet().GetPool(),
             SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT,