[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - writerfilter/source

[Caolán McNamara]

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

New commits:
commit 64c7c193c786d355094e583e8c82bde79cf34c53
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 25 12:12:37 2014 +0000

    Resolves: rhbz#1077780 crash on loading .docx
    
    Change-Id: I92670b9c46a2c745ba47c6dcc1b4dd672942cf59
    Reviewed-on: https://gerrit.libreoffice.org/8742
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 8822882..fb688da 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -688,6 +688,8 @@ void lcl_MoveBorderPropertiesToFrame(uno::Sequence<beans::PropertyValue>& rFrame
 {
     try
     {
+        if (!xStartTextRange.is())   //rhbz#1077780
+            return;
         uno::Reference<text::XTextCursor> xRangeCursor = xStartTextRange->getText()->createTextCursorByRange( xStartTextRange );
         xRangeCursor->gotoRange( xEndTextRange, true );