summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedricbosdo@openoffice.org>2011-02-15 11:05:57 +0100
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2011-02-15 11:07:07 +0100
commit9f8882b4795d21430f6af97e76a352effdbdb78e (patch)
tree191f686418f5f708ee61725a27fb817a0ce24291 /editeng
parent38ac913facdec2a71462604eb71ca8c88efee43e (diff)
fdo#34226: Fixed BorderLine(2) convertion to SvxBorderLine
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/items/frmitems.cxx10
1 files changed, 5 insertions, 5 deletions
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;
}
}