[Libreoffice-commits] .: writerfilter/source

[Cédric Bosdonnat]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit e040d2931658b411bfbd1c668dc96422374a74be
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date:   Tue Dec 20 16:27:46 2011 +0100

    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.

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 4bd3f18..484895a 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);
+                    }
                 }
 
             }