diff options
| author | Luke Deller <luke@deller.id.au> | 2014-03-28 22:51:36 +1100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-31 15:29:25 +0000 |
| commit | fe3dff30205d4b6b276e3687edda48c19de1547f (patch) | |
| tree | 249e8cec3aa36d1a23d3662bb16765e710e0e1d0 | |
| parent | 2498e4725e4a8c3a8193e61618d314837d8db180 (diff) | |
.doc support for recently-added border line types
Some new border line types have been added recently to LibreOffice
(FINE_DASHED, DASH_DOT, DASH_DOT_DOT)
This change updates .doc import/export to support these.
(Import of FINE_DASHED was already working, but not export).
Change-Id: Id3bcb1d4e6e9ceb97b492f0c578fd5b885ab16ff
Reviewed-on: https://gerrit.libreoffice.org/8780
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | editeng/source/items/borderline.cxx | 10 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 9 |
2 files changed, 17 insertions, 2 deletions
diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index 3280988a9c7b..1edc7d129106 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -119,8 +119,6 @@ ConvertBorderStyleFromWord(int const nWordLineStyle) case 2: // thick line case 5: // hairline // and the unsupported special cases which we map to a single line - case 8: - case 9: case 20: return SOLID; case 6: @@ -129,6 +127,10 @@ ConvertBorderStyleFromWord(int const nWordLineStyle) return DASHED; case 22: return FINE_DASHED; + case 8: + return DASH_DOT; + case 9: + return DASH_DOT_DOT; // then the shading beams which we represent by a double line case 23: return DOUBLE; @@ -199,6 +201,8 @@ ConvertBorderWidthFromWord(SvxBorderStyle const eStyle, double const i_fWidth, case DOTTED: case DASHED: + case DASH_DOT: + case DASH_DOT_DOT: return fWidth; // Display a minimum effective border width of 1pt @@ -249,6 +253,8 @@ ConvertBorderWidthToWord(SvxBorderStyle const eStyle, double const fWidth) case DOTTED: case DASHED: case FINE_DASHED: + case DASH_DOT: + case DASH_DOT_DOT: return fWidth; // Double lines diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index bf92692f64dc..5fd495bca1e7 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -4266,6 +4266,15 @@ WW8_BRCVer9 WW8Export::TranslateBorderLine(const SvxBorderLine& rLine, case table::BorderLineStyle::INSET: brcType = 27; break; + case table::BorderLineStyle::FINE_DASHED: + brcType = 22; + break; + case table::BorderLineStyle::DASH_DOT: + brcType = 8; + break; + case table::BorderLineStyle::DASH_DOT_DOT: + brcType = 9; + break; default: break; } |