[Libreoffice-commits] .: Branch 'libreoffice-3-3-1' - editeng/source

[Petr Mladek]

 editeng/source/items/frmitems.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8e79917efdcffd70b9bc6b66ea10f811980e44cf
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue Feb 15 11:05:57 2011 +0100

    fdo#34226: Fixed BorderLine(2) convertion to SvxBorderLine
    
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 9fc36a7..ce0f053 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -2012,16 +2012,16 @@ template<typename Item>
 bool
 lcl_setLine(const uno::Any& rAny, Item& rItem, USHORT nLine, const bool bConvert)
 {
-    bool bSet(false);
+    bool bDone = false;
     table::BorderLine2 aBorderLine;
     if (lcl_extractBorderLine(rAny, aBorderLine))
     {
         SvxBorderLine aLine;
-        bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
-        if (bSet)
-            rItem.SetLine(&aLine, nLine);
+        bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
+        rItem.SetLine( bSet ? &aLine : NULL, nLine);
+        bDone = true;
     }
-    return bSet;
+    return bDone;
 }
 
 }