From dd11bca8ab191ce10054a5f2de7010ca400eb0b5 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 30 Aug 2012 09:11:58 +0100 Subject: [PATCH] n#777337 testcase Also remove the #if 0 I forgot to remove previously. Change-Id: I2cc5e1407c509414c8395d0fd63ab3b379bef04f --- sw/qa/extras/ooxmlimport/data/n777337.docx | Bin 0 -> 13409 bytes sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 20 ++++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 sw/qa/extras/ooxmlimport/data/n777337.docx diff --git a/sw/qa/extras/ooxmlimport/data/n777337.docx b/sw/qa/extras/ooxmlimport/data/n777337.docx new file mode 100644 index 0000000000000000000000000000000000000000..8bb377dcf6211bebde16b469d2453e6d606a2203 GIT binary patch literal 13409 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 literal 0 HcmV?d00001 diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 00e36b8fb5ad..ec619935aad1 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -88,10 +88,10 @@ public: void testN775906(); void testN775899(); void testN777345(); + void testN777337(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) && !defined(WNT) -#if 0 CPPUNIT_TEST(testN751054); CPPUNIT_TEST(testN751117); CPPUNIT_TEST(testN751017); @@ -118,8 +118,8 @@ public: CPPUNIT_TEST(testAllGapsWord); CPPUNIT_TEST(testN775906); CPPUNIT_TEST(testN775899); -#endif CPPUNIT_TEST(testN777345); + CPPUNIT_TEST(testN777337); #endif CPPUNIT_TEST_SUITE_END(); @@ -785,6 +785,22 @@ void Test::testN777345() CPPUNIT_ASSERT_EQUAL(sal_uLong(2404338915U), aGraphic.GetChecksum()); } +void Test::testN777337() +{ + /* + * The problem was that the top and bottom margin on the first page was only 0.1cm instead of 1.7cm. + * + * oFirst = ThisComponent.StyleFamilies.PageStyles.getByName("First Page") + * xray oFirst.TopMargin + * xray oFirst.BottomMargin + */ + load("n777337.docx"); + + uno::Reference xPropertySet(getStyles("PageStyles")->getByName("First Page"), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1702), getProperty(xPropertySet, "TopMargin")); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1702), getProperty(xPropertySet, "BottomMargin")); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT();