diff options
author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-02-15 11:05:57 +0100 |
---|---|---|
committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-02-15 11:07:07 +0100 |
commit | 4da3c4b2874fba5451d391a13e8443d451712bbe (patch) | |
tree | 34e2ed0556eb7d1d9e8b35dd59fbb45f1a46e81b | |
parent | efb522f0fcef1e513670ecaa4b0fe3cc26efc9df (diff) |
fdo#34226: Fixed BorderLine(2) convertion to SvxBorderLine
-rw-r--r-- | editeng/source/items/frmitems.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 8faf443de2..f42c925dee 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; } } |