diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-02-15 11:05:57 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-02-15 14:34:48 +0100 |
| commit | 27119e72dd2ee8125492957aebaa18521327c587 (patch) | |
| tree | b2a8c06dcfb29534184fba4f5e12490c6706f06b | |
| parent | 15fd374b68552cab7bf0c9fac581bb03d52e5f5b (diff) | |
fdo#34226: Fixed BorderLine(2) convertion to SvxBorderLine
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
Signed-off-by: Caolán McNamara <caolanm@redhat.com>
Signed-off-by: David Tardon <dtardon@redhat.com>
| -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 9fc36a73d2..ce0f053e96 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; } } |