summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-02-20 11:27:32 -0500
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2014-02-25 16:57:55 -0600
commita09cedbcea86e0af0db1ced6df6cf95ab5ba946b (patch)
tree6aef989fd6337d4732d91cf2634540a8f9389f2a
parentfee514a03f623cf6383ffc04c87775e6269d1d9e (diff)
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@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-on: https://gerrit.libreoffice.org/8152 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--sc/source/filter/excel/xestyle.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 59603ebb9a93..f3ce557c42b7 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*";
}