diff options
| -rwxr-xr-x | sw/qa/extras/ww8import/data/bnc821208.doc | bin | 30208 -> 30208 bytes | |||
| -rw-r--r-- | sw/qa/extras/ww8import/ww8import.cxx | 3 | ||||
| -rw-r--r-- | sw/source/core/txtnode/thints.cxx | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/sw/qa/extras/ww8import/data/bnc821208.doc b/sw/qa/extras/ww8import/data/bnc821208.doc Binary files differindex d89d711f38be..cfe76806ef80 100755 --- a/sw/qa/extras/ww8import/data/bnc821208.doc +++ b/sw/qa/extras/ww8import/data/bnc821208.doc diff --git a/sw/qa/extras/ww8import/ww8import.cxx b/sw/qa/extras/ww8import/ww8import.cxx index 861a960ee78f..9c9b5d81c86e 100644 --- a/sw/qa/extras/ww8import/ww8import.cxx +++ b/sw/qa/extras/ww8import/ww8import.cxx @@ -242,6 +242,9 @@ DECLARE_WW8IMPORT_TEST(testBnc821208, "bnc821208.doc") beans::PropertyState ePropertyState = xPropertyState->getPropertyState("CharFontName"); // This was beans::PropertyState_DIRECT_VALUE. CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DEFAULT_VALUE, ePropertyState); + + // Background of the numbering itself should have been the default, was yellow (0xffff00). + CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), getProperty<sal_Int32>(xPropertyState, "CharBackColor")); } DECLARE_WW8IMPORT_TEST(testCp1000044, "cp1000044.doc") diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index e9dbd89d9a09..0e4c6f649299 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -1784,7 +1784,7 @@ void SwTxtNode::DelSoftHyph( const sal_Int32 nStt, const sal_Int32 nEnd ) //In MS Word, the font underline setting of the paragraph end position wont affect the formatting of numbering, so we ignore it bool lcl_IsIgnoredCharFmtForNumbering(const sal_uInt16 nWhich) { - return (nWhich == RES_CHRATR_UNDERLINE); + return (nWhich == RES_CHRATR_UNDERLINE || nWhich == RES_CHRATR_BACKGROUND); } //In MS Word, following properties of the paragraph end position wont affect the formatting of bullets, so we ignore them: |