[Libreoffice-commits] core.git: sw/qa writerfilter/source

[sushil_shinde]

 sw/qa/core/data/ooxml/pass/fdo78885.docx          |binary
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 63d1aa4dc8aa70256edb19638bcab3a6d5b1f3b6
Author: sushil_shinde <sushil.shinde at synerzip.com>
Date:   Mon Jun 9 16:23:48 2014 +0530

    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

diff --git a/sw/qa/core/data/ooxml/pass/fdo78885.docx b/sw/qa/core/data/ooxml/pass/fdo78885.docx
new file mode 100644
index 0000000..558d71e
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo78885.docx differ
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index b3ef441..0d518c0 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( ) );