From 9f8882b4795d21430f6af97e76a352effdbdb78e Mon Sep 17 00:00:00 2001
From: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Tue, 15 Feb 2011 11:05:57 +0100
Subject: fdo#34226: Fixed BorderLine(2) convertion to SvxBorderLine

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

(limited to 'editeng')

diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index d8a755f28a87..294bef897bd6 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;
 }
 
 }
-- 
cgit