summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedricbosdo@openoffice.org>2011-02-15 11:05:57 +0100
committerPetr Mladek <pmladek@suse.cz>2011-02-15 14:37:01 +0100
commit8e79917efdcffd70b9bc6b66ea10f811980e44cf (patch)
tree86c3133ede4e57095c753fc321b055862948d86f
parentee4d096d9b9164b27153b25f0293f88363d27a1a (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.cxx10
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;
}
}