From 317e3d43c937e7d3bff61b100c08f04c837c4d25 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 28 Aug 2017 17:09:06 +0100 Subject: crashtesting: failure on exporting tdf95568-1.ots to xlsx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit since... commit c0cc02e2934aeb12dda44818955e5964496c186a Date: Thu Aug 17 21:47:22 2017 +0200 tdf#50097: DOCX: export form controls as MSO ActiveX controls Change-Id: I55f1dcbe454e696df71a7656c796e36e91c42762 Reviewed-on: https://gerrit.libreoffice.org/41651 Tested-by: Jenkins Reviewed-by: Tamás Zolnai Tested-by: Tamás Zolnai --- filter/source/msfilter/eschesdo.cxx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 1348c38bfe7e..5ed8d3892125 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -425,9 +425,13 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, const Reference< XPropertySet > xPropSet(rObj.mXPropSet, UNO_QUERY); if(xPropSet.is()) { - text::TextContentAnchorType eAnchorType; - xPropSet->getPropertyValue("AnchorType") >>= eAnchorType; - bInline = eAnchorType == text::TextContentAnchorType_AS_CHARACTER; + const Reference xPropInfo = xPropSet->getPropertySetInfo(); + if (xPropInfo.is() && xPropInfo->hasPropertyByName("AnchorType")) + { + text::TextContentAnchorType eAnchorType; + xPropSet->getPropertyValue("AnchorType") >>= eAnchorType; + bInline = eAnchorType == text::TextContentAnchorType_AS_CHARACTER; + } } if(bInline) -- cgit