diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-06-05 17:49:13 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-06-06 09:45:55 +0200 |
| commit | f06cc552a0699f7c2c34db981e77d4c8efe5e9e7 (patch) | |
| tree | 9aae289fab35bec1f5ec24ff08e490e2612d58b4 | |
| parent | 11c00f1fdd63a4c9a011f1f2d0ca66945013f39b (diff) | |
wwSectionManager: fix import of page borders
Regression from 1e113cb7604e1509e7d598a9be329f1f7b6e9322. According to
the spec (see 2.9.181), the first bit disables border of "all but first"
pages, the second bit disables the border of first pages.
Change-Id: Ie49c9b7b76d34c2a93350481965790976f49d7df
| -rwxr-xr-x | sw/qa/extras/ww8import/data/page-border.doc | bin | 0 -> 22016 bytes | |||
| -rw-r--r-- | sw/qa/extras/ww8import/ww8import.cxx | 11 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 6 |
3 files changed, 14 insertions, 3 deletions
diff --git a/sw/qa/extras/ww8import/data/page-border.doc b/sw/qa/extras/ww8import/data/page-border.doc Binary files differnew file mode 100755 index 000000000000..c2dec4fede22 --- /dev/null +++ b/sw/qa/extras/ww8import/data/page-border.doc diff --git a/sw/qa/extras/ww8import/ww8import.cxx b/sw/qa/extras/ww8import/ww8import.cxx index d924ef314da7..0ded9f7714b9 100644 --- a/sw/qa/extras/ww8import/ww8import.cxx +++ b/sw/qa/extras/ww8import/ww8import.cxx @@ -20,2 +20,4 @@ +#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) + class Test : public SwModelTestBase @@ -34,2 +36,3 @@ public: void testN816593(); + void testPageBorder(); @@ -59,2 +62,3 @@ void Test::run() {"n816593.doc", &Test::testN816593}, + {"page-border.doc", &Test::testPageBorder}, }; @@ -273,2 +277,9 @@ void Test::testN816593() +void Test::testPageBorder() +{ + // Page border was missing (LineWidth was 0), due to wrong interpretation of pgbApplyTo. + table::BorderLine2 aBorder = getProperty<table::BorderLine2>(getStyles("PageStyles")->getByName(DEFAULT_STYLE), "TopBorder"); + CPPUNIT_ASSERT_EQUAL(sal_uInt32(TWIP_TO_MM100(6 * 20)), aBorder.LineWidth); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 598385a879d5..907454f44349 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -3850,6 +3850,6 @@ void wwSectionManager::SetSegmentToPageDesc(const wwSection &rSection, - if (rSection.maSep.pgbApplyTo & 1) - mrReader.SetPageBorder(rPage.GetFirst(), rSection); - if (rSection.maSep.pgbApplyTo & 2) + if (!(rSection.maSep.pgbApplyTo & 1)) mrReader.SetPageBorder(rFmt, rSection); + if (!(rSection.maSep.pgbApplyTo & 2)) + mrReader.SetPageBorder(rPage.GetFirst(), rSection); |