diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-10-06 23:50:39 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-10-06 23:50:39 +0200 |
| commit | d18feffd49f4481626417daac7984b2a7e70c3bf (patch) | |
| tree | 4a9ea631acf741900fba19c75dddc7cbec5e98c7 /sw/source/filter/html/svxcss1.cxx | |
| parent | 2849318bb617f38451e0e55a8768444f8f5f6e63 (diff) | |
fate#307731, fate#307730: Dotted and dashed border types
Diffstat (limited to 'sw/source/filter/html/svxcss1.cxx')
| -rw-r--r-- | sw/source/filter/html/svxcss1.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index fc7efdd8da1c..c6f3361381db 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -183,13 +183,13 @@ static CSS1PropertyEnum __READONLY_DATA aBorderWidthTable[] = { 0, 0 } }; -enum CSS1BorderStyle { CSS1_BS_NONE, CSS1_BS_SINGLE, CSS1_BS_DOUBLE }; +enum CSS1BorderStyle { CSS1_BS_NONE, CSS1_BS_SINGLE, CSS1_BS_DOUBLE, CSS1_BS_DOTTED, CSS1_BS_DASHED }; static CSS1PropertyEnum __READONLY_DATA aBorderStyleTable[] = { { sCSS1_PV_none, CSS1_BS_NONE }, - { sCSS1_PV_dotted, CSS1_BS_SINGLE }, - { sCSS1_PV_dashed, CSS1_BS_SINGLE }, + { sCSS1_PV_dotted, CSS1_BS_DOTTED }, + { sCSS1_PV_dashed, CSS1_BS_DASHED }, { sCSS1_PV_solid, CSS1_BS_SINGLE }, { sCSS1_PV_double, CSS1_BS_DOUBLE }, { sCSS1_PV_groove, CSS1_BS_SINGLE }, @@ -367,6 +367,12 @@ void SvxCSS1BorderInfo::SetBorderLine( USHORT nLine, SvxBoxItem &rBoxItem ) cons // Linien-Stil doppelt oder einfach? BOOL bDouble = eStyle == CSS1_BS_DOUBLE; + if ( eStyle == CSS1_BS_DOTTED ) + aBorderLine.SetStyle( DOTTED ); + else if ( eStyle == CSS1_BS_DASHED ) + aBorderLine.SetStyle( DASHED ); + else + aBorderLine.SetStyle( SOLID ); // benannte Breite umrechnenen, wenn keine absolute gegeben ist if( nAbsWidth==USHRT_MAX ) |