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

Caolán McNamara caolanm at redhat.com
Wed Sep 17 08:16:42 PDT 2014


 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 258888bc3f0ba4474ff66d49d698f4551df736eb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 17 16:15:35 2014 +0100

    don't crash on insertTextPortion returning empty reference
    
    Change-Id: Id55ea26f1467fd160dab30b31327646240edabaf

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 378fbc3..657c279 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1245,6 +1245,9 @@ void DomainMapper_Impl::appendTextPortion( const OUString& rString, PropertyMapP
                             if (m_bStartIndex || m_bStartBibliography || m_bStartGenericField)
                                 xTOCTextCursor->goLeft(1, false);
                             xTextRange = xTextAppend->insertTextPortion(rString, pValues, xTOCTextCursor);
+                            SAL_WARN_IF(!xTextRange.is(), "writerfilter.dmapper", "insertTextPortion failed");
+                            if (!xTextRange.is())
+                                throw uno::Exception("insertTextPortion failed", NULL);
                             m_bTextInserted = true;
                             xTOCTextCursor->gotoRange(xTextRange->getEnd(), true);
                             mxTOCTextCursor = xTOCTextCursor;


More information about the Libreoffice-commits mailing list