diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-06 10:14:45 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-06 10:38:52 +0100 |
| commit | a5c475c25bd432fc80be8c2b437935cd54c4b611 (patch) | |
| tree | 6ac0ccd5bbca603211fcdfc24f65ab5d02228c56 | |
| parent | e661d295c2643d6706a9b2040051445591880c46 (diff) | |
Santa Claus brings fixed background color of textframes in drawingml import
Change-Id: Ie2b6885aae5e26c3d29d372da730837cb7dc97ce
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 6 | ||||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 78a7581858f4..72c75475c694 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -613,6 +613,12 @@ Reference< XShape > Shape::createAndInsert( { if (aServiceName == "com.sun.star.text.TextFrame") { + // TextFrames have BackColor, not FillColor + if (aShapeProps.hasProperty(PROP_FillColor)) + { + aShapeProps.setProperty(PROP_BackColor, aShapeProps[PROP_FillColor]); + aShapeProps.erase(PROP_FillColor); + } // TextFrames have BackColorTransparency, not FillTransparence if (aShapeProps.hasProperty(PROP_FillTransparence)) { diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index d7ce137afe02..2b271a32a375 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1591,6 +1591,8 @@ DECLARE_OOXMLIMPORT_TEST(testMceNested, "mce-nested.docx") uno::Reference<beans::XPropertySet> xFrame(xIndexAccess->getByIndex(0), uno::UNO_QUERY); // positionV's posOffset from the bugdoc, was 0. CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(2514600)), getProperty<sal_Int32>(xFrame, "VertOrientPosition")); + // This was -1 (default), make sure the background color is set. + CPPUNIT_ASSERT_EQUAL(sal_Int32(0x4f81bd), getProperty<sal_Int32>(xFrame, "BackColor")); } DECLARE_OOXMLIMPORT_TEST(testFdo70457, "fdo70457.docx") |