sw/source/filter/ww8/docxattributeoutput.cxx | 7 +++++++
sw/source/filter/ww8/ww8atr.cxx | 1 +
2 files changed, 8 insertions(+)
New commits:
commit d55615f6c5f8adcb7157358a95329ceb1f9f7685
Author: Justin Luth <justin_l...@sil.org>
AuthorDate: Wed Sep 26 14:54:14 2018 +0300
Commit: Justin Luth <justin_l...@sil.org>
CommitDate: Wed Sep 26 21:19:48 2018 +0200
tdf#119037 doc/x export: new borderlines
"new" borderlines (from 2012, 2014) defined in
offapi/com/sun/star/table/BorderLineStyle.idl
were not supported in export yet!!! Sad.
const short FINE_DASHED = 14; (rtf)
const short DOUBLE_THIN = 15; (rtf/doc/docx)
const short DASH_DOT = 16; (rtf/docx)
const short DASH_DOT_DOT = 17; (rtf/docx)
Change-Id: I085bb4c70e53241fb59a4a3c97d7741cef841412
Reviewed-on: https://gerrit.libreoffice.org/60991
Reviewed-by: Justin Luth <justin_l...@sil.org>
Tested-by: Justin Luth <justin_l...@sil.org>
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 37d8e972a42c..b3e4df7a5f1a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2932,6 +2932,7 @@ static void impl_borderLine( FSHelperPtr const &
pSerializer, sal_Int32 elementT
pVal = "dashed";
break;
case SvxBorderLineStyle::DOUBLE:
+ case SvxBorderLineStyle::DOUBLE_THIN:
pVal = "double";
break;
case SvxBorderLineStyle::THINTHICK_SMALLGAP:
@@ -2967,6 +2968,12 @@ static void impl_borderLine( FSHelperPtr const &
pSerializer, sal_Int32 elementT
case SvxBorderLineStyle::FINE_DASHED:
pVal = "dashSmallGap";
break;
+ case SvxBorderLineStyle::DASH_DOT:
+ pVal = "dotDash";
+ break;
+ case SvxBorderLineStyle::DASH_DOT_DOT:
+ pVal = "dotDotDash";
+ break;
case SvxBorderLineStyle::NONE:
default:
break;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index c331ab261f9d..393bae52f49f 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -4250,6 +4250,7 @@ WW8_BRCVer9 WW8Export::TranslateBorderLine(const
SvxBorderLine& rLine,
brcType = 7;
break;
case SvxBorderLineStyle::DOUBLE:
+ case SvxBorderLineStyle::DOUBLE_THIN:
brcType = 3;
break;
case SvxBorderLineStyle::THINTHICK_SMALLGAP:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
