sw/qa/extras/uiwriter/data/tdf35021_tabOverMarginDemo.doc |binary sw/qa/extras/uiwriter/uiwriter.cxx | 24 ++++++++++++++ 2 files changed, 24 insertions(+)
New commits: commit 0e726874b4bd111f84483f4a4f6592c8ecec6112 Author: Justin Luth <justin_l...@sil.org> Date: Wed Jan 18 21:20:51 2017 +0300 uiwriter: unit test for tabOverMargin related to tdf#35021 and n#793998 to test the tab_over_margin compatibility setting for doc and docx. Change-Id: I00f932957b59a7ff1a55e69f4fdfae4fc1d17163 Reviewed-on: https://gerrit.libreoffice.org/33278 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Justin Luth <justin_l...@sil.org> Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> diff --git a/sw/qa/extras/uiwriter/data/tdf35021_tabOverMarginDemo.doc b/sw/qa/extras/uiwriter/data/tdf35021_tabOverMarginDemo.doc new file mode 100755 index 0000000..22c79e8 Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf35021_tabOverMarginDemo.doc differ diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 2161ca8..681248d 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -223,6 +223,7 @@ public: void testTdf104425(); void testTdf104814(); void testTdf66405(); + void testTdf35021_tabOverMarginDemo(); void testTdf104492(); void testTdf105417(); @@ -342,6 +343,7 @@ public: CPPUNIT_TEST(testTdf104425); CPPUNIT_TEST(testTdf104814); CPPUNIT_TEST(testTdf66405); + CPPUNIT_TEST(testTdf35021_tabOverMarginDemo); CPPUNIT_TEST(testTdf104492); CPPUNIT_TEST(testTdf105417); CPPUNIT_TEST_SUITE_END(); @@ -4211,6 +4213,28 @@ void SwUiWriterTest::testTdf66405() CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nTopMargin); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nBottomMargin); } + +void SwUiWriterTest::testTdf35021_tabOverMarginDemo() +{ + createDoc("tdf35021_tabOverMarginDemo.doc"); + calcLayout(); + xmlDocPtr pXmlDoc = parseLayoutDump(); + // Tabs should go past the margin @ ~3381 + sal_Int32 nMargin = getXPath(pXmlDoc, "//body/txt[1]/infos/prtBounds", "width").toInt32(); + // left tab was 3381 because it got its own full line + sal_Int32 nWidth = getXPath(pXmlDoc, "//Text[@nType='POR_TABLEFT']", "nWidth").toInt32(); + CPPUNIT_ASSERT_MESSAGE("Left Tab width is ~4479", nMargin < nWidth); + // center tab was 842 + nWidth = getXPath(pXmlDoc, "//Text[@nType='POR_TABCENTER']", "nWidth").toInt32(); + CPPUNIT_ASSERT_MESSAGE("Center Tab width is ~3521", nMargin < nWidth); + // right tab was probably the same as center tab. + nWidth = getXPath(pXmlDoc, "//Text[@nType='POR_TABRIGHT']", "nWidth").toInt32(); + CPPUNIT_ASSERT_MESSAGE("Right Tab width is ~2907", sal_Int32(2500) < nWidth); + // decimal tab was 266 + nWidth = getXPath(pXmlDoc, "//Text[@nType='POR_TABDECIMAL']", "nWidth").toInt32(); + CPPUNIT_ASSERT_MESSAGE("Decimal Tab width is ~4096", nMargin < nWidth); +} + void SwUiWriterTest::testTdf104492() { createDoc("tdf104492.docx"); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits