diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-29 16:15:03 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-29 16:38:08 +0100 |
commit | 3200e99c48897cf7965cc3acc58fadb686ee2437 (patch) | |
tree | adde5b5e3a110885afa14e5305ccbb6461425896 /writerfilter/source | |
parent | 851f933a03ed75d5938452832aa9198855847dc7 (diff) |
fdo#41109 RTF shape import: handle fBehindDocument property
Change-Id: I9bf24eb2d3087e855d54c0ee7aba4e98dc856cc2
(cherry picked from commit e8d10f215e9da65617988a9a471be18775afad00)
Diffstat (limited to 'writerfilter/source')
-rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 84d541ee2f51..c13e104b1d34 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -239,6 +239,8 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose) oox::vml::FillModel aFillModel; // Gradient. oox::vml::ShadowModel aShadowModel; // Shadow. + bool bOpaque = true; + // The spec doesn't state what is the default for shapeType, Word seems to implement it as a rectangle. if (std::find_if(rShape.aProperties.begin(), rShape.aProperties.end(), @@ -535,6 +537,8 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose) oRelRight.reset(TWIP_TO_MM100(i->second.toInt32())); else if (i->first == "relBottom") oRelBottom.reset(TWIP_TO_MM100(i->second.toInt32())); + else if (i->first == "fBehindDocument") + bOpaque = !i->second.toInt32(); else SAL_INFO("writerfilter", "TODO handle shape property '" << i->first << "':'" << i->second << "'"); } @@ -669,6 +673,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose) oox::PropertySet(xShape).setProperties(aPropMap); } xPropertySet->setPropertyValue("AnchorType", uno::makeAny(text::TextContentAnchorType_AT_CHARACTER)); + xPropertySet->setPropertyValue("Opaque", uno::makeAny(bOpaque)); } if (m_rImport.isInBackground()) |