diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-09-28 17:45:21 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-10-01 11:19:38 +0200 |
| commit | 91f02521b827bf51f04befd45c51736fe4072fba (patch) | |
| tree | c1a049177cb6f51dd19c12b9e8b3f5d2f87ecb29 /sw | |
| parent | 1558ee84dce09770ff80ad9984e84d6500b79bf5 (diff) | |
fdo#52475 fix import of RTF_CHCBPAT with value 0
0 means auto, and for fdo#50539, this value was ignored. However a next
sample shows that we should send something to the dmapper: COL_AUTO.
Change-Id: I8d7d35125c9027dfb45288bbfbfa81ba4799e78d
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/rtfimport/data/fdo52475.rtf | 5 | ||||
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 9 |
2 files changed, 14 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfimport/data/fdo52475.rtf b/sw/qa/extras/rtfimport/data/fdo52475.rtf new file mode 100644 index 000000000000..fe4a557d77ca --- /dev/null +++ b/sw/qa/extras/rtfimport/data/fdo52475.rtf @@ -0,0 +1,5 @@ +{\rtf1 +{\colortbl;\red228\green228\blue228;} +before \chcbpat1 highlighted\chcbpat0 after +\par +} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 61813f1c5555..997e33db4c0e 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -108,6 +108,7 @@ public: void testInk(); void testFdo52389(); void testFdo49655(); + void testFdo52475(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) && !defined(WNT) @@ -159,6 +160,7 @@ public: CPPUNIT_TEST(testInk); CPPUNIT_TEST(testFdo52389); CPPUNIT_TEST(testFdo49655); + CPPUNIT_TEST(testFdo52475); #endif CPPUNIT_TEST_SUITE_END(); @@ -843,6 +845,13 @@ void Test::testFdo49655() CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); } +void Test::testFdo52475() +{ + // The problem was that \chcbpat0 resulted in no color, instead of COL_AUTO. + load("fdo52475.rtf"); + CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), getProperty<sal_Int32>(getRun(getParagraph(1), 3), "CharBackColor")); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); |