diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2011-12-20 16:27:46 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2011-12-20 17:33:41 +0100 |
| commit | e040d2931658b411bfbd1c668dc96422374a74be (patch) | |
| tree | 726775eaa07f4ef8db201ee5bded77e32b436308 /writerfilter | |
| parent | Abandon attempt to use the debug CRT in a dbgutil build (diff) | |
| download | core-e040d2931658b411bfbd1c668dc96422374a74be.tar.gz core-e040d2931658b411bfbd1c668dc96422374a74be.zip | |
RTF/DOCX import: fixed the import of consecutive frames (n#703032)
When we have two consecutive paragraphs with different frame properties,
the second frame wasn't created. Now store the current paragraph
properties in order to create the frame later.
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 4bd3f1812d39..484895afba56 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1005,6 +1005,13 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap ) { //handles (8)(9) and completes (6) CheckUnregisteredFrameConversion( ); + + // If different frame properties are set on this paragraph, keep them. + if ( !bIsDropCap && pParaContext->IsFrameMode() ) + { + pToBeSavedProperties.reset( new ParagraphProperties(*pParaContext) ); + lcl_AddRangeAndStyle(pToBeSavedProperties, xTextAppend, pPropertyMap); + } } } |