[Libreoffice-commits] .: sw/source

[Michael Meeks]

 sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx |   59 ++++++++++-------------
 1 file changed, 27 insertions(+), 32 deletions(-)

New commits:
commit 3b59ee9402bd0d32cd1036c90ecf457df06b28e8
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date:   Sat Jun 30 22:36:59 2012 +0200

    replaced switch with if/else because of only one case
    
    Change-Id: I23182e5754b5af63932cc696febeb03c8d0b977d

diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
index a208290..d796415 100644
--- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
+++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
@@ -74,16 +74,14 @@ bool SwFmtWrapInfluenceOnObjPos::QueryValue( Any& rVal, sal_uInt8 nMemberId ) co
 {
     nMemberId &= ~CONVERT_TWIPS;
     bool bRet = true;
-    switch ( nMemberId )
+    if( nMemberId == MID_WRAP_INFLUENCE )
     {
-        case MID_WRAP_INFLUENCE:
-            {
-                rVal <<= GetWrapInfluenceOnObjPos();
-            }
-            break;
-        default:
-            OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
-            bRet = false;
+        rVal <<= GetWrapInfluenceOnObjPos();
+    }
+    else
+    {
+        OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
+        bRet = false;
     }
     return bRet;
 }
@@ -91,31 +89,28 @@ bool SwFmtWrapInfluenceOnObjPos::QueryValue( Any& rVal, sal_uInt8 nMemberId ) co
 bool SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
-    bool bRet = true;
+    bool bRet = false;
 
-    switch ( nMemberId )
+    if( nMemberId == MID_WRAP_INFLUENCE )
+    {
+        sal_Int16 nNewWrapInfluence = 0;
+        rVal >>= nNewWrapInfluence;
+        // #i35017# - constant names have changed and <ITERATIVE> has been added
+        if ( nNewWrapInfluence == text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE ||
+             nNewWrapInfluence == text::WrapInfluenceOnPosition::ONCE_CONCURRENT ||
+             nNewWrapInfluence == text::WrapInfluenceOnPosition::ITERATIVE )
+        {
+            SetWrapInfluenceOnObjPos( nNewWrapInfluence );
+            bRet = true;
+        }
+        else
+        {
+            OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::PutValue(..)> - invalid attribute value" );
+        }
+    }
+    else
     {
-        case MID_WRAP_INFLUENCE:
-            {
-                sal_Int16 nNewWrapInfluence = 0;
-                rVal >>= nNewWrapInfluence;
-                // #i35017# - constant names have changed and <ITERATIVE> has been added
-                if ( nNewWrapInfluence == text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE ||
-                     nNewWrapInfluence == text::WrapInfluenceOnPosition::ONCE_CONCURRENT ||
-                     nNewWrapInfluence == text::WrapInfluenceOnPosition::ITERATIVE )
-                {
-                    SetWrapInfluenceOnObjPos( nNewWrapInfluence );
-                }
-                else
-                {
-                    OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::PutValue(..)> - invalid attribute value" );
-                    bRet = false;
-                }
-            }
-            break;
-        default:
-            OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::PutValue(..)> - unknown MemberId" );
-            bRet = false;
+        OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::PutValue(..)> - unknown MemberId" );
     }
     return bRet;
 }