[Libreoffice-commits] .: 2 commits - editeng/source

[Kohei Yoshida]

 editeng/source/items/justifyitem.cxx |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 4b714ed4b8f7c0e9cabf59619221cba6f1156fd0
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Jan 18 16:04:19 2011 -0500

    No need to check for a failed condition since the value has an init value.

diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx
index 13277c8..e6dc9db 100644
--- a/editeng/source/items/justifyitem.cxx
+++ b/editeng/source/items/justifyitem.cxx
@@ -317,10 +317,7 @@ bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
         default:
             {
                 sal_Int32 eUno = table::CellVertJustify2::STANDARD;
-                if(!(rVal >>= eUno))
-                {
-                    eUno = table::CellVertJustify2::STANDARD;
-                }
+                rVal >>= eUno;
 
                 SvxCellVerJustify eSvx = SVX_VER_JUSTIFY_STANDARD;
                 switch (eUno)
commit 3004857170349792faa5fc9798a07a87e091d072
Author: Christian Lohmaier <lohmaier+libreoffice at googlemail.com>
Date:   Tue Jan 18 16:02:30 2011 -0500

    WaE patch for editeng.

diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx
index 31907ec..13277c8 100644
--- a/editeng/source/items/justifyitem.cxx
+++ b/editeng/source/items/justifyitem.cxx
@@ -316,7 +316,7 @@ bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
             }
         default:
             {
-                sal_Int32 eUno;
+                sal_Int32 eUno = table::CellVertJustify2::STANDARD;
                 if(!(rVal >>= eUno))
                 {
                     eUno = table::CellVertJustify2::STANDARD;