diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-11-08 15:06:15 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-19 17:57:16 +0100 |
| commit | 7c2f0268d77d3cbe4868afe80ba2164687352341 (patch) | |
| tree | ac41720e3ae4305bc972bd4c8702c9ff40ca1c4c /editeng/source/rtf | |
| parent | 83e1130832dfb5a55b3e8e1cc17bb49dd60a865f (diff) | |
SvxBorderLine: changed the widths definition
Diffstat (limited to 'editeng/source/rtf')
| -rw-r--r-- | editeng/source/rtf/rtfitem.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index 6798b0f8d6d2..5b4fcad5b923 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -1410,7 +1410,7 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet, if( SFX_ITEM_SET == rSet.GetItemState( PARDID->nBox, sal_False, &pItem ) ) aAttr = *(SvxBoxItem*)pItem; - SvxBorderLine aBrd( 0, DEF_LINE_WIDTH_0, 0, 0 ); // simple lines + SvxBorderLine aBrd( 0, DEF_LINE_WIDTH_0 ); // simple lines int bWeiter = sal_True, nBorderTyp = 0; do { @@ -1484,8 +1484,9 @@ SETBORDER: } break; -case RTF_BRDRBTW: -case RTF_BRDRBAR: break; + case RTF_BRDRBTW: + case RTF_BRDRBAR: + break; case RTF_BRDRCF: @@ -1499,13 +1500,13 @@ case RTF_BRDRBAR: break; aBrd.SetOutWidth( DEF_LINE_WIDTH_1 ); aBrd.SetInWidth( 0 ); aBrd.SetDistance( 0 ); - goto SETBORDERLINE; + SetBorderLine( nBorderTyp, aAttr, aBrd ); case RTF_BRDRDB: aBrd.SetOutWidth( DEF_DOUBLE_LINE0_OUT ); aBrd.SetInWidth( DEF_DOUBLE_LINE0_IN ); aBrd.SetDistance( DEF_DOUBLE_LINE0_DIST ); - goto SETBORDERLINE; + SetBorderLine( nBorderTyp, aAttr, aBrd ); case RTF_BRDRSH: // shaded box @@ -1564,18 +1565,19 @@ case RTF_BRDRBAR: break; aBrd.SetOutWidth( DEF_LINE_WIDTH_4 ); } } - goto SETBORDERLINE; + SetBorderLine( nBorderTyp, aAttr, aBrd ); case RTF_BRDRDOT: aBrd.SetStyle( DOTTED ); + SetBorderLine( nBorderTyp, aAttr, aBrd ); break; case RTF_BRDRDASH: aBrd.SetStyle( DASHED ); + SetBorderLine( nBorderTyp, aAttr, aBrd ); break; case RTF_BRDRS: case RTF_BRDRHAIR: aBrd.SetStyle( SOLID ); -SETBORDERLINE: SetBorderLine( nBorderTyp, aAttr, aBrd ); break; |