summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-03-25 12:12:37 +0000
committerTor Lillqvist <tml@collabora.com>2014-04-02 14:29:36 +0300
commit6def5b85d8b74b0025b515ef60b3d69bd81cffc2 (patch)
treee99fcd27099a59ca7da99682be071763f96e59ec /writerfilter
parent4f97aca8b19569ae51ad98fc38184216cfee58a9 (diff)
Resolves: rhbz#1077780 crash on loading .docx
Change-Id: I92670b9c46a2c745ba47c6dcc1b4dd672942cf59 Reviewed-on: https://gerrit.libreoffice.org/8742 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 8822882081c3..fb688dab79b9 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 );