diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-04-13 20:56:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-04-13 21:26:49 +0100 |
| commit | 855b0af13803c810593ed16ad65eed542d023756 (patch) | |
| tree | f250853ddf4a24ab1f454f59077f429e6820acc9 /sw | |
| parent | cbbb24d0afcdbdac21d03ec4ee1455a3834afff4 (diff) | |
Resolves: tdf#90130 don't clobber new solid-color on seeing old transparency
Change-Id: I1ea86dca37cbce416564c5e198779dd132125b02
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/odfimport/data/fdo90130.odt | bin | 0 -> 8606 bytes | |||
| -rw-r--r-- | sw/qa/extras/odfimport/odfimport.cxx | 10 | ||||
| -rw-r--r-- | sw/source/core/unocore/unoframe.cxx | 3 |
3 files changed, 13 insertions, 0 deletions
diff --git a/sw/qa/extras/odfimport/data/fdo90130.odt b/sw/qa/extras/odfimport/data/fdo90130.odt Binary files differnew file mode 100644 index 000000000000..6839b3635b37 --- /dev/null +++ b/sw/qa/extras/odfimport/data/fdo90130.odt diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index a4b467e327a4..e2af675de1cc 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -559,6 +559,16 @@ DECLARE_ODFIMPORT_TEST(fdo81223, "fdo81223.odt") CPPUNIT_ASSERT_EQUAL(sal_Int32(0xfeffffff), nValue); } +DECLARE_ODFIMPORT_TEST(fdo90130, "fdo90130.odt") +{ + uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY); + uno::Reference<beans::XPropertySet> xFrame(xIndexAccess->getByIndex(0), uno::UNO_QUERY); + sal_Int32 nValue(0); + xFrame->getPropertyValue("BackColor") >>= nValue; + CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00ff3333), nValue); +} + DECLARE_ODFIMPORT_TEST(testBnc800714, "bnc800714.fodt") { // Document's second paragraph wants to be together with the third one, but: diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 372c297dc34c..aa658735058c 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -352,6 +352,9 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI aXFillColorItem.PutValue(*pXFillColorItem); rToSet.Put(aXFillColorItem); + //set old-school brush color if we later encounter the + //MID_BACK_COLOR_TRANSPARENCY case below + aBrush = getSvxBrushItemFromSourceSet(rToSet, RES_BACKGROUND, false); } else if (aXFillStyleItem.GetValue() == drawing::FillStyle_SOLID && (pCol || pRGBCol)) { |