[Libreoffice-commits] .: editeng/source

[Cédric Bosdonnat]

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

New commits:
commit 4da3c4b2874fba5451d391a13e8443d451712bbe
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

diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 8faf443..f42c925 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1989,16 +1989,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;
 }
 
 }