summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-05-09 20:42:49 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-05-09 20:42:49 +0100
commitd62728d367a3ea24c433d90afcbf008eb436c21c (patch)
tree807161f4ff2bf80ae9c58d20415833016d06737e
parent8b867887022903bc5788b01db51dfcec521dc878 (diff)
don't crash on export of ooo121238-1.odt to docx
Change-Id: I263424ad8f65ded7bab89b5902482357b4f9abaa
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 92a1b64eee51..86ad68249e80 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4397,6 +4397,8 @@ void DocxAttributeOutput::WritePostponedFormControl(const SdrObject* pObject)
{
uno::Reference<awt::XControlModel> xControlModel = pFormObj->GetUnoControlModel();
uno::Reference<lang::XServiceInfo> xInfo(xControlModel, uno::UNO_QUERY);
+ if (!xInfo.is())
+ return;
if (xInfo->supportsService("com.sun.star.form.component.DateField"))
{
// gather component properties