diff options
author | sushil_shinde <sushil.shinde@synerzip.com> | 2014-06-09 16:23:48 +0530 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-06-11 11:21:35 +0200 |
commit | 63d1aa4dc8aa70256edb19638bcab3a6d5b1f3b6 (patch) | |
tree | 85e6ea0f08415258151a93c2e78a8d198b5d8161 | |
parent | fix build (diff) | |
download | core-63d1aa4dc8aa70256edb19638bcab3a6d5b1f3b6.tar.gz core-63d1aa4dc8aa70256edb19638bcab3a6d5b1f3b6.zip |
fdo#78885 : File crashed while opening in LO
- File attached to issue contains footnote between a table and reference
of footnote is in field.
- In PopFieldContext code was throwing exception due to null value of
footnotestartnode.
Reviewed on:
https://gerrit.libreoffice.org/9697
Change-Id: I467e234a7daa6a5f724087c2cc959e4c9d76f4d2
-rw-r--r-- | sw/qa/core/data/ooxml/pass/fdo78885.docx | bin | 0 -> 49510 bytes | |||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/sw/qa/core/data/ooxml/pass/fdo78885.docx b/sw/qa/core/data/ooxml/pass/fdo78885.docx Binary files differnew file mode 100644 index 000000000000..558d71ee14e6 --- /dev/null +++ b/sw/qa/core/data/ooxml/pass/fdo78885.docx diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index b3ef441c3238..0d518c001d2f 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1552,7 +1552,7 @@ void DomainMapper_Impl::PushFootOrEndnote( bool bIsFootnote ) } appendTextContent( uno::Reference< text::XTextContent >( xFootnoteText, uno::UNO_QUERY_THROW ), aFontProperties ); m_aTextAppendStack.push(TextAppendContext(uno::Reference< text::XTextAppend >( xFootnoteText, uno::UNO_QUERY_THROW ), - m_bIsNewDoc ? uno::Reference<text::XTextCursor>() : xFootnoteText->createTextCursorByRange(xFootnoteText->getStart()))); + xFootnoteText->createTextCursorByRange(xFootnoteText->getStart()))); // Redlines for the footnote anchor CheckRedline( xFootnote->getAnchor( ) ); |