diff --git a/sw/qa/extras/rtfexport/data/fdo66743.rtf b/sw/qa/extras/rtfexport/data/fdo66743.rtf new file mode 100644 index 000000000000..81ffc7749cfd --- /dev/null +++ b/sw/qa/extras/rtfexport/data/fdo66743.rtf @@ -0,0 +1,5 @@ +{\rtf1 +\trowd \clshdng1500\cellx4000 +\pard\plain A1\cell\row +\pard\par +} diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx index 64eb1beb3122..1951ddbc3809 100644 --- a/sw/qa/extras/rtfexport/rtfexport.cxx +++ b/sw/qa/extras/rtfexport/rtfexport.cxx @@ -69,6 +69,7 @@ public: void testFdo66682(); void testParaShadow(); void testCharacterBorder(); + void testFdo66743(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) && !defined(WNT) @@ -127,6 +128,7 @@ void Test::run() {"fdo66682.rtf", &Test::testFdo66682}, {"para-shadow.rtf", &Test::testParaShadow}, {"charborder.odt", &Test::testCharacterBorder}, + {"fdo66743.rtf", &Test::testFdo66743}, }; // Don't test the first import of these, for some reason those tests fail const char* aBlacklist[] = { @@ -673,6 +675,14 @@ void Test::testCharacterBorder() } } +void Test::testFdo66743() +{ + uno::Reference xTable(getParagraphOrTable(1), uno::UNO_QUERY); + uno::Reference xCell = xTable->getCellByName("A1"); + // This was too dark, 0x7f7f7f. + CPPUNIT_ASSERT_EQUAL(sal_Int32(0xd8d8d8), getProperty(xCell, "BackColor")); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index d73c5bd600fe..d3614b92cb05 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3564,8 +3564,8 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) { case 500: nValue = 2; break; case 1000: nValue = 3; break; - case 1200: nValue = 27; break; - case 1500: nValue = 28; break; + case 1200: nValue = 37; break; + case 1500: nValue = 38; break; case 2000: nValue = 4; break; case 2500: nValue = 5; break; case 3000: nValue = 6; break;