From 0baec970707fb6e884b028bbe2ffedb441e296eb Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 27 May 2014 09:05:16 +0200
Subject: [PATCH] SwTextBoxHelper::syncProperty(): avoid crash on
 not-yet-inserted shape

Change-Id: I3308ba685b4066ea6849e8002e9d98cc5264c368
---
 sw/source/core/doc/textboxhelper.cxx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index ec27548cbb70..9937778721aa 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -105,6 +105,10 @@ uno::Any SwTextBoxHelper::getXTextAppend(SwFrmFmt* pShape, const uno::Type& rTyp
 
 void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 nMemberId, const OUString& rPropertyName, const css::uno::Any& rValue)
 {
+    // No shape yet? Then nothing to do, initial properties are set by create().
+    if (!pShape)
+        return;
+
     uno::Any aValue(rValue);
     nMemberId &= ~CONVERT_TWIPS;