diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-08-01 19:28:07 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-08-09 16:19:12 +0200 |
| commit | 3ac0003eb2cfb35f2892625c6c1d47b79f1ed6b0 (patch) | |
| tree | ba8fbd667220c85b306129b1844ca621fe4efb3f /writerfilter | |
| parent | 76787df04dbe06a9380d7f2b9e0ca570b5517a3b (diff) | |
sw btlr writing mode: RTF filter of Writer tbrl textframes
Fix both import and export. Values 1 and 3 seems to be the same. Accept
both on import, but write 3, as DOCX only has a single value and Word
uses 3 when doing DOCX->RTF conversion.
Reviewed-on: https://gerrit.libreoffice.org/76823
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 8f36d40426fa83bf7923a818377cc50048199dfd)
Conflicts:
sw/qa/extras/rtfexport/rtfexport4.cxx
Change-Id: Ic5420091ffee9eb20c6aaac61a127e93289aa9fe
Reviewed-on: https://gerrit.libreoffice.org/77200
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 9a7b980ba09d..35addd606640 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -446,8 +446,13 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap ; // Ignore: complementer of lineColor else if (rProperty.first == "txflTextFlow" && xPropertySet.is()) { - if (rProperty.second.toInt32() == 1) - eWritingMode = text::WritingMode_TB_RL; + switch (rProperty.second.toInt32()) + { + case 1: // Top to bottom ASCII font + case 3: // Top to bottom non-ASCII font + eWritingMode = text::WritingMode_TB_RL; + break; + } } else if (rProperty.first == "fLine" && xPropertySet.is()) resolveFLine(xPropertySet, rProperty.second.toInt32()); |