[Libreoffice-commits] core.git: editeng/source sw/source

[Luke Deller]

 editeng/source/items/borderline.cxx |   10 ++++++++--
 sw/source/filter/ww8/ww8atr.cxx     |    9 +++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit fe3dff30205d4b6b276e3687edda48c19de1547f
Author: Luke Deller <luke at deller.id.au>
Date:   Fri Mar 28 22:51:36 2014 +1100

    .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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx
index 3280988..1edc7d1 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 bf92692..5fd495b 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;
                 }