diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-04-11 17:39:06 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-04-11 17:41:28 +0200 |
commit | d795dfdffb1a8c3c50d7b4b96f55a284fc929430 (patch) | |
tree | 7b4ea9dde879345c99016e482510d23aa0fbcee7 | |
parent | bc3c05f816fbe21c251e4749097914e40d373ddd (diff) |
RTF filter: import fShadow, shadowColor and shadowOffset shape properties
Change-Id: I862a6b59ea2c3fa00f12cb3e9dbfd672a6aa58e5
-rw-r--r-- | oox/inc/oox/vml/vmlformatting.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 26 |
2 files changed, 24 insertions, 4 deletions
diff --git a/oox/inc/oox/vml/vmlformatting.hxx b/oox/inc/oox/vml/vmlformatting.hxx index b7b9e6ae0411..79fa38009e4d 100644 --- a/oox/inc/oox/vml/vmlformatting.hxx +++ b/oox/inc/oox/vml/vmlformatting.hxx @@ -226,7 +226,7 @@ struct OOX_DLLPUBLIC FillModel // ============================================================================ /** The shadow model structure contains all shape shadow properties. */ -struct ShadowModel +struct OOX_DLLPUBLIC ShadowModel { bool mbHasShadow; ///< Is a v:shadow element seen? OptValue<bool> moShadowOn; ///< Is the element turned on? diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 17cb1d8dcb7d..0aa36563ff0c 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -153,8 +153,10 @@ void RTFSdrImport::resolve(RTFShape& rShape) // Default line width is 0.75 pt (26 mm100) in Word, 0 in Writer. uno::Any aLineWidth = uno::makeAny(sal_Int32(26)); text::WritingMode eWritingMode = text::WritingMode_LR_TB; - // Used for gradients, let the VML import do the hard work. - oox::vml::FillModel aFillModel; + + // Importing these are not trivial, let the VML import do the hard work. + oox::vml::FillModel aFillModel; // Gradient. + oox::vml::ShadowModel aShadowModel; // Shadow. for (std::vector< std::pair<OUString, OUString> >::iterator i = rShape.aProperties.begin(); i != rShape.aProperties.end(); ++i) @@ -399,6 +401,16 @@ void RTFSdrImport::resolve(RTFShape& rShape) } else if (i->first == "fillFocus") aFillModel.moFocus.set(i->second.toDouble() / 100); // percent + else if (i->first == "fShadow" && xPropertySet.is()) + { + if (i->second.toInt32() == 1) + aShadowModel.mbHasShadow = true; + } + else if (i->first == "shadowColor") + aShadowModel.moColor.set(OUString("#") + OStringToOUString(msfilter::util::ConvertColor(msfilter::util::BGRToRGB(i->second.toInt32())), RTL_TEXTENCODING_UTF8)); + else if (i->first == "shadowOffsetX") + // EMUs to points + aShadowModel.moOffset.set(OUString::number(i->second.toDouble() / 12700) + "pt"); else SAL_INFO("writerfilter", "TODO handle shape property '" << i->first << "':'" << i->second << "'"); } @@ -493,14 +505,22 @@ void RTFSdrImport::resolve(RTFShape& rShape) xPropertySet->setPropertyValue("VertOrientRelation", uno::makeAny(rShape.nVertOrientRelation)); if (rShape.nWrap != -1) xPropertySet->setPropertyValue("Surround", uno::makeAny(text::WrapTextMode(rShape.nWrap))); + oox::ModelObjectHelper aModelObjectHelper(m_rImport.getModelFactory()); if (aFillModel.moType.has()) { - oox::ModelObjectHelper aModelObjectHelper(m_rImport.getModelFactory()); oox::drawingml::ShapePropertyMap aPropMap(aModelObjectHelper); aFillModel.pushToPropMap(aPropMap, m_rImport.getGraphicHelper()); // Sets the FillStyle and FillGradient UNO properties. oox::PropertySet(xShape).setProperties(aPropMap); } + + if (aShadowModel.mbHasShadow) + { + oox::drawingml::ShapePropertyMap aPropMap(aModelObjectHelper); + aShadowModel.pushToPropMap(aPropMap, m_rImport.getGraphicHelper()); + // Sets the ShadowFormat UNO property. + oox::PropertySet(xShape).setProperties(aPropMap); + } } // Send it to dmapper |