diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2019-04-29 20:01:21 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-04-30 09:11:07 +0200 |
commit | cd2a7acd789297e613424a59b2fe24cedd9a72b6 (patch) | |
tree | 31a6051541900d7ed55369d4ac19ee8d779ce68c /sw | |
parent | 267d97ccca46a1c7eb729be7f333e1b8137b8a08 (diff) |
sw btlr writing mode: implement ODF filter for textframes
Layout is still not yet correct right after the import, though.
Change-Id: Icdba2e8d608f35b6b5b43b88ffb223f779af1b89
Reviewed-on: https://gerrit.libreoffice.org/71552
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/qa/extras/odfexport/data/btlr-frame.odt | bin | 0 -> 8564 bytes | |||
-rw-r--r-- | sw/qa/extras/odfexport/odfexport.cxx | 12 |
2 files changed, 12 insertions, 0 deletions
diff --git a/sw/qa/extras/odfexport/data/btlr-frame.odt b/sw/qa/extras/odfexport/data/btlr-frame.odt Binary files differnew file mode 100644 index 000000000000..31cb03849c53 --- /dev/null +++ b/sw/qa/extras/odfexport/data/btlr-frame.odt diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index 8348438437a1..4ef1128d3118 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -1409,6 +1409,18 @@ DECLARE_ODFEXPORT_TEST(testBtlrCell, "btlr-cell.odt") CPPUNIT_ASSERT_EQUAL(text::WritingMode2::TB_RL, getProperty<sal_Int16>(xC1, "WritingMode")); } +DECLARE_ODFEXPORT_TEST(testBtlrFrame, "btlr-frame.odt") +{ + // Without the accompanying fix in place, this test would have failed, as + // the btlr text direction in the text frame was lost on ODF import and + // export. + uno::Reference<beans::XPropertySet> xTextFrame(getShape(1), uno::UNO_QUERY); + CPPUNIT_ASSERT(xTextFrame.is()); + + auto nActual = getProperty<sal_Int16>(xTextFrame, "WritingMode"); + CPPUNIT_ASSERT_EQUAL(text::WritingMode2::BT_LR, nActual); +} + DECLARE_ODFEXPORT_TEST(testFdo86963, "fdo86963.odt") { // Export of this document failed with beans::UnknownPropertyException. |