diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2012-10-17 12:36:00 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2012-10-17 13:31:30 +0200 |
commit | b43a051ab701e032ac43097e95573409af45ee83 (patch) | |
tree | a59e0d241d1b95ddda46a850249d0c305b197c50 /writerfilter/source | |
parent | fix import of RTF_PARD inside RTF_SHPTXT (diff) | |
download | core-b43a051ab701e032ac43097e95573409af45ee83.tar.gz core-b43a051ab701e032ac43097e95573409af45ee83.zip |
implement import of RTF_{DPTXBXTEXT,DPTXBX}
Change-Id: I2e5f47a3e083ec914a5b95a1e038c21b72025a4f
Diffstat (limited to 'writerfilter/source')
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index b6a1121ce4b4..da0ae75a4f39 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1324,6 +1324,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) } break; case RTF_SHPTXT: + case RTF_DPTXBXTEXT: m_aStates.top().nDestinationState = DESTINATION_SHAPETEXT; dispatchFlag(RTF_PARD); m_bNeedPap = true; @@ -2271,6 +2272,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTF_DPLINE: case RTF_DPRECT: case RTF_DPELLIPSE: + case RTF_DPTXBX: { sal_Int32 nType = 0; switch (nKeyword) @@ -2284,6 +2286,9 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTF_DPELLIPSE: nType = ESCHER_ShpInst_Ellipse; break; + case RTF_DPTXBX: + nType = ESCHER_ShpInst_TextBox; + break; default: break; } @@ -3668,6 +3673,14 @@ int RTFDocumentImpl::popState() xPropertySet->setPropertyValue("FillTransparence", uno::makeAny(sal_Int32(100))); Mapper().startShape(xShape); + Mapper().startParagraphGroup(); + if (replayShapetext()) + { + Mapper().startCharacterGroup(); + runBreak(); + Mapper().endCharacterGroup(); + } + Mapper().endParagraphGroup(); Mapper().endShape(); } break; |