diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-29 16:25:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-29 16:31:32 +0100 |
| commit | 5aa360cae0383f270c12708e7e94179a7fde6711 (patch) | |
| tree | 015c2238e2e2860790fb335207f0e45de89a009c /xmloff | |
| parent | 8dd2a4f0c80db25f744147206ff1e69cf976f73f (diff) | |
Resolves: fdo#80468 and fdo#81223 image/frame backgrounds wrong
writer has code to fill in missing new properties from the old properties
if they exist. But xmloff is stripping them out before they get there.
Don't strip them out, and add in a missing check for one of the
archaic bg colors and add a regression test for fdo#81223
Change-Id: I9a541a9bee0a01c90f2c33383f1144ecd8b0bfff
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/XMLShapeStyleContext.cxx | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx index 31c32d720af0..f3d1d1980725 100644 --- a/xmloff/source/draw/XMLShapeStyleContext.cxx +++ b/xmloff/source/draw/XMLShapeStyleContext.cxx @@ -53,8 +53,7 @@ XMLShapeStyleContext::XMLShapeStyleContext( SvXMLStylesContext& rStyles, sal_uInt16 nFamily) : XMLPropStyleContext(rImport, nPrfx, rLName, xAttrList, rStyles, nFamily ), - m_bIsNumRuleAlreadyConverted( false ), - m_bIsFillStyleAlreadyConverted(false) //UUUU + m_bIsNumRuleAlreadyConverted( false ) { } @@ -186,18 +185,6 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet } } - //UUUU need to filter out old fill definitions when the new ones are used. The new - // ones are used when a FillStyle is defined - if(!m_bIsFillStyleAlreadyConverted && GetProperties().size()) - { - if(doNewDrawingLayerFillStyleDefinitionsExist(OUString("FillStyle"))) - { - deactivateOldFillStyleDefinitions(getStandardSet()); - } - - m_bIsFillStyleAlreadyConverted = true; - } - struct _ContextID_Index_Pair aContextIDs[] = { { CTF_DASHNAME , -1 }, |