diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-06-18 16:22:32 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-06-18 17:13:39 +0200 |
| commit | 2af60e2eff4e952fff8cac0228b89f16ce3a436e (patch) | |
| tree | 767f42bb9675e671a9f7cc149d0e6b3bb32b7dbe /writerfilter | |
| parent | f8d1dcc621b04fd17577905e9b1bdf71f33c7b57 (diff) | |
bnc#825305 RTF import of fFilled shape property
Change-Id: Iaa2ff9d5d1a28aec046f885acecbd1a44c734ec0
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 36c4cb1f602a..1b62df3ff071 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -121,6 +121,8 @@ void RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> xShape, OUStrin sal_Int16 nHoriOrient = 0; sal_Int16 nVertOrient = 0; boost::optional<bool> obFitShapeToText; + bool bFilled = true; + if (aKey == "posh") { switch (aValue.toInt32()) @@ -163,6 +165,9 @@ void RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> xShape, OUStrin } else if (aKey == "fFitShapeToText") obFitShapeToText.reset(aValue.toInt32() == 1); + else if (aKey == "fFilled") + bFilled = aValue.toInt32() == 1; + if (nHoriOrient != 0) xPropertySet->setPropertyValue("HoriOrient", uno::makeAny(nHoriOrient)); if (nVertOrient != 0) @@ -172,6 +177,8 @@ void RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> xShape, OUStrin xPropertySet->setPropertyValue("SizeType", uno::makeAny(*obFitShapeToText ? text::SizeType::MIN : text::SizeType::FIX)); xPropertySet->setPropertyValue("FrameIsAutomaticHeight", uno::makeAny(*obFitShapeToText)); } + if (!bFilled) + xPropertySet->setPropertyValue("BackColorTransparency", uno::makeAny(sal_Int32(100))); } void RTFSdrImport::resolve(RTFShape& rShape, bool bClose) @@ -452,7 +459,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose) else if (i->first == "shadowOffsetX") // EMUs to points aShadowModel.moOffset.set(OUString::number(i->second.toDouble() / 12700) + "pt"); - else if (i->first == "posh" || i->first == "posv" || i->first == "fFitShapeToText") + else if (i->first == "posh" || i->first == "posv" || i->first == "fFitShapeToText" || i->first == "fFilled") applyProperty(xShape, i->first, i->second); else if (i->first == "posrelh") { |