diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-08-13 15:20:24 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-08-13 17:35:15 +0200 |
commit | 65afb07d56e8faf0cf020de784747046cbcb9d0e (patch) | |
tree | 91dbe4df7ebb275a092c9d420a942e6a5f99e9b8 /sw/qa | |
parent | 590751d98e10867609c45fff93edae53dfaef3a8 (diff) |
DOCX export of paragraph border drop shadow
Instead of passing over shadow location only in case of page borders, do
the same for paragraph borders as well.
Change-Id: I311638fe0f41ef47ae351f7d199bfbc8b8aabfbe
Diffstat (limited to 'sw/qa')
-rwxr-xr-x | sw/qa/extras/ooxmlexport/data/para-shadow.docx | bin | 0 -> 4056 bytes | |||
-rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 12 |
2 files changed, 12 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/para-shadow.docx b/sw/qa/extras/ooxmlexport/data/para-shadow.docx Binary files differnew file mode 100755 index 000000000000..d35d5f958dfe --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/para-shadow.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 0b4003eb5d3c..fc55bb973e70 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -106,6 +106,7 @@ public: void testFdo65718(); void testFdo64350(); void testFdo67013(); + void testParaShadow(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) && !defined(WNT) @@ -188,6 +189,7 @@ void Test::run() {"fdo65718.docx", &Test::testFdo65718}, {"fdo64350.docx", &Test::testFdo64350}, {"fdo67013.docx", &Test::testFdo67013}, + {"para-shadow.docx", &Test::testParaShadow}, }; // Don't test the first import of these, for some reason those tests fail const char* aBlacklist[] = { @@ -1134,6 +1136,16 @@ void Test::testFdo67013() CPPUNIT_ASSERT_EQUAL(sal_Int16(106), aFooterTopBorder.OuterLineWidth); } +void Test::testParaShadow() +{ + // The problem was that in w:pBdr, child elements had a w:shadow attribute, but that was ignored. + table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(getParagraph(2), "ParaShadowFormat"); + CPPUNIT_ASSERT_EQUAL(COL_BLACK, sal_uInt32(aShadow.Color)); + CPPUNIT_ASSERT_EQUAL(table::ShadowLocation_BOTTOM_RIGHT, aShadow.Location); + // w:sz="48" is in eights of a point, 1 pt is 20 twips. + CPPUNIT_ASSERT_EQUAL(sal_Int16(TWIP_TO_MM100(24/8*20)), aShadow.ShadowWidth); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); |