Kaydet (Commit) 3e2ab7da authored tarafından Miklos Vajna's avatar Miklos Vajna

DomainMapper_Impl::finishParagraph: fix frame conversion vs insert pos

Change-Id: I3aefc2185412b1dc370dd723cc57ed59e60a36be
üst 3f6946cf
...@@ -676,10 +676,11 @@ void lcl_MoveBorderPropertiesToFrame(uno::Sequence<beans::PropertyValue>& rFrame ...@@ -676,10 +676,11 @@ void lcl_MoveBorderPropertiesToFrame(uno::Sequence<beans::PropertyValue>& rFrame
void lcl_AddRangeAndStyle( void lcl_AddRangeAndStyle(
ParagraphPropertiesPtr& pToBeSavedProperties, ParagraphPropertiesPtr& pToBeSavedProperties,
uno::Reference< text::XTextAppend > xTextAppend, uno::Reference< text::XTextAppend > xTextAppend,
PropertyMapPtr pPropertyMap) PropertyMapPtr pPropertyMap,
TextAppendContext& rAppendContext)
{ {
uno::Reference<text::XParagraphCursor> xParaCursor( uno::Reference<text::XParagraphCursor> xParaCursor(
xTextAppend->createTextCursorByRange( xTextAppend->getEnd()), uno::UNO_QUERY_THROW ); xTextAppend->createTextCursorByRange( rAppendContext.xInsertPosition.is() ? rAppendContext.xInsertPosition : xTextAppend->getEnd()), uno::UNO_QUERY_THROW );
pToBeSavedProperties->SetEndingRange(xParaCursor->getStart()); pToBeSavedProperties->SetEndingRange(xParaCursor->getStart());
xParaCursor->gotoStartOfParagraph( false ); xParaCursor->gotoStartOfParagraph( false );
...@@ -1023,7 +1024,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap ) ...@@ -1023,7 +1024,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap )
if ( !bIsDropCap && pParaContext->IsFrameMode() ) if ( !bIsDropCap && pParaContext->IsFrameMode() )
{ {
pToBeSavedProperties.reset( new ParagraphProperties(*pParaContext) ); pToBeSavedProperties.reset( new ParagraphProperties(*pParaContext) );
lcl_AddRangeAndStyle(pToBeSavedProperties, xTextAppend, pPropertyMap); lcl_AddRangeAndStyle(pToBeSavedProperties, xTextAppend, pPropertyMap, rAppendContext);
} }
} }
...@@ -1035,7 +1036,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap ) ...@@ -1035,7 +1036,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap )
if( !bIsDropCap && pParaContext->IsFrameMode() ) if( !bIsDropCap && pParaContext->IsFrameMode() )
{ {
pToBeSavedProperties.reset( new ParagraphProperties(*pParaContext) ); pToBeSavedProperties.reset( new ParagraphProperties(*pParaContext) );
lcl_AddRangeAndStyle(pToBeSavedProperties, xTextAppend, pPropertyMap); lcl_AddRangeAndStyle(pToBeSavedProperties, xTextAppend, pPropertyMap, rAppendContext);
} }
} }
uno::Sequence< beans::PropertyValue > aProperties; uno::Sequence< beans::PropertyValue > aProperties;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment