[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-2' - sc/source

[Kohei Yoshida]

 sc/source/filter/excel/xestyle.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a09cedbcea86e0af0db1ced6df6cf95ab5ba946b
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Thu Feb 20 11:27:32 2014 -0500

    fdo#75130: Export cell borders to xls and xlsx correctly.
    
    Change-Id: Ic629fb4852d2ada9724dfee7618e2436c0fa28a8
    (cherry picked from commit 1c1f42fdbad774cae7c45a7f8d60b9af766dee0a)
    Reviewed-on: https://gerrit.libreoffice.org/8147
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-on: https://gerrit.libreoffice.org/8152
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 59603eb..f3ce557 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1570,18 +1570,18 @@ void lclGetBorderLine(
             switch (pLine->GetBorderLineStyle())
             {
                 case table::BorderLineStyle::DASHED:
+                case table::BorderLineStyle::FINE_DASHED:
                     rnXclLine = EXC_LINE_DASHED;
                     break;
                 case table::BorderLineStyle::DOTTED:
                     rnXclLine = EXC_LINE_DOTTED;
                     break;
-                case table::BorderLineStyle::FINE_DASHED:
-                    rnXclLine = EXC_LINE_HAIR;
-                    break;
                 default:
                     break;
             }
         }
+        else if (nOuterWidth >= EXC_BORDER_HAIR)
+            rnXclLine = EXC_LINE_HAIR;
         else
             rnXclLine = EXC_LINE_NONE;
     }
@@ -1726,7 +1726,7 @@ static const char* ToLineStyle( sal_uInt8 nLineStyle )
         case EXC_LINE_HAIR:     return "hair";
         case EXC_LINE_DOTTED:     return "dotted";
         case EXC_LINE_DASHED:     return "dashed";
-        case EXC_LINE_MEDIUMDASHED:     return "mediumdashed";
+        case EXC_LINE_MEDIUMDASHED: return "mediumDashed";
     }
     return "*unknown*";
 }