diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-03-28 12:19:23 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-03-28 14:46:50 +0100 |
| commit | 9c06d2bd253ad6a50141a5b51409dbdffcfd9e6d (patch) | |
| tree | eb3e9c8385e78412ddb819f87276fb9780fb77d1 /writerfilter | |
| parent | 5ce754ad4b08586f87c30b6ab30047de698329a9 (diff) | |
fdo#37716 implement import of RTF_NOWRAP
Change-Id: Ic2c0f4c1924811a6ee1c40221db447babdd74a3a
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 10 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.hxx | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 26110ba85f6f..5afb4532d16b 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2648,6 +2648,9 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) // 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; + case RTF_NOWRAP: + m_aStates.top().aFrame.setSprm(NS_sprm::LN_PWr, NS_ooxml::LN_Value_wordprocessingml_ST_Wrap_notBeside); + break; default: { SAL_INFO("writerfilter", "TODO handle flag '" << lcl_RtfToString(nKeyword) << "'"); @@ -4785,6 +4788,9 @@ void RTFFrame::setSprm(Id nId, Id nValue) case NS_ooxml::LN_CT_FramePr_vAnchor: nVertAnchor = nValue; break; + case NS_sprm::LN_PWr: + oWrap.reset(nValue); + break; default: break; } @@ -4877,6 +4883,10 @@ RTFSprms RTFFrame::getSprms() pValue.reset(new RTFValue(nHRule)); } break; + case NS_sprm::LN_PWr: + if (oWrap) + pValue.reset(new RTFValue(*oWrap)); + break; default: break; } diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index a96ad9add55d..e3b84020b398 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -308,6 +308,7 @@ namespace writerfilter { sal_Int32 nHoriPadding, nVertPadding; sal_Int32 nHoriAlign, nHoriAnchor, nVertAlign, nVertAnchor; Id nHRule; + boost::optional<Id> oWrap; public: RTFFrame(RTFParserState* pParserState); sal_Int16 nAnchorType; |