summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorC├ędric Bosdonnat <cedric.bosdonnat@free.fr>2011-12-20 16:27:46 +0100
committerMiklos Vajna <vmiklos@suse.cz>2012-04-06 15:38:43 +0200
commit2ff3c94c471ee586c733121e528e9623c4344224 (patch)
tree58196175d0ee64e039217daeb5987d9936cae7a8
parent7a9ea6e5696af0816651675d8f7538198cdce4da (diff)
fdo#47036 n#703032 RTF/DOCX import: fixed the import of consecutive frames
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. (cherry picked from commit e040d2931658b411bfbd1c668dc96422374a74be) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index bc38966545d4..5461a99cd27e 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1010,6 +1010,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);
+ }
}
}