From e040d2931658b411bfbd1c668dc96422374a74be Mon Sep 17 00:00:00 2001 From: Cédric Bosdonnat Date: Tue, 20 Dec 2011 16:27:46 +0100 Subject: 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. --- writerfilter/source/dmapper/DomainMapper_Impl.cxx | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'writerfilter') 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); + } } } -- cgit