diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-20 16:32:59 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-02-21 08:26:50 +0000 |
| commit | 310b5976bb827a0ffb274f70878852e4474a0559 (patch) | |
| tree | 071ed1095fb4e0b94e871c672d321e0db459df6d | |
| parent | a09865cc0f177a28622330866b3ad5baf4b99bd6 (diff) | |
fdo#60789: writerfilter: do not insert a character at field start
The character inserted in DomainMapper_Impl::PushFieldContext() causes
problems in this bugdoc because there is a commentRangeStart immediately
before a text field and the call to delete it via setString("") disposes
the SwXTextRange that is stored in m_aAnnotationPosition.m_xStart,
which results in an exception when trying to insert the comment.
At least all the fields in the bugdoc import fine with this change.
Change-Id: I6c08d72fafb0529e8612f1e35b2c8b871edb5a52
(cherry picked from commit 6145c6efa4f346287ed9693c9d00038d829d5a35)
Reviewed-on: https://gerrit.libreoffice.org/2295
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 695a0f33de18..88b4e4224ac8 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2033,10 +2033,7 @@ void DomainMapper_Impl::PushFieldContext() uno::Reference< text::XTextRange > xStart; if (xTextAppend.is()) { - //insert a dummy char to make sure the start range doesn't move together with the to-be-appended text - xTextAppend->appendTextPortion(OUString( '-' ), uno::Sequence< beans::PropertyValue >() ); uno::Reference< text::XTextCursor > xCrsr = xTextAppend->createTextCursorByRange( xTextAppend->getEnd() ); - xCrsr->goLeft( 1, false ); xStart = xCrsr->getStart(); } m_aFieldStack.push( FieldContextPtr( new FieldContext( xStart ) ) ); @@ -3310,9 +3307,6 @@ void DomainMapper_Impl::PopFieldContext() try { uno::Reference< text::XTextCursor > xCrsr = xTextAppend->createTextCursorByRange(pContext->GetStartRange()); - //remove the dummy character - xCrsr->goRight( 1, true ); - xCrsr->setString( OUString() ); uno::Reference< text::XTextContent > xToInsert( pContext->GetTOC(), uno::UNO_QUERY ); if( xToInsert.is() ) { |