diff options
| -rw-r--r-- | sw/qa/extras/rtfimport/data/fdo82859.rtf | 25 | ||||
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 2 |
3 files changed, 32 insertions, 1 deletions
diff --git a/sw/qa/extras/rtfimport/data/fdo82859.rtf b/sw/qa/extras/rtfimport/data/fdo82859.rtf new file mode 100644 index 000000000000..eac5e6f3f972 --- /dev/null +++ b/sw/qa/extras/rtfimport/data/fdo82859.rtf @@ -0,0 +1,25 @@ +{\rtf1 +{\shp +{\*\shpinst\shpbypara\shpbyignore\shptop4154\shpbottom11234\shpbxcolumn\shpbxignore\shpleft-90\shpright9270 +{\sp +{\sn fillColor} +{\sv 4294967295} +} +{\sp +{\sn shapeType} +{\sv 202} +} +{\sp +{\sn posrelv} +{\sv 2} +} +{\sp +{\sn posrelh} +{\sv 2} +} +{\shptxt +} +} +} +\par +} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index d4cb897a9347..520beee85586 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -1914,6 +1914,12 @@ DECLARE_RTFIMPORT_TEST(testFdo85179, "fdo85179.rtf") CPPUNIT_ASSERT_EQUAL(sal_uInt32(50800/360), getProperty<table::BorderLine2>(getShape(1), "TopBorder").LineWidth); } +DECLARE_RTFIMPORT_TEST(testFdo82859, "fdo82859.rtf") +{ + // This was 0: "0xffffff" was converted to 0, i.e. the background was black instead of the default. + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(-1), getProperty<sal_Int32>(getShape(1), "BackColor")); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 7afcfb0f0740..acbe6a2b7b5e 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -358,7 +358,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap } else if (i->first == "fillColor" && xPropertySet.is()) { - aAny <<= msfilter::util::BGRToRGB(i->second.toInt32()); + aAny <<= msfilter::util::BGRToRGB(i->second.toUInt32()); if (m_bTextFrame) xPropertySet->setPropertyValue("BackColor", aAny); else |