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 | 7b97b4b68cd075069f9736578df8578552589491 (patch) | |
| tree | 30591beeaf83bc00bc5c6620d7d2d03638443ca1 /editeng | |
| parent | crashing oosplash and malformed picture (bnc#652562) (diff) | |
| download | core-7b97b4b68cd075069f9736578df8578552589491.tar.gz core-7b97b4b68cd075069f9736578df8578552589491.zip | |
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>
Diffstat (limited to 'editeng')
| -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 209b525bd007..bc8c1a2b8930 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; } } |