diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-10-29 12:08:19 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-10-29 12:08:41 +0100 |
| commit | 411cc0f12a1f8030978a4b33839c50007bdee0de (patch) | |
| tree | 87c451ef93fd58701a418dc573ddbce6192f0c8e | |
| parent | 67a23b6af991d383de5d431db9cc88d18f488b7c (diff) | |
import RTF_DPROUNDR
See the fdo#42407 bugdoc for a reproducer.
Change-Id: Ia683a87215c71a238db322cb60ce5e31309eb7e9
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 1fab29306a3c..f350a7f06458 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2295,7 +2295,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) m_aStates.top().aDrawingObject.xShape.set(getModelFactory()->createInstance("com.sun.star.drawing.PolyLineShape"), uno::UNO_QUERY); break; case RTF_DPRECT: - nType = ESCHER_ShpInst_Rectangle; + m_aStates.top().aDrawingObject.xShape.set(getModelFactory()->createInstance("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY); break; case RTF_DPELLIPSE: nType = ESCHER_ShpInst_Ellipse; @@ -2423,6 +2423,11 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTF_DPLINEHOLLOW: m_aStates.top().aDrawingObject.nFLine = 0; break; + case RTF_DPROUNDR: + if (m_aStates.top().aDrawingObject.xPropertySet.is()) + // Seems this old syntax has no way to specify a custom radius, and this is the default + m_aStates.top().aDrawingObject.xPropertySet->setPropertyValue("CornerRadius", uno::makeAny(sal_Int32(83))); + break; default: SAL_INFO("writerfilter", OSL_THIS_FUNC << ": TODO handle flag '" << lcl_RtfToString(nKeyword) << "'"); aSkip.setParsed(false); |