4a39c20
From 88c2785c8fd4ec9ad9c4b318b91d1835cc04cd26 Mon Sep 17 00:00:00 2001
4a39c20
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
4a39c20
Date: Tue, 25 Mar 2014 12:12:37 +0000
4a39c20
Subject: [PATCH] Resolves: rhbz#1077780 crash on loading .docx
4a39c20
4a39c20
Change-Id: I92670b9c46a2c745ba47c6dcc1b4dd672942cf59
4a39c20
---
4a39c20
 writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 ++
4a39c20
 1 file changed, 2 insertions(+)
4a39c20
4a39c20
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
4a39c20
index aa0896a..79c1847 100644
4a39c20
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
4a39c20
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
4a39c20
@@ -636,6 +636,8 @@ void lcl_MoveBorderPropertiesToFrame(uno::Sequence<beans::PropertyValue>& rFrame
4a39c20
 {
4a39c20
     try
4a39c20
     {
4a39c20
+        if (!xStartTextRange.is())   //rhbz#1077780
4a39c20
+            return;
4a39c20
         uno::Reference<text::XTextCursor> xRangeCursor = xStartTextRange->getText()->createTextCursorByRange( xStartTextRange );
4a39c20
         xRangeCursor->gotoRange( xEndTextRange, true );
4a39c20
 
4a39c20
-- 
4a39c20
1.8.5.3
4a39c20