diff options
| author | Justin Luth <justin_luth@sil.org> | 2018-09-26 15:08:33 +0300 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2018-09-27 06:21:53 +0200 |
| commit | 32ffb7b875ee229744f0b880a32817e948ff10a4 (patch) | |
| tree | 45e0aae731bbcf3a47d7b1a76e347b38d9ed1815 | |
| parent | d077b30dba618daace0373e9b7e7fe84f982c6aa (diff) | |
tdf#119037 rtf (im/ex)port: new borderlines
"new" borderlines (from 2012, 2014) defined in
offapi/com/sun/star/table/BorderLineStyle.idl
where no 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: I07fee08e17171db4baec489864fc47da107cee75
Reviewed-on: https://gerrit.libreoffice.org/60992
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
| -rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 10 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfcontrolwords.cxx | 4 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfcontrolwords.hxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdispatchflag.cxx | 9 |
4 files changed, 20 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 49482a7a8c1f..c4e5e4f28498 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -120,6 +120,7 @@ static OString OutTBLBorderLine(RtfExport const& rExport, const editeng::SvxBord aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRDASH); break; case SvxBorderLineStyle::DOUBLE: + case SvxBorderLineStyle::DOUBLE_THIN: aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRDB); break; case SvxBorderLineStyle::THINTHICK_SMALLGAP: @@ -152,6 +153,15 @@ static OString OutTBLBorderLine(RtfExport const& rExport, const editeng::SvxBord case SvxBorderLineStyle::INSET: aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRINSET); break; + case SvxBorderLineStyle::FINE_DASHED: + aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRDASHSM); + break; + case SvxBorderLineStyle::DASH_DOT: + aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRDASHD); + break; + case SvxBorderLineStyle::DASH_DOT_DOT: + aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRDASHDD); + break; case SvxBorderLineStyle::NONE: default: aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRNONE); diff --git a/writerfilter/source/rtftok/rtfcontrolwords.cxx b/writerfilter/source/rtftok/rtfcontrolwords.cxx index f1c39391fc6e..b49f356d4b0f 100644 --- a/writerfilter/source/rtftok/rtfcontrolwords.cxx +++ b/writerfilter/source/rtftok/rtfcontrolwords.cxx @@ -158,8 +158,6 @@ RTFSymbol aRTFControlWords[] = { { "brdrdash", CONTROL_FLAG, RTF_BRDRDASH, 0 }, { "brdrdashd", CONTROL_FLAG, RTF_BRDRDASHD, 0 }, { "brdrdashdd", CONTROL_FLAG, RTF_BRDRDASHDD, 0 }, - { "brdrdashdot", CONTROL_FLAG, RTF_BRDRDASHDOT, 0 }, - { "brdrdashdotdot", CONTROL_FLAG, RTF_BRDRDASHDOTDOT, 0 }, { "brdrdashdotstr", CONTROL_FLAG, RTF_BRDRDASHDOTSTR, 0 }, { "brdrdashsm", CONTROL_FLAG, RTF_BRDRDASHSM, 0 }, { "brdrdb", CONTROL_FLAG, RTF_BRDRDB, 0 }, @@ -1908,4 +1906,4 @@ bool RTFMathSymbol::operator<(const RTFMathSymbol& rOther) const } // namespace rtftok } // namespace writerfilter -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/rtftok/rtfcontrolwords.hxx b/writerfilter/source/rtftok/rtfcontrolwords.hxx index 849750888d1d..ddaf123b4a77 100644 --- a/writerfilter/source/rtftok/rtfcontrolwords.hxx +++ b/writerfilter/source/rtftok/rtfcontrolwords.hxx @@ -301,8 +301,6 @@ enum RTFKeyword RTF_BRDRDASH, RTF_BRDRDASHD, RTF_BRDRDASHDD, - RTF_BRDRDASHDOT, - RTF_BRDRDASHDOTDOT, RTF_BRDRDASHDOTSTR, RTF_BRDRDASHSM, RTF_BRDRDB, diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx b/writerfilter/source/rtftok/rtfdispatchflag.cxx index d48893f38d4d..001e22bad455 100644 --- a/writerfilter/source/rtftok/rtfdispatchflag.cxx +++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx @@ -217,6 +217,15 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTF_BRDRINSET: nParam = NS_ooxml::LN_Value_ST_Border_inset; break; + case RTF_BRDRDASHSM: + nParam = NS_ooxml::LN_Value_ST_Border_dashSmallGap; + break; + case RTF_BRDRDASHD: + nParam = NS_ooxml::LN_Value_ST_Border_dotDash; + break; + case RTF_BRDRDASHDD: + nParam = NS_ooxml::LN_Value_ST_Border_dotDotDash; + break; case RTF_BRDRNONE: nParam = NS_ooxml::LN_Value_ST_Border_none; break; |